changeset 70:37d96962a62e

Merge

--- a/.screenrc	Thu Jul 16 23:52:14 2015 +0100
+++ b/.screenrc	Fri Aug 14 16:47:37 2015 +0100
@@ -7,6 +7,7 @@
 shell -bash
 
 hardstatus off
+caption always "%{=r}%{+b}%H%07=%+=|%{-} %-w%45L>%{+b}%n %t%{-}%+w%<%{-}"
 defscrollback 16000
 
 # Yet another hack:

--- a/.swiplrc	Thu Jul 16 23:52:14 2015 +0100
+++ b/.swiplrc	Fri Aug 14 16:47:37 2015 +0100
@@ -23,31 +23,32 @@
 	sub_atom(Atom,_,LPost,0,Post).
 	
 internal_host(localhost).
-internal_host(Host) :- sub_atom(Host,_,_,0,'bl.uk').
+internal_host(Proxy) :- http_proxy(Proxy,_,_).
+%internal_host(Host) :- sub_atom(Host,_,_,0,'bl.uk').
 
+% New scheme for proxy handling (>=7.3.0)
+% :- multifile socket:proxy_for_url/3.
+% socket:proxy_for_url(_, Target, proxy(Host,Port)) :-
+% 	http_proxy(Host,Port,_),
+% 	\+internal_host(Target),
+% 	debug(proxy,'Using socketproxy ~w:~w for ~w',[Host,Port,Target]).
+
+% Old scheme, still required to provide authorisation details
 :- 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)]) :-
 	http_proxy(Host,Port,Auth),
 	option(host(Target),Parts),
 	\+internal_host(Target),
-	debug(proxy,'Using HTTP proxy ~w:~w for ~w',[Host,Port,Target]),
-	debug(proxy,'Parts: ~w',[Parts]),
-	( option(scheme(https),Parts)
-	->	debug(proxy,'Using HTTPS',[]),
-		Opts=[cert_verify_hook(verify_certificate)]
-	;	Opts=[]
-	).
-
-verify_certificate(_,_,_,_,_) :- format(user_error,'Accepting certificate\n',[]).
+	debug(proxy,'Using HTTP proxy ~w:~w for ~w',[Host,Port,Target]).
 
 :- (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)]),
 	load_files(library(http/http_ssl_plugin), [silent(true)]),
+   retractall(http_proxy(_,_,_)),
 	(	get_http_proxy(Host,Port,Auth) 
 	->	assert(http_proxy(Host,Port,Auth))
 	;	true
 	).
 
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/css-unmin	Fri Aug 14 16:47:37 2015 +0100
@@ -0,0 +1,2 @@
+#!/bin/sh
+awk '{gsub(/{|;/,"&\n\t"); print}' | awk '{if(match($0,/[^\;]+}/)) {gsub(/}/,";\n&\n"); print}else{gsub(/}/,"\n&"); print}'}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/cssdiff	Fri Aug 14 16:47:37 2015 +0100
@@ -0,0 +1,2 @@
+#!/bin/bash
+vimdiff <(css-unmin < $1) <(css-unmin < $2)

--- a/var/dml/settings.db	Thu Jul 16 23:52:14 2015 +0100
+++ b/var/dml/settings.db	Fri Aug 14 16:47:37 2015 +0100
@@ -1,5 +1,5 @@
 /*  Saved settings
-    Date: Wed May 20 16:54:14 2015
+    Date: Thu Jul 23 06:56:32 2015
 */
 
 
@@ -21,6 +21,12 @@
 %	Minimum time between Musicbrainz requests
 setting(musicbrainz:min_wait, 0.91).
 
+%	Root directory of audio file collection
+setting(bl_p2r:audio_root, just('/mnt/audio')).
+
+%	Pattern to match METS metadata files
+setting(bl_p2r:archive_pattern, '~/lib/mets/BL_metadata_complete.7z').
+
 %	IP addresses from which remotes are allowed to connect
 setting(pengines:allow_from, [*]).
 
@@ -30,6 +36,9 @@
 %	Fluidsynth initialisation file
 setting(score:fluidsynth_rc, genuser_fs).
 
+%	Enables automatic semantic web searches for recognised URIs
+setting(crawler:enable_auto_crawl, false).
+
 %	Pixels per inch for in browser figures
 setting(matlab:pixels_per_inch, 300).
 
@@ -44,6 +53,3 @@
 
 %	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).