swish/commit

Sync with upstream

diff --git a/Makefile b/Makefile
index f5cc010..f0e569c 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ SWISHLIB=storage.pl page.pl help.pl examples.pl config.pl gitty.pl \
 	 highlight.pl render.pl template_hint.pl search.pl form.pl \
 	 include.pl swish_csv.pl logging.pl trace.pl markdown.pl \
 	 gitty_driver_files.pl gitty_driver_bdb.pl gitty_tools.pl \
-	 swish_debug.pl profiles.pl procps.pl
+	 swish_debug.pl profiles.pl procps.pl download.pl r_swish.pl
 RENDER=table.pl graphviz.pl c3.pl
 LIBS=	$(addprefix lib/swish/, $(SWISHLIB)) \
 	$(addprefix lib/swish/render/, $(RENDER))
@@ -29,7 +29,7 @@ CLIENTFILES=swish-ask.sh README.md sin-table.html
 CLIENTS=$(addprefix client/, $(CLIENTFILES))
 EXAMPLESFILES=render_c3.swinb render_graphviz.swinb htmlcell.swinb \
 	      rendering.swinb jquery.swinb stats.swinb \
-	      swish_tutorials.swinb
+	      swish_tutorials.swinb Rserve.swinb Rdataframe.swinb Rdownload.swinb
 EXAMPLES=$(addprefix examples/, $(EXAMPLESFILES))
 CMFILES=mode/htmlmixed/htmlmixed.js \
 	mode/javascript/javascript.js \
diff --git a/config-available/swish.pl b/config-available/swish.pl
index 026b0ee..1f15689 100644
--- a/config-available/swish.pl
+++ b/config-available/swish.pl
@@ -27,6 +27,13 @@ user:file_search_path(example,	 examples).
 :- if(exists_source(library(semweb/rdf_sandbox))).
 :- use_module(library(semweb/rdf_sandbox)).
 :- endif.
+% Make the R interface available.
+% make sure Rserve runs in a good sandbox or only allow for
+% authenticated access.  See https://github.com/JanWielemaker/rserve-sandbox
+:- if(exists_source(library(r/r_call))).
+:- use_module(user:library(swish/r_swish)).
+:- use_module(library(r/r_sandbox)).
+:- endif.
 
 % Allows users to extend the Examples menu by ticking the Example
 % checkbox.