changeset 63:5dcf2b77e459

merge

--- a/.swiplrc	Thu Jul 16 23:21:42 2015 +0100
+++ b/.swiplrc	Thu Jul 16 23:52:14 2015 +0100
@@ -1,37 +1,4 @@
-:- op(200,fy,@).
-
-:- dynamic persistent_history_file/1.
-persistent_history(H) :- persistent_history(H,60).
-persistent_history(H,Interval) :-
-   (  persistent_history_file(H) -> true
-   ;  persistent_history_file(H1) -> throw(persistent_history_mismatch(H1,H))
-   ;  debug(history,'Will use persistent history in "~s", saving every ~d seconds.',[H,Interval]),
-      prolog_history(disable),
-      (exists_file(H) -> rl_read_history(H); true),
-      assert(persistent_history_file(H)),
-      current_prolog_flag(os_argv,ARGV),
-      atomics_to_string(ARGV," ",Command),
-      history_event('Start: ~s',[Command]),
-      periodic_save_history(Interval),
-      at_halt(history_event('Halt',[]))
-   ).
-
-history_event(Msg,Args) :-
-   persistent_history_file(H),
-   get_time(Now),
-   format_time(string(Time),'%+',Now),
-   format(string(Info),Msg,Args),
-   format(atom(Line),'% ~w | ~s',[Time,Info]),
-   debug(history,'History event: ~s',[Line]),
-   rl_add_history(Line),
-   rl_write_history(H).
-
-
-periodic_save_history(Interval) :-
-   persistent_history_file(H),
-   debug(history,'Saving history to "~s"...',[H]),
-   rl_write_history(H),
-   alarm(Interval,periodic_save_history(Interval),_,[remove(true)]).
+:- op(200,fy,@). % Shouldn't really need this...
 
 colour_terminal :- 
 	stream_property(user_output, tty(true)),
@@ -59,7 +26,7 @@
 internal_host(Host) :- sub_atom(Host,_,_,0,'bl.uk').
 
 :- multifile http:open_options/2.
-http:open_options(Parts,[proxy(Host,Port),proxy_authorization(Auth)|Opts]) :-
+http:open_options(Parts,[proxy(Host:Port),proxy_authorization(Auth)|Opts]) :-
 	http_proxy(Host,Port,Auth),
 	option(host(Target),Parts),
 	\+internal_host(Target),
@@ -73,8 +40,7 @@
 
 verify_certificate(_,_,_,_,_) :- format(user_error,'Accepting certificate\n',[]).
 
-:- %persistent_history('.swipl_history'),
-	(colour_terminal -> load_files(library(ansi_term), [silent(true)]); true),
+:- (colour_terminal -> load_files(library(ansi_term), [silent(true)]); true),
 	set_prolog_flag(prompt_alternatives_on, determinism),
 	set_prolog_flag(editor, '$EDITOR'),
 	load_files(library(url), [silent(true)]),

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/swipl/upgrade_swipl	Thu Jul 16 23:52:14 2015 +0100
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e # exit on error
+if [ $# -lt 1 ]; then
+	echo "Usage: upgrade_swipl <version>"
+	echo "Eg:    upgrade_swipl 7.3.1"
+	exit
+fi
+
+ver="$1"
+cd ~/src/swipl
+curl "http://www.swi-prolog.org/download/devel/src/swipl-$ver.tar.gz" | tar xz
+(cd "swipl-$ver" && cp -p ../http_openid.pl packages/http && cp ../build . && ./build)
+swipl -g "maplist(pack_rebuild,[real,prosqlite,plml,plsmf]), halt"

--- a/var/dml/settings.db	Thu Jul 16 23:21:42 2015 +0100
+++ b/var/dml/settings.db	Thu Jul 16 23:52:14 2015 +0100
@@ -1,5 +1,5 @@
 /*  Saved settings
-    Date: Sun Apr 26 10:49:40 2015
+    Date: Wed May 20 16:54:14 2015
 */
 
 
@@ -24,11 +24,26 @@
 %	IP addresses from which remotes are allowed to connect
 setting(pengines:allow_from, [*]).
 
-%	Pixels per inch for in browser figures
-setting(matlab:pixels_per_inch, 300).
-
 %	Soundfont directory
 setting(score:soundfont_dir, "~/lib/sounds/sf2").
 
 %	Fluidsynth initialisation file
 setting(score:fluidsynth_rc, genuser_fs).
+
+%	Pixels per inch for in browser figures
+setting(matlab:pixels_per_inch, 300).
+
+%	Maximum number of local slave pengines a master pengine can create.
+setting(swish:slave_limit, 6).
+
+%	Maximum time to wait for output
+setting(swish:time_limit, 600).
+
+%	Pengine auto-destroys when idle for this time
+setting(swish:idle_limit, 1200).
+
+%	Keep information to support source-level debugging
+setting(swish:debug_info, true).
+
+%	Enables automatic semantic web searches for recognised URIs
+setting(crawler:enable_auto_crawl, false).