Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 9 Jul 2013 11:26:46 +0000 (11:26 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 9 Jul 2013 11:26:46 +0000 (11:26 +0000)
55 files changed:
etc/apache2/README [deleted file]
etc/apache2/spclient-dev [deleted file]
etc/apache2/spclient-live [deleted file]
etc/apache2/spclient-mike [deleted file]
etc/apache2/spclient-proxy [deleted file]
etc/apache2/spdemo [deleted file]
etc/apache2/spdemo-mike [deleted file]
etc/apache2/spdemo-px [deleted file]
etc/mod_perl/MyApache2/CopyCookie.pm [deleted file]
etc/mod_perl/MyApache2/SetACAO.pm [deleted file]
etc/service-proxy/mkws_confd [deleted file]
etc/service-proxy/service-proxy.properties [deleted file]
examples/apache2/spdemo [new file with mode: 0644]
examples/apache2/spdemo-mike [new file with mode: 0644]
examples/apache2/spdemo-px [new file with mode: 0644]
examples/htdocs/favicon.ico [new file with mode: 0644]
examples/htdocs/index-full.html [new file with mode: 0644]
examples/htdocs/index-jquery.html [new file with mode: 0644]
examples/htdocs/index-lowlevel.html [new file with mode: 0644]
examples/htdocs/index-mike.html [new file with mode: 0644]
examples/htdocs/index-mkws.html [new file with mode: 0644]
examples/htdocs/index-mobile.html [new file with mode: 0644]
examples/htdocs/index-popup.html [new file with mode: 0644]
examples/htdocs/index.html [new file with mode: 0644]
examples/htdocs/robots.txt [new file with mode: 0644]
experiments/jsdemo/jsdemo.conf [deleted file]
experiments/spclient/.gitignore [deleted file]
experiments/spclient/Makefile [deleted file]
experiments/spclient/README [deleted file]
experiments/spclient/favicon.ico [deleted file]
experiments/spclient/html-structure.txt [deleted file]
experiments/spclient/index-full.html [deleted file]
experiments/spclient/index-jquery.html [deleted file]
experiments/spclient/index-lowlevel.html [deleted file]
experiments/spclient/index-mike.html [deleted file]
experiments/spclient/index-mkws.html [deleted file]
experiments/spclient/index-mobile.html [deleted file]
experiments/spclient/index-popup.html [deleted file]
experiments/spclient/index.html [deleted file]
experiments/spclient/mkws.js [deleted file]
experiments/spclient/mkwsStyle.css [deleted file]
experiments/spclient/robots.txt [deleted file]
tools/apache2/README [new file with mode: 0644]
tools/apache2/mkws-dev [new file with mode: 0644]
tools/apache2/mkws-live [new file with mode: 0644]
tools/apache2/mkws-mike [new file with mode: 0644]
tools/apache2/mkws-proxy [new file with mode: 0644]
tools/htdocs/.gitignore [new file with mode: 0644]
tools/htdocs/Makefile [new file with mode: 0644]
tools/htdocs/README [new file with mode: 0644]
tools/htdocs/html-structure.txt [new file with mode: 0644]
tools/htdocs/mkws.js [new file with mode: 0644]
tools/htdocs/mkwsStyle.css [new file with mode: 0644]
tools/mod_perl/MyApache2/CopyCookie.pm [new file with mode: 0644]
tools/mod_perl/MyApache2/SetACAO.pm [new file with mode: 0644]

diff --git a/etc/apache2/README b/etc/apache2/README
deleted file mode 100644 (file)
index 351fc7f..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-You will need to enable the Rewrite module for this to work:
-
-$ sudo a2enmod rewrite
-$ sudo service apache2 reload
-
diff --git a/etc/apache2/spclient-dev b/etc/apache2/spclient-dev
deleted file mode 100644 (file)
index b4a7e8a..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# Configuration for the apache web server                 -*- apache -*-
-
-# pazpar2 / service proxy config
-<VirtualHost *:80>
-    ServerName spclient.example.com
-    ServerAlias spclient-dev.indexdata.com
-    ServerAdmin webmaster@example.com
-    ErrorLog /var/log/apache2/spdemo-error.log
-    CustomLog /var/log/apache2/spdemo-access.log combined
-
-    RewriteEngine on
-    RewriteLogLevel 1
-    RewriteLog /var/log/apache2/spdemo-rewrite.log 
-
-    DocumentRoot /home/indexdata/mkws/experiments/spclient
-
-    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
-
-    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-
-    ProxyPass        /pazpar2/         http://localhost:8004/pazpar2/
-    ProxyPassReverse /pazpar2/         http://localhost:8004/pazpar2/
-
-</VirtualHost>
-
diff --git a/etc/apache2/spclient-live b/etc/apache2/spclient-live
deleted file mode 100644 (file)
index dfa7ed4..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-# Configuration for the apache web server
-# Running on caliban
-
-
-<VirtualHost *:80>
-    ServerName somesite.indexdata.com
-    DocumentRoot /home/indexdata/mkws/experiments/spclient/
-    ErrorLog /var/log/apache2/somesite-error.log
-    CustomLog /var/log/apache2/somesite-access.log combined
-</VirtualHost>
-
-
-<VirtualHost *:80>
-    ServerName mkws.indexdata.com
-
-    ErrorLog /var/log/apache2/mkws-error.log
-    CustomLog /var/log/apache2/mkws-access.log combined
-
-    DocumentRoot /home/indexdata/mkws/experiments/spclient/
-    Alias /libjs-pz2/ /home/indexdata/libjs-pz2/
-    Alias /index.html /home/indexdata/mkws/experiments/spclient/index-mkws.html
-
-    RewriteEngine on
-    RewriteLogLevel 1
-    RewriteLog /var/log/apache2/mkws-rewrite.log 
-    RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=demo&password=demo [P] # [NE,P]
-
-    Header set Access-Control-Allow-Credentials true
-
-    # For MKC Service Proxy
-    ProxyPass        /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
-    ProxyPassReverse /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
-
-    PerlOptions +Parent
-    PerlSwitches -I/home/indexdata/mkws/etc/mod_perl
-    <Location /service-proxy>
-        PerlOutputFilterHandler MyApache2::SetACAO
-    </Location>
-</VirtualHost>
diff --git a/etc/apache2/spclient-mike b/etc/apache2/spclient-mike
deleted file mode 100644 (file)
index 44efb2b..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# Configuration for the apache web server
-# Running on Mike's local development box
-
-<VirtualHost *:80>
-    ServerName x.spclient.indexdata.com
-    ErrorLog /var/log/apache2/spclient-error.log
-    CustomLog /var/log/apache2/spclient-access.log combined
-
-    DocumentRoot /usr/local/src/git/mkws/experiments/spclient/
-    Alias /libjs-pz2/ /usr/local/src/git/libjs-pz2/
-
-    RewriteEngine on
-    RewriteLogLevel 1
-    RewriteLog /var/log/apache2/spclient-rewrite.log 
-    RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
-
-    # For MKC Service Proxy
-    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-
-    # For local Service Proxy running as mvn jetty:run
-    #ProxyPass        /service-proxy/ http://localhost:8585/service-proxy/
-    #ProxyPassReverse /service-proxy/ http://localhost:8585/service-proxy/
-
-    # Needed on Mac, which locks Apache down hard by default.
-    <Directory />
-        Allow from all
-    </Directory>
-</VirtualHost>
diff --git a/etc/apache2/spclient-proxy b/etc/apache2/spclient-proxy
deleted file mode 100644 (file)
index 4e16c51..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<VirtualHost *:80>
-    ServerName mkws.indexdata.com
-    ServerAlias somesite.indexdata.com
-
-    ProxyRequests off
-    ProxyVia On
-    ProxyPreserveHost On
-    <Proxy *>
-      Order deny,allow
-      Allow from all
-    </Proxy>
-
-    ProxyPass         / http://caliban:80/
-    ProxyPassReverse  / http://caliban:80/
-
-    # These are the logs for the proxying operation
-    ErrorLog /var/log/apache2/mkws-proxy-error.log
-    CustomLog /var/log/apache2/mkws-proxy-access.log combined
-</VirtualHost>
diff --git a/etc/apache2/spdemo b/etc/apache2/spdemo
deleted file mode 100644 (file)
index cc187be..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# Configuration for the apache web server                 -*- apache -*-
-
-# pazpar2 / service proxy config
-<VirtualHost *:80>
-    ServerName spdemo.example.com
-    ServerAlias spdemo-dev.indexdata.com spdemo-devel.indexdata.com spdemo-sp.indexdata.com spdemo-pp2.indexdata.com 
-    ServerAdmin webmaster@example.com
-    ErrorLog /var/log/apache2/spdemo-error.log
-    CustomLog /var/log/apache2/spdemo-access.log combined
-
-    RewriteEngine on
-    RewriteLogLevel 1
-    RewriteLog /var/log/apache2/spdemo-rewrite.log 
-
-    DocumentRoot /home/indexdata/mkws/experiments/spdemo
-
-    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
-
-    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-
-    ProxyPass        /pazpar2/         http://localhost:8004/pazpar2/
-    ProxyPassReverse /pazpar2/         http://localhost:8004/pazpar2/
-
-</VirtualHost>
-
diff --git a/etc/apache2/spdemo-mike b/etc/apache2/spdemo-mike
deleted file mode 100644 (file)
index 3654479..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# Configuration for the apache web server                 -*- apache -*-
-# Running on Mike's local development box
-# This file is a variant of "spdemo"
-
-# pazpar2 / service proxy config
-<VirtualHost *:80>
-    ServerName x.spdemo-sp.indexdata.com
-    ErrorLog /var/log/apache2/spdemo-error.log
-    CustomLog /var/log/apache2/spdemo-access.log combined
-
-    RewriteEngine on
-    RewriteLogLevel 1
-    RewriteLog /var/log/apache2/spdemo-rewrite.log 
-
-    DocumentRoot /usr/local/src/git/mkws/experiments/spdemo/
-
-    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
-
-    # For MKC Service Proxy
-    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
-
-    # For local Service Proxy running as mvn jetty:run
-    #ProxyPass        /service-proxy/ http://localhost:8585/service-proxy/
-    #ProxyPassReverse /service-proxy/ http://localhost:8585/service-proxy/
-</VirtualHost>
diff --git a/etc/apache2/spdemo-px b/etc/apache2/spdemo-px
deleted file mode 100644 (file)
index 7f28300..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<VirtualHost *:80> 
-   ServerName spdemo.indexdata.com
-   ServerAlias spdemo-dev.indexdata.com spdemo-devel.indexdata.com spdemo-sp.indexdata.com spdemo-pp2.indexdata.com spclient-dev.indexdata.com
-   
-   ErrorLog /var/log/apache2/spdemo-error.log
-   CustomLog /var/log/apache2/spdemo-access.log combined
-
-   DefaultType text/html
-   ProxyRequests off 
-   ProxyPreserveHost On
-
-   <Proxy *>
-     Order deny,allow
-     Allow from all
-   </Proxy>
-
-   ProxyPass         / http://spdemo/
-   ProxyPassReverse  / http://spdemo/
-</VirtualHost>
-
diff --git a/etc/mod_perl/MyApache2/CopyCookie.pm b/etc/mod_perl/MyApache2/CopyCookie.pm
deleted file mode 100644 (file)
index 3e29647..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-package MyApache2::CopyCookie;
-
-use Apache2::Filter ();
-use Apache2::RequestRec ();
-use APR::Table ();
-
-use Apache2::Const -compile => qw(OK);
-
-use constant BUFF_LEN => 1024;
-
-sub handler {
-    my $f = shift;
-
-    # If the server generated a new cookie, make it available in a
-    # header other than the magic "Cookie" that clients can't read.
-    my $ho = $f->r->headers_out;
-    my $cookie = $ho->get('Set-Cookie');
-    if (defined $cookie && $cookie ne "") {
-       $ho->set('X-Set-Cake', $cookie);
-    }
-
-    # If the client sent an existing cookie as X-Cake, but didn't
-    # set Cookie, copy the former to the latter.
-    my $hi = $f->r->headers_in;
-    $cookie = $hi->get('Cookie');
-    if (!defined $cookie || $cookie eq "") {
-       $cookie = $hi->get('X-Cake');
-       if (defined $cookie && $cookie ne "") {
-           warn "copying X-Cake '$cookie' to Cookie";
-           $hi->set('Cookie', $cookie);
-       }
-    }
-
-    while ($f->read(my $buffer, BUFF_LEN)) {
-       $f->print($buffer);
-    }
-
-    return Apache2::Const::OK;
-}
-
-1;
diff --git a/etc/mod_perl/MyApache2/SetACAO.pm b/etc/mod_perl/MyApache2/SetACAO.pm
deleted file mode 100644 (file)
index 66334fc..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-package MyApache2::SetACAO;
-
-use Apache2::Filter ();
-use Apache2::RequestRec ();
-use APR::Table ();
-
-use Apache2::Const -compile => qw(OK);
-
-use constant BUFF_LEN => 1024;
-
-sub handler {
-    my $f = shift;
-
-    # If the client generated an Origin header, echo its content back
-    # in an ACAO header. This is better than just using *, since it
-    # doesnt prevent credentials from being accepted.
-    my $origin = $f->r->headers_in->get('Origin');
-    if (defined $origin && $origin ne "") {
-       $f->r->headers_out->set('Access-Control-Allow-Origin', $origin);
-       warn "MyApache2::SetACAO copied Origin '$origin' to ACAO";
-    }
-
-    while ($f->read(my $buffer, BUFF_LEN)) {
-       $f->print($buffer);
-    }
-
-    return Apache2::Const::OK;
-}
-
-1;
diff --git a/etc/service-proxy/mkws_confd b/etc/service-proxy/mkws_confd
deleted file mode 100755 (executable)
index 78ede88..0000000
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DIR=mkws
diff --git a/etc/service-proxy/service-proxy.properties b/etc/service-proxy/service-proxy.properties
deleted file mode 100755 (executable)
index d589de3..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-# Specify chains of plugins
-chains.*      = relay,statistics
-chains.auth   = authn
-chains.categories = categories
-chains.record = relay,holdings,recordcache,statistics
-chains.show = relay,recordcache,statistics
-chains.imageproxy = imageproxy
-chains.exportrecords = exportrecords
-chains.recordcache = recordcache
-chains.clickout = statistics,clickout
-chains.ils = ils
-
-# Map plug-in names to classes
-plugins.relay      = com.indexdata.serviceproxy.plugins.Pazpar2RelayPlugin
-plugins.authn      = com.indexdata.serviceproxy.plugins.AuthNTorusPlugin
-plugins.ace        = com.indexdata.serviceproxy.plugins.AcePlugin
-plugins.holdings   = com.indexdata.serviceproxy.plugins.HoldingsPlugin
-plugins.categories = com.indexdata.serviceproxy.plugins.TargetCategoriesPlugin
-plugins.imageproxy = com.indexdata.serviceproxy.plugins.ImageProxyPlugin
-plugins.statistics = com.indexdata.serviceproxy.plugins.StatisticsPlugin
-plugins.ace        = com.indexdata.serviceproxy.plugins.AcePlugin
-plugins.exportrecords = com.indexdata.serviceproxy.plugins.ExportRecordsPlugin
-plugins.recordcache = com.indexdata.serviceproxy.plugins.recordcache.RecordCachePlugin
-plugins.clickout   = com.indexdata.serviceproxy.plugins.ClickOutPlugin
-plugins.ils   = com.indexdata.serviceproxy.plugins.ILSPlugin
-
-
-
-# Properties for plug-ins 
-#
-# relay plugin
-relay.PROXY_MODE = 3
-relay.PAZPAR2_URL = http://localhost:8004/search.pz2
-relay.PAZPAR2_SERVICE_ID = mk2demo
-relay.TORUS_BASEURL = http://${thisHost}/torus2/
-relay.TORUS_REALM = *
-relay.TORUS_PARAMS = ?param1=value1
-relay.STREAMBUFF_SIZE = 4096
-relay.PARSE_RESPONSES = true
-relay.SERIALIZE_REQUESTS = false
-
-# authn plugin
-authn.MASTER_TORUS_URL = http://${thisHost}/torus2/admin.admin/records/
-authn.TORUS_URL = http://${thisHost}/torus2/identity.USERS/records/
-authn.ACTION_SEQUENCE = check,cookie,referrer,ipauth
-authn.REQUIRED_COOKIES = InstCode BrCode
-authn.COOKIE_QUERY = shibId=${InstCode}
-authn.AGGRESSIVE_SESSION_INVALIDATION = yes
-
-# categories plugin
-categories.TORUS_BASEURL = http://${thisHost}/torus2/
-categories.EXCLUDE_EMPTY_CATEGORIES = true
-categories.TORUS_BASEURL_SEARCHABLE = http://${thisHost}/torus2/
-categories.CACHE_CATEGORIES_ON_SESSION = true
-
-# ACE plugin
-ace.PZ2P_CLIENT_LIFETIME_MSECS = 55000
-ace.TIME_BETWEEN_ACE_AND_RECORD_MSECS = 100
-ace.ACE_SEARCH_TIME_OUT = 5000
-ace.RECORD_TIME_OUT = 2500
-ace.DUMP_RECORDS_TO_CONSOLE = false
-ace.PUSH!PZ2_ACE_CLIENT = record
-ace.TYPE!PZ2_ACE_CLIENT = com.indexdata.serviceproxy.plugins.ace.Pz2AceRecordSession
-ace.PULL!PZ2_ACE_CLIENT = record
-ace.DUMP_BYTARGET_DOC = false
-ace.PER_TARGET_HITS_THRESHOLD = 100
-
-# Holdings plug-in
-holdings.DUMP_RECORDS_TO_CONSOLE = true
-holdings.RECORD_TIME_OUT = 2500
-#holdings.PULL!PZ2_ACE_CLIENT = record
-holdings.PUSH!ACE_RESPONSE : record
-holdings.TYPE!ACE_RESPONSE = org.w3c.dom.Document
-holdings.DUMP_TARGET_SETTINGS_TO_CONSOLE = false
-holdings.PAZPAR2_URL = REF:relay.PAZPAR2_URL
-
-# Image Proxy plug-in
-imageproxy.OPEN_LIBRARY_IMAGE_URL = http://covers.openlibrary.org/b/isbn/${isbn}-${size}.jpg
-imageproxy.CACHE_ON_SERVER = true
-imageproxy.CACHE_IN_BROWSER = true
-imageproxy.CACHE_MISSING_IMAGE = true
-
-# Statistics plug-in
-statistics.MAX_BACKUP_INDEX = 5
-statistics.MAX_FILE_SIZE = 10000KB
-
-# Exporting Records
-exportrecords.BRANDING = MasterKey
-exportrecords.SMTP_HOST_NAME = kebab.indexdata.com
-exportrecords.SMTP_PORT = 25
-exportrecords.SMTP_AUTH = false
-exportrecords.EMAIL_SUBJECT = Export by email
-exportrecords.EMAIL_FROM = info@indexdata.com
-exportrecords.PERMALINK_PROTOCOL = http
-exportrecords.PERMALINK_DOMAIN = ${thisHost}
-exportrecords.PERMALINK_PATH = item.html
-exportrecords.PERMALINK_REC_ID= prefixrecid=rec_${recid}
-#exportrecords.PERMALINK_REC_QRY = au="${md-author}" and ti="${md-title}"
-
-# Record Cache Settings
-recordcache.MAX_BASKET_SIZE = 50
-recordcache.MAX_VIEWED_SIZE = 10
-
-# ClickOut plug-in (in order to generate click out statistics)
-clickout.PARAMETER = No parameters required for this plug-in
-
-ils.CFWS_URL = http://connect.indexdata.com:9000/connector
diff --git a/examples/apache2/spdemo b/examples/apache2/spdemo
new file mode 100644 (file)
index 0000000..cc187be
--- /dev/null
@@ -0,0 +1,26 @@
+# Configuration for the apache web server                 -*- apache -*-
+
+# pazpar2 / service proxy config
+<VirtualHost *:80>
+    ServerName spdemo.example.com
+    ServerAlias spdemo-dev.indexdata.com spdemo-devel.indexdata.com spdemo-sp.indexdata.com spdemo-pp2.indexdata.com 
+    ServerAdmin webmaster@example.com
+    ErrorLog /var/log/apache2/spdemo-error.log
+    CustomLog /var/log/apache2/spdemo-access.log combined
+
+    RewriteEngine on
+    RewriteLogLevel 1
+    RewriteLog /var/log/apache2/spdemo-rewrite.log 
+
+    DocumentRoot /home/indexdata/mkws/experiments/spdemo
+
+    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
+
+    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+
+    ProxyPass        /pazpar2/         http://localhost:8004/pazpar2/
+    ProxyPassReverse /pazpar2/         http://localhost:8004/pazpar2/
+
+</VirtualHost>
+
diff --git a/examples/apache2/spdemo-mike b/examples/apache2/spdemo-mike
new file mode 100644 (file)
index 0000000..3654479
--- /dev/null
@@ -0,0 +1,26 @@
+# Configuration for the apache web server                 -*- apache -*-
+# Running on Mike's local development box
+# This file is a variant of "spdemo"
+
+# pazpar2 / service proxy config
+<VirtualHost *:80>
+    ServerName x.spdemo-sp.indexdata.com
+    ErrorLog /var/log/apache2/spdemo-error.log
+    CustomLog /var/log/apache2/spdemo-access.log combined
+
+    RewriteEngine on
+    RewriteLogLevel 1
+    RewriteLog /var/log/apache2/spdemo-rewrite.log 
+
+    DocumentRoot /usr/local/src/git/mkws/experiments/spdemo/
+
+    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
+
+    # For MKC Service Proxy
+    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+
+    # For local Service Proxy running as mvn jetty:run
+    #ProxyPass        /service-proxy/ http://localhost:8585/service-proxy/
+    #ProxyPassReverse /service-proxy/ http://localhost:8585/service-proxy/
+</VirtualHost>
diff --git a/examples/apache2/spdemo-px b/examples/apache2/spdemo-px
new file mode 100644 (file)
index 0000000..7f28300
--- /dev/null
@@ -0,0 +1,21 @@
+<VirtualHost *:80> 
+   ServerName spdemo.indexdata.com
+   ServerAlias spdemo-dev.indexdata.com spdemo-devel.indexdata.com spdemo-sp.indexdata.com spdemo-pp2.indexdata.com spclient-dev.indexdata.com
+   
+   ErrorLog /var/log/apache2/spdemo-error.log
+   CustomLog /var/log/apache2/spdemo-access.log combined
+
+   DefaultType text/html
+   ProxyRequests off 
+   ProxyPreserveHost On
+
+   <Proxy *>
+     Order deny,allow
+     Allow from all
+   </Proxy>
+
+   ProxyPass         / http://spdemo/
+   ProxyPassReverse  / http://spdemo/
+</VirtualHost>
+
diff --git a/examples/htdocs/favicon.ico b/examples/htdocs/favicon.ico
new file mode 100644 (file)
index 0000000..35c4899
Binary files /dev/null and b/examples/htdocs/favicon.ico differ
diff --git a/examples/htdocs/index-full.html b/examples/htdocs/index-full.html
new file mode 100644 (file)
index 0000000..f82d261
--- /dev/null
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="copyright" content="(c) 1999-2013 IndexData ApS, http://indexdata.com" />
+    <title>MKWS demo: full configuration</title>
+    <link rel="stylesheet" href="http://mkws.indexdata.com/mkwsStyle.css" />
+    <script type="text/javascript">
+       var mkws_config = {
+               lang: "da",
+               debug: 1,
+               use_service_proxy: true,
+               switch_menu: true,
+               lang_menu: true,
+               sort_default: "relevance",
+               query_width: 50,
+               perpage_default: 20,
+               language_Arabic: {
+                       "Authors": "الكتاب",
+                       "Subjects": "المواضيع",
+                       "Sources": "مصادر",
+                       "Termlists": "العضو الأجل",
+                       "Next": "التالي",
+                       "Prev": "السابق",
+                       "Search": "بحث",
+                       "Sort by": "الترتيب حسب",
+                       "and show": "وعرض",
+                       "per page": "في كل صفحة",
+                       "Displaying": "عرض",
+                       "to": "إلى",
+                       "of": "من",
+                       "found": "أسس",
+                       "Title": "لقب",
+                       "Author": "الكاتب",
+                       "Date": "تاريخ",
+                       "Subject": "موضوع",
+                       "Location": "موقع",
+                       "Records": "أهداف",
+                       "Targets": "السجلات"
+               }
+       };
+    </script>
+    <script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
+  </head>
+  <body>
+    <div id="mkwsSwitch"></div>
+    <div id="mkwsLang"></div>
+    <div id="mkwsSearch"></div>
+    <div id="mkwsResults"></div>
+    <div id="mkwsTargets"></div>
+    <div id="mkwsMOTD">
+      <p>
+       <b>Welcome to the MasterKey Widget Set demo.</b>
+      </p>
+      <p>
+       Enter a search above to begin, or
+       <a href="http://mkws.indexdata.com/"
+          >Visit the MKWS home page to find out more</a>.
+      </p>
+    </div>
+    <div id="footer">
+      <div id="mkwsStat"></div>
+      <span>Powered by MKWS &copy; 2013 <a target="_new" href="http://www.indexdata.com">Index Data</a></span>
+    </div>
+  </body>
+</html>
diff --git a/examples/htdocs/index-jquery.html b/examples/htdocs/index-jquery.html
new file mode 100644 (file)
index 0000000..e2d3e19
--- /dev/null
@@ -0,0 +1,11 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>MKWS demo: jQuery plugin</title>
+    <link rel="stylesheet" href="http://mkws.indexdata.com/mkwsStyle.css" />
+    <script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
+  </head>
+  <body>
+    <script type="text/javascript">jQuery.pazpar2()</script>
+  </body>
+</html>
diff --git a/examples/htdocs/index-lowlevel.html b/examples/htdocs/index-lowlevel.html
new file mode 100644 (file)
index 0000000..f04060d
--- /dev/null
@@ -0,0 +1,55 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>MKWS demo: low-level subcomponents</title>
+    <link rel="stylesheet" href="http://mkws.indexdata.com/mkwsStyle.css" />
+    <script type="text/javascript">
+      var mkws_config = { switch_menu: true };
+    </script>
+    <script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
+    <style type="text/css">
+      #mkwsTermlists div.facet {
+      float:left;
+      width: 30%;
+      margin: 0.3em;
+      }
+      #mkwsStat {
+      text-align: right;
+      }
+    </style>
+  </head>
+  <body>
+    <table width="100%" border="0">
+      <tr>
+        <td>
+          <div id="mkwsSwitch"></div>
+          <div id="mkwsLang"></div>
+          <div id="mkwsSearch"></div>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <div style="height:500px; overflow: auto">
+            <div id="mkwsPager"></div>
+            <div id="mkwsNavi"></div>
+            <div id="mkwsRecords"></div>
+            <div id="mkwsTargets"></div>
+            <div id="mkwsRanking"></div>
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <div style="height:300px; overflow: hidden">
+            <div id="mkwsTermlists"></div>
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <div id="mkwsStat"></div>
+        </td>
+      </tr>
+    </table>
+  </body>
+</html>
diff --git a/examples/htdocs/index-mike.html b/examples/htdocs/index-mike.html
new file mode 100644 (file)
index 0000000..69cbc96
--- /dev/null
@@ -0,0 +1,29 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>MKWS demo: Mike's playground</title>
+    <link rel="stylesheet" href="mkwsStyle.css" />
+    <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="http://mkws.indexdata.com/libjs-pz2/pz2api.1.js"></script>
+    <script type="text/javascript" src="mkws.js"></script>
+  </head>
+  <body>
+    <div id="mkwsSwitch"></div>
+    <div id="mkwsLang"></div>
+    <div id="mkwsSearch"></div>
+    <div id="mkwsResults"></div>
+    <div id="mkwsTargets"></div>
+    <div id="mkwsStat"></div>
+    <div id="mkwsMOTD">
+      <p>
+       <b>Welcome to the MasterKey Widget Set demo.</b>
+      </p>
+      <p>
+       Enter a search above to begin, or
+       <a href="http://mkws.indexdata.com/"
+          >Visit the MKWS home page to find out more</a>.
+      </p>
+    </div>
+  </body>
+</html>
+
diff --git a/examples/htdocs/index-mkws.html b/examples/htdocs/index-mkws.html
new file mode 100644 (file)
index 0000000..570f42e
--- /dev/null
@@ -0,0 +1,135 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>MKWS: the MasterKey Widget Set</title>
+    <style type="text/css">
+      body {
+      font-family: Gill Sans, "Gillius ADF", Gillius, GilliusADF, Sans-Serif;
+      }
+      h1 { color: #606060 }
+      p { font-weight: bold }
+    </style>
+  </head>
+  <body>
+    <h1>MKWS: the MasterKey Widget Set</h1>
+    <p>
+      This site contains tools, not content:
+    </p>
+    <ul>
+      <li>
+        <a href="mkws.js">mkws.js</a>
+        --
+        JavaScript code that powers the MasterKey Widget Set
+      </li>
+      <li>
+        <a href="/libjs-pz2/pz2api.1.js">/libjs-pz2/pz2api.1.js</a>
+        --
+        Low-level JavaScript library for access to the MasterKey web
+        service.
+      </li>
+      <li>
+        <a href="mkws-complete.js"
+                >mkws-complete.js</a>
+        --
+        A single large JavaScript file containing everything needed for
+        MKWS to work: the widget-set itself, the API library, and any
+        additional prerequisites such as jQuery.
+      </li>
+      <li>
+        <a href="mkwsStyle.css">mkwsStyle.css</a>
+        --
+        A stylesheet which styles only MasterKey widgets, and does not
+        otherwise interfere with application-site's styles.
+    <!--
+        <p style="color:darkred">
+          Note. This is not yet quite true: the stylesheet needs tweaking
+          to make it more specific to only the MKWS components. At present
+          it spills over into styling parts of the containing site, too.
+        </p>
+    -->
+      </li>
+    </ul>
+    <p>
+      For examples of how to use the widget-set, see:
+    </p>
+    <ul>
+      <li>
+        A very simple application at
+        <a href="http://somesite.indexdata.com/"
+                >http://somesite.indexdata.com/</a>.
+        It's worth viewing the source to see how small it is.
+      </li>
+      <li>
+        <a href="http://somesite.indexdata.com/index-full.html"
+           >A more detailed version</a>
+       that contains a configuration structure instead of accepting
+        the defaults. Includes a custom translation option to present
+        the application in Arabic.
+      </li>
+      <li>
+        The
+        <a href="http://somesite.indexdata.com/index-jquery.html"
+           >jQuery plugin</a>
+        version, consisting of a single line of JavaScript code.
+      </li>
+      <li>
+       An application that
+       <a href="http://somesite.indexdata.com/index-lowlevel.html"
+          >uses lower-level MKWS components</a>
+       rather than the all-in-one <tt>#mkwsResults</tt> division,
+       allowing it to use a rather different layout.
+      </li>
+      <li>
+        <a href="http://somesite.indexdata.com/index-mobile.html"
+           >A version suitable for mobile devices</a>,
+       with a responsive design that moves components around
+        depending on the screen size.
+      </li>
+      <li>
+        <a href="http://somesite.indexdata.com/index-popup.html"
+           >A version that uses a jQuery popup</a>.
+      </li>
+      <li>
+        An existing web-site,
+        <a href="http://sagp.miketaylor.org.uk/"
+           >The Self-Appointed Grammar Police</a>,
+        which has been fitted with an MKWS searching widget.
+        (See also the MKWS-widget customisations in
+        <a href="http://sagp.miketaylor.org.uk/style.css"
+           >that site's stylesheet</a>.)
+      </li>
+      <li>
+       Another existing web-site,
+        <a href="http://zthes.z3950.org/"
+           >The Zthes specifications</a>,
+       which has been fitted with a popup MKWS search-box.
+      </li>
+    </ul>
+    <p>
+      The set of targets can be maintained:
+    </p>
+    <ul>
+      <li>
+       Use the main
+       <a href="http://mk2.indexdata.com/console/"
+          >MasterKey Admin Console</a>,
+       and act as the "MK Demo" library administrator.
+      </li>
+    </ul>
+    <p>
+      Documentation is as yet in short supply:
+    </p>
+    <ul>
+      <li>
+        The <a href="README"
+               >README</a> (which may not be fully up to
+        date).
+      </li>
+      <li>
+        The <a href="html-structure.txt"
+               >structure of the HTML generated by the MKWS widgets</a>,
+        which can be used to guide the customisation of its CSS styles.
+      </li>
+    </ul>
+  </body>
+</html>
diff --git a/examples/htdocs/index-mobile.html b/examples/htdocs/index-mobile.html
new file mode 100644 (file)
index 0000000..decaf1c
--- /dev/null
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="copyright" content="(c) 1999-2013 IndexData ApS, http://indexdata.com" />
+    <title>MKWS demo: mobile-screen resizing</title>
+    <link rel="stylesheet" href="http://mkws.indexdata.com/mkwsStyle.css" />
+    <script type="text/javascript">
+       var mkws_config = {
+               lang: "da",
+               debug: 1,
+               use_service_proxy: true,
+               switch_menu: false,
+               lang_menu: true,
+               lang_display: ["da", "en"],
+               sort_default: "relevance",
+               query_width: 50,
+               responsive_design: true,
+               facets: ["authors", "sources", "subjects"],
+               responsive_design_width: 990,
+               perpage_default: 20
+        };
+    </script>
+    <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="http://mkws.indexdata.com/libjs-pz2/pz2api.1.js"></script>
+    <script type="text/javascript" src="mkws.js"></script>
+  </head>
+  <body>
+    <div id="mkwsSwitch"></div>
+    <div id="mkwsLang"></div>
+    <div id="mkwsSearch"></div>
+    <div id="mkwsResults"></div>
+    <div id="mkwsTargets"></div>
+
+    <div id="mkwsShiftedTermlists"></div>
+
+    <div id="footer">
+      <div id="mkwsStat"></div>
+      <span>Powered by MKWS &copy; 2013 <a target="_new" href="http://www.indexdata.com">Index Data</a></span>
+    </div>
+  </body>
+</html>
diff --git a/examples/htdocs/index-popup.html b/examples/htdocs/index-popup.html
new file mode 100644 (file)
index 0000000..01d3218
--- /dev/null
@@ -0,0 +1,72 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>MKWS demo: popup search box</title>
+    <link rel="stylesheet" href="mkwsStyle.css" />
+    <link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
+
+    <script type="text/javascript">
+      mkws_config = { switch_menu: false, lang_menu: false, query_width: 40 };
+    </script>
+    <!-- <script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script> -->
+    <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="http://mkws.indexdata.com/libjs-pz2/pz2api.1.js"></script>
+    <script type="text/javascript" src="mkws.js"></script>
+
+    <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
+
+    <style>
+      body { font-size: 62.5%; }
+      label, input { display:block; }
+      input.text { margin-bottom:12px; width:95%; padding: .4em; }
+      fieldset { padding:0; border:0; margin-top:25px; }
+      h1 { font-size: 1.2em; margin: .6em 0; }
+      div#users-contain { width: 350px; margin: 20px 0; }
+      div#users-contain table { margin: 1em 0; border-collapse: collapse; width: 100%; }
+      div#users-contain table td, div#users-contain table th { border: 1px solid #eee; padding: .6em 10px; text-align: left; }
+      .ui-dialog .ui-state-error { padding: .3em; }
+      .validateTips { border: 1px solid transparent; padding: 0.3em; }
+    </style>
+
+    <script>
+    $(function() {
+      $( "#dialog-form" ).dialog({
+        closeOnEscape: true,
+        autoOpen: false,
+        height: 600,
+        width: 740,
+        modal: true,
+        resizable: true,
+        buttons: {
+                Cancel: function() {
+                        $( this ).dialog( "close" );
+                }
+        },
+        close: function() {
+                // allFields.val( "" ).removeClass( "ui-state-error" );
+        }
+      });
+
+      $( "#create-user" )
+        .button()
+        .click(function() {
+                $( "#dialog-form" ).dialog( "open" );
+        });
+    });
+    </script>
+  </head>
+  <body>
+
+  <div id="dialog-form" title="Search Box">
+    <script type="text/javascript">
+      jQuery.pazpar2();
+    </script>
+  </div>
+
+  <div id="users-contain" class="ui-widget"></div>
+
+  <button id="create-user">Open Search Box</button>
+
+  </body>
+</html>
+
diff --git a/examples/htdocs/index.html b/examples/htdocs/index.html
new file mode 100644 (file)
index 0000000..687aec5
--- /dev/null
@@ -0,0 +1,16 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>MKWS demo client</title>
+    <link rel="stylesheet" href="http://mkws.indexdata.com/mkwsStyle.css" />
+    <script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
+  </head>
+  <body>
+    <div id="mkwsSwitch"></div>
+    <div id="mkwsLang"></div>
+    <div id="mkwsSearch"></div>
+    <div id="mkwsResults"></div>
+    <div id="mkwsTargets"></div>
+    <div id="mkwsStat"></div>
+  </body>
+</html>
diff --git a/examples/htdocs/robots.txt b/examples/htdocs/robots.txt
new file mode 100644 (file)
index 0000000..1f53798
--- /dev/null
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
diff --git a/experiments/jsdemo/jsdemo.conf b/experiments/jsdemo/jsdemo.conf
deleted file mode 100644 (file)
index 5f145bb..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<VirtualHost *:80>
-    ServerName x.mkws.indexdata.com
-    DocumentRoot /usr/local/src/git/pazpar2/www/jsdemo
-    <Directory />
-        Allow from all
-    </Directory>
-    Alias /pazpar2/js/ /usr/local/src/git/pazpar2/js/
-
-    ProxyPreserveHost On
-    <Proxy *>
-        Order deny,allow
-        Allow from all
-    </Proxy>
-    ProxyPass        /pazpar2/js/     !
-    ProxyPass        /pazpar2/        http://localhost:8004/pazpar2/
-    ProxyPassReverse /pazpar2/        http://localhost:8004/pazpar2/
-</VirtualHost>
diff --git a/experiments/spclient/.gitignore b/experiments/spclient/.gitignore
deleted file mode 100644 (file)
index a7392c7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-mkws-complete.js
diff --git a/experiments/spclient/Makefile b/experiments/spclient/Makefile
deleted file mode 100644 (file)
index 38d83f4..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-######################################################################
-# Copyright (c) 2013 IndexData ApS. http://indexdata.com
-#
-
-MKWS_JS=       mkws-complete.js
-all: ${MKWS_JS}
-
-mkws-js ${MKWS_JS}: ../../../libjs-pz2/pz2api.1.js mkws.js
-       ( echo "/* created at: $$(date)"; \
-         echo "   mkws.js GIT id: $$(git log mkws.js | head -n 1 | perl -npe 's,\S+\s+,,') */"; \
-         curl -sSf http://code.jquery.com/jquery-1.10.0.min.js; \
-         cat ../../../libjs-pz2/pz2api.1.js mkws.js ) > ${MKWS_JS}.new 
-       mv -f ${MKWS_JS}.new ${MKWS_JS}
-
-distclean: clean
-clean:
-       rm -f ${MKWS_JS}
-
-help:
-       @echo "make [ help | mkws-js | clean ]"
-       @echo ""
-       @echo "Please check ./README file too!"
-
diff --git a/experiments/spclient/README b/experiments/spclient/README
deleted file mode 100644 (file)
index bcd492c..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-An embryonic MasterKey Widget Set
-=================================
-
-This directory contains an embryonic MasterKey Widget Set, based
-initially on "jsdemo" though now far removed from those beginnnings.
-
-
-How this works
---------------
-
-The goal is to make it that as much of the searching functionality as
-possible is hosted on
-       http://mkws.indexdata.com/
-so that very simple websites such as
-       http://somesite.indexdata.com/
-can have MasterKey searching with minimal effort.
-
-The following files must be hosted on mkws.indexdata.com:
-       mkws.js
-       mkwsStyle.css
-       /libjs-pz2/pz2api.1.js (*)
-
-The following files make up the application:
-       index.html
-       favicon.ico [optional]
-       robots.txt [optional]
-
-(At present, the client application's configuruation also needs an
-Alias for /service-proxy/, to avoid cross-site scripting issues. We
-will fix this.)
-
-(*) if you don't have already installed libjs-pz2 on the machine, you can
-do it by installing a debian package or check it out from GIT:
-$ git clone ssh://git.indexdata.com:222/home/git/pub/libjs-pz2
-
-Configuring a client
---------------------
-
-The application's HTML must contains the following elements as well as
-whatever makes up the application itself:
-
-Prerequisites:
-    <link rel="stylesheet" href="mkwsStyle.css" />
-    <script type="text/javascript">
-       var mkws_config = { };
-    </script>
-    <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
-    <script type="text/javascript" src="/libjs-pz2/pz2api.1.js"></script>
-    <script type="text/javascript" src="mkws.js"></script>
-(Yes, we're using JQuery. We use it only in the most trivial ways, and
-could probably get rid of it without too much pain. I'd like to have
-mkws.js automatically pull in pz2api.1.js, too, so you don't need to
-do so many things, but that's not quite trivial.)
-
-Then the following special <div>s can be added (with no content), and
-will be filled in by MKWS:
-    <div id="mkwsSwitch"></div> -- switch between record and target views
-    <div id="mkwsLang"></div>   -- switch between English, Danish and German
-    <div id="mkwsSearch"></div> -- search box and button
-    <div id="mkwsResults"></div> -- result list, including pager/sorting
-    <div id="mkwsTargets"></div> -- target list, including status
-    <div id="mkwsStat"></div> -- summary statistics
-
-At present, MKWS will not work correctly if any of these is
-missing. One of the TODOs is to fix it so that it doesn't try to use
-whatever is not there, and just uses what is.
-
-
-You can configure and control the client with the JavaScript mkws_config object.
-
-Here is an example of all possible options
-    <script type="text/javascript">
-        var mkws_config = {
-                use_service_proxy: true,    /* true, flase: use service proxy instead pazpar2 */
-               switch_menu: true,          /* true, false: show/hide Records|Targets menu */
-               lang_menu: true,            /* true, false: show/hide language menu */
-               sort_menu: true,            /* true, false: show/hide sort menu */
-               perpage_menu: true,         /* true, false: show/hide perpage menu */
-               lang_display: ["en", "de", "da"], /* display languages links for given
-                                                    languages, [] for all */
-               facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */
-                sort_default: "relevance",  /* "relevance", "title:1", "date:0", "date:1" */
-               query_width: 50,            /* 5..50 */
-                perpage_default: 20,       /* 10, 20, 30, 50 */
-                lang: "en",                 /* "en", "de", "da" */
-               debug: 0,                   /* debug level for development: 0..2 */
-
-               responsive_design: false    /* true, false: resize for smaller mobile devices */
-               pazpar2_url: "/pazpar2/search.pz2",        /* URL */
-               service_proxy_url: "/service-proxy/",      /* URL */
-               service_proxy_auth: "/service-proxy-auth", /* URL */
-         };
-    </script>
-
-Note: the mkws_config object which must be loaded before the mkws.js and pz2api.js files.
-
-Supported Browsers
-------------------
-
-Any modern HTML5 browser will work fine. JavaScript must be enabled.
-
-* IE8 or later
-* Firefox 17 or later
-* Google Chrome 27 or later
-* Safari 6 or later
-* Opera  12 or later
-* iOS 6.x (iPhone, iPad)
-* Android 4.x
-
-Not supported: IE6, IE7
-
-New Features since jsdemo
---------------------------
-- multilinguality: English (default), Danish, German
-- depends on the new pazpar2 JS library libjs-pz2/pz2api.1.js
-  which will make the development of pazpar2 plugins faster and
-  easier to share code between projects
-- supports basic pazpar2 and service-proxy requests
-- simplified HTML
-- the search page is fully configurable by a JSON object
-
-
-What next?
-----------
-
-Main areas of work:
-* Make MKWS robust to missing widgets
-* Clean up the code
diff --git a/experiments/spclient/favicon.ico b/experiments/spclient/favicon.ico
deleted file mode 100644 (file)
index 35c4899..0000000
Binary files a/experiments/spclient/favicon.ico and /dev/null differ
diff --git a/experiments/spclient/html-structure.txt b/experiments/spclient/html-structure.txt
deleted file mode 100644 (file)
index c6d0da8..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-The HTML structure of the MKWS <div>s is as follows. This is useful to
-know when working on stylesheets. As in CSS, #ID indicates a unique
-identifier and .CLASS indicates an instance of a class.
-
-
-#mkwsSwitch
-  a*
-
-#mkwsLang
-  ( a | span )*
-
-#mkwsSearch
-  form
-    input#mkwsQuery type=text
-    input#mkwsButton type=submit
-
-#mkwsBlanket
-  (no contents -- used only for masking)
-
-#mkwsResults
-  table
-    tbody
-      tr
-        td
-          #mkwsTermlists
-            div.title
-            div.facet*
-              div.termtitle
-              ( a span br )*
-        td
-          div#mkwsRanking
-            form#mkwsSelect
-              select#mkwsSort
-              select#mkwsPerpage
-          #mkwsPager
-          #mkwsNavi
-          #mkwsRecords
-            div.record*
-              span (for sequence number)
-              a (for title)
-              span (for other information such as author)
-              div.details (sometimes)
-                table
-                  tbody
-                    tr*
-                      th
-                      td
-#mkwsTargets
-  #mkwsBytarget
-    table
-      thead
-        tr*
-          td*
-      tbody
-        tr*
-          td*
-
-#mkwsStat
-  span.head
-  span.clients
-  span.records
-
diff --git a/experiments/spclient/index-full.html b/experiments/spclient/index-full.html
deleted file mode 100644 (file)
index f82d261..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="copyright" content="(c) 1999-2013 IndexData ApS, http://indexdata.com" />
-    <title>MKWS demo: full configuration</title>
-    <link rel="stylesheet" href="http://mkws.indexdata.com/mkwsStyle.css" />
-    <script type="text/javascript">
-       var mkws_config = {
-               lang: "da",
-               debug: 1,
-               use_service_proxy: true,
-               switch_menu: true,
-               lang_menu: true,
-               sort_default: "relevance",
-               query_width: 50,
-               perpage_default: 20,
-               language_Arabic: {
-                       "Authors": "الكتاب",
-                       "Subjects": "المواضيع",
-                       "Sources": "مصادر",
-                       "Termlists": "العضو الأجل",
-                       "Next": "التالي",
-                       "Prev": "السابق",
-                       "Search": "بحث",
-                       "Sort by": "الترتيب حسب",
-                       "and show": "وعرض",
-                       "per page": "في كل صفحة",
-                       "Displaying": "عرض",
-                       "to": "إلى",
-                       "of": "من",
-                       "found": "أسس",
-                       "Title": "لقب",
-                       "Author": "الكاتب",
-                       "Date": "تاريخ",
-                       "Subject": "موضوع",
-                       "Location": "موقع",
-                       "Records": "أهداف",
-                       "Targets": "السجلات"
-               }
-       };
-    </script>
-    <script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
-  </head>
-  <body>
-    <div id="mkwsSwitch"></div>
-    <div id="mkwsLang"></div>
-    <div id="mkwsSearch"></div>
-    <div id="mkwsResults"></div>
-    <div id="mkwsTargets"></div>
-    <div id="mkwsMOTD">
-      <p>
-       <b>Welcome to the MasterKey Widget Set demo.</b>
-      </p>
-      <p>
-       Enter a search above to begin, or
-       <a href="http://mkws.indexdata.com/"
-          >Visit the MKWS home page to find out more</a>.
-      </p>
-    </div>
-    <div id="footer">
-      <div id="mkwsStat"></div>
-      <span>Powered by MKWS &copy; 2013 <a target="_new" href="http://www.indexdata.com">Index Data</a></span>
-    </div>
-  </body>
-</html>
diff --git a/experiments/spclient/index-jquery.html b/experiments/spclient/index-jquery.html
deleted file mode 100644 (file)
index e2d3e19..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>MKWS demo: jQuery plugin</title>
-    <link rel="stylesheet" href="http://mkws.indexdata.com/mkwsStyle.css" />
-    <script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
-  </head>
-  <body>
-    <script type="text/javascript">jQuery.pazpar2()</script>
-  </body>
-</html>
diff --git a/experiments/spclient/index-lowlevel.html b/experiments/spclient/index-lowlevel.html
deleted file mode 100644 (file)
index f04060d..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>MKWS demo: low-level subcomponents</title>
-    <link rel="stylesheet" href="http://mkws.indexdata.com/mkwsStyle.css" />
-    <script type="text/javascript">
-      var mkws_config = { switch_menu: true };
-    </script>
-    <script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
-    <style type="text/css">
-      #mkwsTermlists div.facet {
-      float:left;
-      width: 30%;
-      margin: 0.3em;
-      }
-      #mkwsStat {
-      text-align: right;
-      }
-    </style>
-  </head>
-  <body>
-    <table width="100%" border="0">
-      <tr>
-        <td>
-          <div id="mkwsSwitch"></div>
-          <div id="mkwsLang"></div>
-          <div id="mkwsSearch"></div>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <div style="height:500px; overflow: auto">
-            <div id="mkwsPager"></div>
-            <div id="mkwsNavi"></div>
-            <div id="mkwsRecords"></div>
-            <div id="mkwsTargets"></div>
-            <div id="mkwsRanking"></div>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <div style="height:300px; overflow: hidden">
-            <div id="mkwsTermlists"></div>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <div id="mkwsStat"></div>
-        </td>
-      </tr>
-    </table>
-  </body>
-</html>
diff --git a/experiments/spclient/index-mike.html b/experiments/spclient/index-mike.html
deleted file mode 100644 (file)
index 69cbc96..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>MKWS demo: Mike's playground</title>
-    <link rel="stylesheet" href="mkwsStyle.css" />
-    <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
-    <script type="text/javascript" src="http://mkws.indexdata.com/libjs-pz2/pz2api.1.js"></script>
-    <script type="text/javascript" src="mkws.js"></script>
-  </head>
-  <body>
-    <div id="mkwsSwitch"></div>
-    <div id="mkwsLang"></div>
-    <div id="mkwsSearch"></div>
-    <div id="mkwsResults"></div>
-    <div id="mkwsTargets"></div>
-    <div id="mkwsStat"></div>
-    <div id="mkwsMOTD">
-      <p>
-       <b>Welcome to the MasterKey Widget Set demo.</b>
-      </p>
-      <p>
-       Enter a search above to begin, or
-       <a href="http://mkws.indexdata.com/"
-          >Visit the MKWS home page to find out more</a>.
-      </p>
-    </div>
-  </body>
-</html>
-
diff --git a/experiments/spclient/index-mkws.html b/experiments/spclient/index-mkws.html
deleted file mode 100644 (file)
index 570f42e..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>MKWS: the MasterKey Widget Set</title>
-    <style type="text/css">
-      body {
-      font-family: Gill Sans, "Gillius ADF", Gillius, GilliusADF, Sans-Serif;
-      }
-      h1 { color: #606060 }
-      p { font-weight: bold }
-    </style>
-  </head>
-  <body>
-    <h1>MKWS: the MasterKey Widget Set</h1>
-    <p>
-      This site contains tools, not content:
-    </p>
-    <ul>
-      <li>
-        <a href="mkws.js">mkws.js</a>
-        --
-        JavaScript code that powers the MasterKey Widget Set
-      </li>
-      <li>
-        <a href="/libjs-pz2/pz2api.1.js">/libjs-pz2/pz2api.1.js</a>
-        --
-        Low-level JavaScript library for access to the MasterKey web
-        service.
-      </li>
-      <li>
-        <a href="mkws-complete.js"
-                >mkws-complete.js</a>
-        --
-        A single large JavaScript file containing everything needed for
-        MKWS to work: the widget-set itself, the API library, and any
-        additional prerequisites such as jQuery.
-      </li>
-      <li>
-        <a href="mkwsStyle.css">mkwsStyle.css</a>
-        --
-        A stylesheet which styles only MasterKey widgets, and does not
-        otherwise interfere with application-site's styles.
-    <!--
-        <p style="color:darkred">
-          Note. This is not yet quite true: the stylesheet needs tweaking
-          to make it more specific to only the MKWS components. At present
-          it spills over into styling parts of the containing site, too.
-        </p>
-    -->
-      </li>
-    </ul>
-    <p>
-      For examples of how to use the widget-set, see:
-    </p>
-    <ul>
-      <li>
-        A very simple application at
-        <a href="http://somesite.indexdata.com/"
-                >http://somesite.indexdata.com/</a>.
-        It's worth viewing the source to see how small it is.
-      </li>
-      <li>
-        <a href="http://somesite.indexdata.com/index-full.html"
-           >A more detailed version</a>
-       that contains a configuration structure instead of accepting
-        the defaults. Includes a custom translation option to present
-        the application in Arabic.
-      </li>
-      <li>
-        The
-        <a href="http://somesite.indexdata.com/index-jquery.html"
-           >jQuery plugin</a>
-        version, consisting of a single line of JavaScript code.
-      </li>
-      <li>
-       An application that
-       <a href="http://somesite.indexdata.com/index-lowlevel.html"
-          >uses lower-level MKWS components</a>
-       rather than the all-in-one <tt>#mkwsResults</tt> division,
-       allowing it to use a rather different layout.
-      </li>
-      <li>
-        <a href="http://somesite.indexdata.com/index-mobile.html"
-           >A version suitable for mobile devices</a>,
-       with a responsive design that moves components around
-        depending on the screen size.
-      </li>
-      <li>
-        <a href="http://somesite.indexdata.com/index-popup.html"
-           >A version that uses a jQuery popup</a>.
-      </li>
-      <li>
-        An existing web-site,
-        <a href="http://sagp.miketaylor.org.uk/"
-           >The Self-Appointed Grammar Police</a>,
-        which has been fitted with an MKWS searching widget.
-        (See also the MKWS-widget customisations in
-        <a href="http://sagp.miketaylor.org.uk/style.css"
-           >that site's stylesheet</a>.)
-      </li>
-      <li>
-       Another existing web-site,
-        <a href="http://zthes.z3950.org/"
-           >The Zthes specifications</a>,
-       which has been fitted with a popup MKWS search-box.
-      </li>
-    </ul>
-    <p>
-      The set of targets can be maintained:
-    </p>
-    <ul>
-      <li>
-       Use the main
-       <a href="http://mk2.indexdata.com/console/"
-          >MasterKey Admin Console</a>,
-       and act as the "MK Demo" library administrator.
-      </li>
-    </ul>
-    <p>
-      Documentation is as yet in short supply:
-    </p>
-    <ul>
-      <li>
-        The <a href="README"
-               >README</a> (which may not be fully up to
-        date).
-      </li>
-      <li>
-        The <a href="html-structure.txt"
-               >structure of the HTML generated by the MKWS widgets</a>,
-        which can be used to guide the customisation of its CSS styles.
-      </li>
-    </ul>
-  </body>
-</html>
diff --git a/experiments/spclient/index-mobile.html b/experiments/spclient/index-mobile.html
deleted file mode 100644 (file)
index decaf1c..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="copyright" content="(c) 1999-2013 IndexData ApS, http://indexdata.com" />
-    <title>MKWS demo: mobile-screen resizing</title>
-    <link rel="stylesheet" href="http://mkws.indexdata.com/mkwsStyle.css" />
-    <script type="text/javascript">
-       var mkws_config = {
-               lang: "da",
-               debug: 1,
-               use_service_proxy: true,
-               switch_menu: false,
-               lang_menu: true,
-               lang_display: ["da", "en"],
-               sort_default: "relevance",
-               query_width: 50,
-               responsive_design: true,
-               facets: ["authors", "sources", "subjects"],
-               responsive_design_width: 990,
-               perpage_default: 20
-        };
-    </script>
-    <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
-    <script type="text/javascript" src="http://mkws.indexdata.com/libjs-pz2/pz2api.1.js"></script>
-    <script type="text/javascript" src="mkws.js"></script>
-  </head>
-  <body>
-    <div id="mkwsSwitch"></div>
-    <div id="mkwsLang"></div>
-    <div id="mkwsSearch"></div>
-    <div id="mkwsResults"></div>
-    <div id="mkwsTargets"></div>
-
-    <div id="mkwsShiftedTermlists"></div>
-
-    <div id="footer">
-      <div id="mkwsStat"></div>
-      <span>Powered by MKWS &copy; 2013 <a target="_new" href="http://www.indexdata.com">Index Data</a></span>
-    </div>
-  </body>
-</html>
diff --git a/experiments/spclient/index-popup.html b/experiments/spclient/index-popup.html
deleted file mode 100644 (file)
index 01d3218..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>MKWS demo: popup search box</title>
-    <link rel="stylesheet" href="mkwsStyle.css" />
-    <link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
-
-    <script type="text/javascript">
-      mkws_config = { switch_menu: false, lang_menu: false, query_width: 40 };
-    </script>
-    <!-- <script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script> -->
-    <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
-    <script type="text/javascript" src="http://mkws.indexdata.com/libjs-pz2/pz2api.1.js"></script>
-    <script type="text/javascript" src="mkws.js"></script>
-
-    <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
-
-    <style>
-      body { font-size: 62.5%; }
-      label, input { display:block; }
-      input.text { margin-bottom:12px; width:95%; padding: .4em; }
-      fieldset { padding:0; border:0; margin-top:25px; }
-      h1 { font-size: 1.2em; margin: .6em 0; }
-      div#users-contain { width: 350px; margin: 20px 0; }
-      div#users-contain table { margin: 1em 0; border-collapse: collapse; width: 100%; }
-      div#users-contain table td, div#users-contain table th { border: 1px solid #eee; padding: .6em 10px; text-align: left; }
-      .ui-dialog .ui-state-error { padding: .3em; }
-      .validateTips { border: 1px solid transparent; padding: 0.3em; }
-    </style>
-
-    <script>
-    $(function() {
-      $( "#dialog-form" ).dialog({
-        closeOnEscape: true,
-        autoOpen: false,
-        height: 600,
-        width: 740,
-        modal: true,
-        resizable: true,
-        buttons: {
-                Cancel: function() {
-                        $( this ).dialog( "close" );
-                }
-        },
-        close: function() {
-                // allFields.val( "" ).removeClass( "ui-state-error" );
-        }
-      });
-
-      $( "#create-user" )
-        .button()
-        .click(function() {
-                $( "#dialog-form" ).dialog( "open" );
-        });
-    });
-    </script>
-  </head>
-  <body>
-
-  <div id="dialog-form" title="Search Box">
-    <script type="text/javascript">
-      jQuery.pazpar2();
-    </script>
-  </div>
-
-  <div id="users-contain" class="ui-widget"></div>
-
-  <button id="create-user">Open Search Box</button>
-
-  </body>
-</html>
-
diff --git a/experiments/spclient/index.html b/experiments/spclient/index.html
deleted file mode 100644 (file)
index 687aec5..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>MKWS demo client</title>
-    <link rel="stylesheet" href="http://mkws.indexdata.com/mkwsStyle.css" />
-    <script type="text/javascript" src="http://mkws.indexdata.com/mkws-complete.js"></script>
-  </head>
-  <body>
-    <div id="mkwsSwitch"></div>
-    <div id="mkwsLang"></div>
-    <div id="mkwsSearch"></div>
-    <div id="mkwsResults"></div>
-    <div id="mkwsTargets"></div>
-    <div id="mkwsStat"></div>
-  </body>
-</html>
diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
deleted file mode 100644 (file)
index 98ac5ee..0000000
+++ /dev/null
@@ -1,873 +0,0 @@
-/* A very simple client that shows a basic usage of the pz2.js
-*/
-
-"use strict"; // HTML5: disable for debug >= 2
-
-/*
- * global config object: mkws_config
- *
- * needs to be defined in the HTML header before
- * including this JS file
- */
-
-if (!mkws_config)
-    var mkws_config = {}; // for the guys who forgot to define mkws_config...
-
-if (typeof mkws_config.use_service_proxy === 'undefined')
-    mkws_config.use_service_proxy = true;
-
-// global debug flag
-var mkws_debug;
-
-var pazpar2_url = mkws_config.pazpar2_url ? mkws_config.pazpar2_url : "/pazpar2/search.pz2";
-var service_proxy_url = mkws_config.service_proxy_url ? mkws_config.service_proxy_url : "http://mkws.indexdata.com/service-proxy/";
-
-var pazpar2path = mkws_config.use_service_proxy ? service_proxy_url : pazpar2_url;
-var usesessions = mkws_config.use_service_proxy ? false : true;
-
-
-var mkws_locale_lang = {
-    "de": {
-       "Authors": "Autoren",
-       "Subjects": "Schlagw&ouml;rter",
-       "Sources": "Daten und Quellen",
-       "Termlists": "Termlisten",
-       "Next": "Weiter",
-       "Prev": "Zur&uuml;ck",
-       "Search": "Suche",
-       "Sort by": "Sortieren nach",
-       "and show": "und zeige",
-       "per page": "pro Seite",
-       "Displaying": "Zeige",
-       "to": "von",
-       "of": "aus",
-       "found": "gefunden",
-       "Title": "Titel",
-       "Author": "Autor",
-       "Date": "Datum",
-       "Subject": "Schlagwort",
-       "Location": "Ort",
-
-       "dummy": "dummy"
-    },
-
-    "da": {
-       "Authors": "Forfattere",
-       "Subjects": "Emner",
-       "Sources": "Kilder",
-       "Termlists": "Termlists",
-       "Next": "N&aelig;ste",
-       "Prev": "Forrige",
-       "Search": "S&oslash;g",
-       "Sort by": "Sorter efter",
-       "and show": "og vis",
-       "per page": "per side",
-       "Displaying": "Viser",
-       "to": "til",
-       "of": "ud af",
-       "found": "fandt",
-       "Title": "Title",
-       "Author": "Forfatter",
-       "Date": "Dato",
-       "Subject": "Emneord",
-       "Location": "Lokation",
-
-       "dummy": "dummy"
-    }
-};
-
-
-for (var key in mkws_config) {
-    if (mkws_config.hasOwnProperty(key)) {
-       if (key.match(/^language_/)) {
-           var lang = key.replace(/^language_/, "");
-           // Copy custom languages into list
-           mkws_locale_lang[lang] = mkws_config[key];
-       }
-    }
-}
-
-
-// create a parameters array and pass it to the pz2's constructor
-// then register the form submit event with the pz2.search function
-// autoInit is set to true on default
-var my_paz = new pz2( { "onshow": my_onshow,
-                    "showtime": 500,            //each timer (show, stat, term, bytarget) can be specified this way
-                    "pazpar2path": pazpar2path,
-                    "oninit": my_oninit,
-                    "onstat": my_onstat,
-                    "onterm": my_onterm,
-                    "termlist": "xtargets,subject,author",
-                    "onbytarget": my_onbytarget,
-                   "usesessions" : usesessions,
-                    "showResponseType": '', // or "json" (for debugging?)
-                    "onrecord": my_onrecord } );
-// some state vars
-var curPage = 1;
-var recPerPage = 20;
-var totalRec = 0;
-var curDetRecId = '';
-var curDetRecData = null;
-var curSort = 'relevance';
-var curFilter = null;
-var submitted = false;
-var SourceMax = 16;
-var SubjectMax = 10;
-var AuthorMax = 10;
-
-//
-// pz2.js event handlers:
-//
-function my_oninit() {
-    my_paz.stat();
-    my_paz.bytarget();
-}
-
-function my_onshow(data) {
-    totalRec = data.merged;
-    // move it out
-    var pager = document.getElementById("mkwsPager");
-    pager.innerHTML = "";
-    pager.innerHTML +='<div style="float: right">' + M('Displaying') + ': '
-                    + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
-                     ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
-                     + data.total + ')</div>';
-    drawPager(pager);
-    // navi
-    var results = document.getElementById("mkwsRecords");
-
-    var html = [];
-    for (var i = 0; i < data.hits.length; i++) {
-        var hit = data.hits[i];
-             html.push('<div class="record" id="mkwsRecdiv_'+hit.recid+'" >'
-            +'<span>'+ (i + 1 + recPerPage * (curPage - 1)) +'. </span>'
-            +'<a href="#" id="mkwsRec_'+hit.recid
-            +'" onclick="showDetails(this.id);return false;"><b>'
-            + hit["md-title"] +' </b></a>');
-             if (hit["md-title-remainder"] !== undefined) {
-               html.push('<span>' + hit["md-title-remainder"] + ' </span>');
-             }
-             if (hit["md-title-responsibility"] !== undefined) {
-           html.push('<span><i>'+hit["md-title-responsibility"]+'</i></span>');
-       }
-        if (hit.recid == curDetRecId) {
-            html.push(renderDetails(curDetRecData));
-        }
-       html.push('</div>');
-    }
-    replaceHtml(results, html.join(''));
-}
-
-function my_onstat(data) {
-    var stat = document.getElementById("mkwsStat");
-    if (stat == null)
-       return;
-
-    stat.innerHTML = '<span class="head">Status info</span>' +
-       ' -- ' +
-       '<span class="clients">' + data.activeclients + '/' + data.clients + '</span>' +
-       ' -- ' +
-        '<span class="records">' + data.records + '/' + data.hits + '</span>';
-}
-
-function my_onterm(data) {
-    // no facets
-    if (!mkws_config.facets || mkws_config.facets.length == 0) {
-       $("#mkwsTermlists").hide();
-       return;
-    }
-
-    // display if we first got results
-    $("#mkwsTermlists").show();
-
-    var acc = [];
-    acc.push('<div class="title">' + M('Termlists') + '</div>');
-    var facets = mkws_config.facets;
-
-    for(var i = 0; i < facets.length; i++) {
-       if (facets[i] == "sources") {
-           add_single_facet(acc, "Sources",  data.xtargets, SourceMax, null);
-       } else if (facets[i] == "subjects") {
-           add_single_facet(acc, "Subjects", data.subject,  SubjectMax, "su");
-       } else if (facets[i] == "authors") {
-           add_single_facet(acc, "Authors",  data.author,   AuthorMax, "au");
-       } else {
-           alert("bad facet configuration: '" + facets[i] + "'");
-       }
-    }
-
-    var termlist = document.getElementById("mkwsTermlists");
-    replaceHtml(termlist, acc.join(''));
-
-    if (mkws_config.responsive_design)
-        mkws_mobile_resize();
-}
-
-function add_single_facet(acc, caption, data, max, cclIndex) {
-    acc.push('<div class="facet">');
-    acc.push('<div class="termtitle">' + M(caption) + '</div>');
-    for (var i = 0; i < data.length && i < max; i++ ) {
-        acc.push('<a href="#" ');
-       var action;
-       if (!cclIndex) {
-           // Special case: target selection
-           acc.push('target_id='+data[i].id+' ');
-           action = 'limitTarget(this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
-       } else {
-           action = 'limitQuery(\'' + cclIndex + '\', this.firstChild.nodeValue)';
-       }
-       acc.push('onclick="' + action + ';return false;">' + data[i].name + '</a>'
-                + '<span> (' + data[i].freq + ')</span><br/>');
-    }
-    acc.push('</div>');
-}
-
-function my_onrecord(data) {
-    // FIXME: record is async!!
-    clearTimeout(my_paz.recordTimer);
-    // in case on_show was faster to redraw element
-    var detRecordDiv = document.getElementById('mkwsDet_'+data.recid);
-    if (detRecordDiv) return;
-    curDetRecData = data;
-    var recordDiv = document.getElementById('mkwsRecdiv_'+curDetRecData.recid);
-    var html = renderDetails(curDetRecData);
-    recordDiv.innerHTML += html;
-}
-
-function my_onbytarget(data) {
-    var targetDiv = document.getElementById("mkwsBytarget");
-    var table ='<table><thead><tr><td>Target ID</td><td>Hits</td><td>Diags</td>'
-        +'<td>Records</td><td>State</td></tr></thead><tbody>';
-
-    for (var i = 0; i < data.length; i++ ) {
-        table += "<tr><td>" + data[i].id +
-            "</td><td>" + data[i].hits +
-            "</td><td>" + data[i].diagnostic +
-            "</td><td>" + data[i].records +
-            "</td><td>" + data[i].state + "</td></tr>";
-    }
-
-    table += '</tbody></table>';
-    targetDiv.innerHTML = table;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-
-// wait until the DOM is ready
-function domReady ()
-{
-    document.mkwsSearchForm.onsubmit = onFormSubmitEventHandler;
-    document.mkwsSearchForm.mkwsQuery.value = '';
-    if (document.mkwsSelect) {
-       if (document.mkwsSelect.mkwsSort)
-           document.mkwsSelect.mkwsSort.onchange = onSelectDdChange;
-       if (document.mkwsSelect.mkwsPerpage)
-           document.mkwsSelect.mkwsPerpage.onchange = onSelectDdChange;
-    }
-}
-
-// when search button pressed
-function onFormSubmitEventHandler()
-{
-    resetPage();
-    loadSelect();
-    triggerSearch();
-    switchView('records'); // In case it's configured to start off as hidden
-    submitted = true;
-    return false;
-}
-
-function onSelectDdChange()
-{
-    if (!submitted) return false;
-    resetPage();
-    loadSelect();
-    my_paz.show(0, recPerPage, curSort);
-    return false;
-}
-
-function resetPage()
-{
-    curPage = 1;
-    totalRec = 0;
-}
-
-function triggerSearch ()
-{
-    my_paz.search(document.mkwsSearchForm.mkwsQuery.value, recPerPage, curSort, curFilter);
-}
-
-function loadSelect ()
-{
-    if (document.mkwsSelect) {
-       if (document.mkwsSelect.mkwsSort)
-           curSort = document.mkwsSelect.mkwsSort.value;
-       if (document.mkwsSelect.mkwsPerpage)
-           recPerPage = document.mkwsSelect.mkwsPerpage.value;
-    }
-}
-
-// limit the query after clicking the facet
-function limitQuery (field, value)
-{
-    document.mkwsSearchForm.query.value += ' and ' + field + '="' + value + '"';
-    onFormSubmitEventHandler();
-}
-
-// limit by target functions
-function limitTarget (id, name)
-{
-    var navi = document.getElementById('mkwsNavi');
-    navi.innerHTML =
-        'Source: <a class="crossout" href="#" onclick="delimitTarget();return false;">'
-        + name + '</a>';
-    curFilter = 'pz:id=' + id;
-    resetPage();
-    loadSelect();
-    triggerSearch();
-    return false;
-}
-
-function delimitTarget ()
-{
-    var navi = document.getElementById('mkwsNavi');
-    navi.innerHTML = '';
-    curFilter = null;
-    resetPage();
-    loadSelect();
-    triggerSearch();
-    return false;
-}
-
-function drawPager (pagerDiv)
-{
-    //client indexes pages from 1 but pz2 from 0
-    var onsides = 6;
-    var pages = Math.ceil(totalRec / recPerPage);
-
-    var firstClkbl = ( curPage - onsides > 0 )
-        ? curPage - onsides
-        : 1;
-
-    var lastClkbl = firstClkbl + 2*onsides < pages
-        ? firstClkbl + 2*onsides
-        : pages;
-
-    var prev = '<span id="mkwsPrev">&#60;&#60; ' + M('Prev') + '</span><b> | </b>';
-    if (curPage > 1)
-        prev = '<a href="#" id="mkwsPrev" onclick="pagerPrev();">'
-        +'&#60;&#60; ' + M('Prev') + '</a><b> | </b>';
-
-    var middle = '';
-    for(var i = firstClkbl; i <= lastClkbl; i++) {
-        var numLabel = i;
-        if(i == curPage)
-            numLabel = '<b>' + i + '</b>';
-
-        middle += '<a href="#" onclick="showPage(' + i + ')"> '
-            + numLabel + ' </a>';
-    }
-
-    var next = '<b> | </b><span id="mkwsNext">' + M('Next') + ' &#62;&#62;</span>';
-    if (pages - curPage > 0)
-        next = '<b> | </b><a href="#" id="mkwsNext" onclick="pagerNext()">'
-        + M('Next') + ' &#62;&#62;</a>';
-
-    var predots = '';
-    if (firstClkbl > 1)
-        predots = '...';
-
-    var postdots = '';
-    if (lastClkbl < pages)
-        postdots = '...';
-
-    pagerDiv.innerHTML += '<div style="float: clear">'
-        + prev + predots + middle + postdots + next + '</div>';
-}
-
-function showPage (pageNum)
-{
-    curPage = pageNum;
-    my_paz.showPage( curPage - 1 );
-}
-
-// simple paging functions
-
-function pagerNext() {
-    if ( totalRec - recPerPage*curPage > 0) {
-        my_paz.showNext();
-        curPage++;
-    }
-}
-
-function pagerPrev() {
-    if ( my_paz.showPrev() != false )
-        curPage--;
-}
-
-// switching view between targets and records
-
-function switchView(view) {
-    var targets = document.getElementById('mkwsTargets');
-    var results = document.getElementById('mkwsResults') ||
-                 document.getElementById('mkwsRecords');
-    var blanket = document.getElementById('mkwsBlanket');
-    var motd    = document.getElementById('mkwsEmbeddedMOTD');
-
-    switch(view) {
-        case 'targets':
-            if (targets) targets.style.display = "block";
-            if (results) results.style.display = "none";
-            if (blanket) blanket.style.display = "none";
-            if (motd) motd.style.display = "none";
-            break;
-        case 'records':
-            if (targets) targets.style.display = "none";
-            if (results) results.style.display = "block";
-            if (blanket) blanket.style.display = "block";
-            if (motd) motd.style.display = "none";
-            break;
-       case 'none':
-            if (targets) targets.style.display = "none";
-            if (results) results.style.display = "none";
-            if (blanket) blanket.style.display = "none";
-            if (motd) motd.style.display = "none";
-            break;
-        default:
-            alert("Unknown view '" + view + "'");
-    }
-}
-
-// detailed record drawing
-function showDetails (prefixRecId) {
-    var recId = prefixRecId.replace('mkwsRec_', '');
-    var oldRecId = curDetRecId;
-    curDetRecId = recId;
-
-    // remove current detailed view if any
-    var detRecordDiv = document.getElementById('mkwsDet_'+oldRecId);
-    // lovin DOM!
-    if (detRecordDiv)
-      detRecordDiv.parentNode.removeChild(detRecordDiv);
-
-    // if the same clicked, just hide
-    if (recId == oldRecId) {
-        curDetRecId = '';
-        curDetRecData = null;
-        return;
-    }
-    // request the record
-    my_paz.record(recId);
-}
-
-function replaceHtml(el, html) {
-  var oldEl = typeof el === "string" ? document.getElementById(el) : el;
-  /*@cc_on // Pure innerHTML is slightly faster in IE
-    oldEl.innerHTML = html;
-    return oldEl;
-    @*/
-  var newEl = oldEl.cloneNode(false);
-  newEl.innerHTML = html;
-  oldEl.parentNode.replaceChild(newEl, oldEl);
-  /* Since we just removed the old element from the DOM, return a reference
-     to the new element, which can be used to restore variable references. */
-  return newEl;
-};
-
-function renderDetails(data, marker)
-{
-    var details = '<div class="details" id="mkwsDet_'+data.recid+'"><table>';
-    if (marker) details += '<tr><td>'+ marker + '</td></tr>';
-
-    details += renderField("Title", data["md-title"], data["md-title-remainder"], data["md-title-responsibility"]);
-    details += renderField("Date", data["md-date"]);
-    details += renderField("Author", data["md-author"]);
-    details += renderField("URL", data["md-electronic-url"]);
-    details += renderField("Subject", data["location"][0]["md-subject"]);
-    details += renderField("Location", data["location"][0]["@name"], data["location"][0]["@id"]);
-    details += '</table></div>';
-
-    return details;
-}
-
-function renderField(caption, data, data2, data3) {
-    if (data === undefined) {
-       return "";
-    }
-
-    if (caption == "URL") {
-       data = '<a href="' + data + '" target="_blank">' + data + '</a>';
-    }
-
-    if (data2 != undefined) {
-       data = data + " (" + data2 + ")";
-    }
-
-    if (data3 != undefined) {
-       data = data + " <i>" + data3 + "</i>";
-    }
-
-    return '<tr><th>' + M(caption) + '</th><td>' + data + '</td></tr>';
-}
-
-
-/*
- * All the HTML stuff to render the search forms and
- * result pages.
- */
-function mkws_html_all(config) {
-
-    /* default mkws config */
-    var mkws_config_default = {
-       sort: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
-       perpage: [10, 20, 30, 50],
-       sort_default: "relevance",
-       perpage_default: 20,
-       query_width: 50,
-       switch_menu: false,     /* show/hide Records|Targets menu */
-       lang_menu: true,        /* show/hide language menu */
-       sort_menu: true,        /* show/hide sort menu */
-       perpage_menu: true,     /* show/hide perpage menu */
-       lang_display: [],       /* display languages links for given languages, [] for all */
-       facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */
-       responsive_design_width: 980, /* a page with less pixel width considered as mobile */
-       debug: 1,     /* debug level for development: 0..2 */
-
-       dummy: "dummy"
-    };
-
-    /* set global debug flag early */
-    if (typeof config.debug !== 'undefined') {
-       mkws_debug = config.debug;
-    } else if (typeof mkws_config_default.debug !== 'undefined') {
-       mkws_debug = mkws_config_default.debug;
-    }
-
-    /* override standard config values by function parameters */
-    for (var k in mkws_config_default) {
-       if (typeof config[k] === 'undefined')
-          mkws_config[k] = mkws_config_default[k];
-       debug("Set config: " + k + ' => ' + mkws_config[k]);
-    }
-
-    if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
-       debug("Reset query width: " + mkws_config.query_width);
-       mkws_config.query_width = 50;
-    }
-
-    mkws_set_lang(mkws_config);
-    if (mkws_config.lang_menu)
-       mkws_html_lang(mkws_config);
-
-    // For some reason, doing this programmatically results in
-    // document.mkwsSearchForm.mkwsQuery being undefined, hence the raw HTML.
-    debug("HTML search form");
-    $("#mkwsSearch").html('\
-    <form name="mkwsSearchForm" action="" >\
-      <input id="mkwsQuery" type="text" size="' + mkws_config.query_width + '" />\
-      <input id="mkwsButton" type="submit" value="' + M('Search') + '" />\
-    </form>');
-
-    debug("HTML records");
-    // If the application has an #mkwsResults, populate it in the
-    // usual way. If not, assume that it's a smarter application that
-    // defines its own subcomponents:
-    // #mkwsTermlists
-    // #mkwsRanking
-    // #mkwsPager
-    // #mkwsNavi
-    // #mkwsRecords
-    if ($("#mkwsResults").length) {
-       $("#mkwsResults").html('\
-      <table width="100%" border="0" cellpadding="6" cellspacing="0">\
-        <tr>\
-          <td width="250" valign="top">\
-            <div id="mkwsTermlists"></div>\
-          </td>\
-          <td valign="top">\
-            <div id="mkwsRanking"></div>\
-            <div id="mkwsPager"></div>\
-            <div id="mkwsNavi"></div>\
-            <div id="mkwsRecords"></div>\
-            <div id="mkwsEmbeddedMOTD"></div>\
-          </td>\
-        </tr>\
-      </table>');
-    }
-
-    if ($("#mkwsRanking").length) {
-       var ranking_data = '';
-       ranking_data += '<form name="mkwsSelect" id="mkwsSelect" action="" >';
-       if (config.sort_menu) {
-           ranking_data +=  M('Sort by') + ' ' + mkws_html_sort(config) + ' ';
-       }
-       if (config.perpage_menu) {
-           ranking_data += M('and show') + ' ' + mkws_html_perpage(config) + ' ' + M('per page') + '.';
-       }
-        ranking_data += '</form>';
-
-       $("#mkwsRanking").html(ranking_data);
-    }
-
-    mkws_html_switch(config);
-
-    if (mkws_config.use_service_proxy)
-       mkws_service_proxy_auth(config.service_proxy_auth);
-
-    if (mkws_config.responsive_design)
-       mkws_responsive_design();
-
-    domReady();
-
-    // on first page, hide the termlist
-    $(document).ready(function() { $("#mkwsTermlists").hide(); } );
-    var elem = document.getElementById("mkwsMOTD");
-    if (elem) {
-       // Move the MOTD from the provided element down into the embedded one
-       document.getElementById("mkwsEmbeddedMOTD").innerHTML = elem.innerHTML;
-        elem.style.display = "none";
-    }
-}
-
-/* Responsive web design - change layout on the fly depending on
- * the current screen size width/height. Required for mobile devices.
- */
-function mkws_responsive_design () {
-    var timeout = null;
-
-    $(window).resize( function(e) {
-       if (timeout)
-           clearTimeout(timeout);
-       timeout = setTimeout(function () { mkws_mobile_resize() }, 50);
-    });
-
-    // initial check after page load
-    $(document).ready(function() { mkws_mobile_resize() });
-}
-
-function mkws_set_lang(mkws_config)  {
-    var lang = jQuery.parseQuerystring().lang || mkws_config.lang || "";
-    if (!lang || !mkws_locale_lang[lang]) {
-       mkws_config.lang = ""
-    } else {
-       mkws_config.lang = lang;
-    }
-
-    debug("Locale language: " + (mkws_config.lang ? mkws_config.lang : "none"));
-    return mkws_config.lang;
-}
-
-function mkws_html_switch(config) {
-    debug("HTML switch");
-
-    $("#mkwsSwitch").html($("<a/>", {
-       href: '#',
-       onclick: "switchView(\'records\')",
-       text: M("Records")
-    }));
-    $("#mkwsSwitch").append($("<span/>", { text: " | " }));
-    $("#mkwsSwitch").append($("<a/>", {
-       href: '#',
-       onclick: "switchView(\'targets\')",
-       text: M("Targets")
-    }));
-
-    debug("HTML targets");
-    $("#mkwsTargets").html('\
-      <div id="mkwsBytarget">\
-       No information available yet.\
-      </div>');
-    $("#mkwsTargets").css("display", "none");
-
-    if (!config.switch_menu) {
-       debug("disable switch menu");
-        $("#mkwsSwitch").css("display", "none");
-    }
-}
-
-function mkws_html_sort(config) {
-    debug("HTML sort");
-    var sort_html = '<select name="mkwsSort" id="mkwsSort">';
-
-    for(var i = 0; i < config.sort.length; i++) {
-       var key = config.sort[i][0];
-       var val = config.sort[i].length == 1 ? config.sort[i][0] : config.sort[i][1];
-
-       sort_html += '<option value="' + key + '"';
-       if (key == config.sort_default) {
-           sort_html += ' selected="selected"';
-       }
-       sort_html += '>' + val + '</option>';
-    }
-    sort_html += '</select>';
-
-    return sort_html;
-}
-
-function mkws_html_perpage(config) {
-    debug("HTML perpage");
-    var perpage_html = '<select name="mkwsPerpage" id="mkwsPerpage">';
-
-    for(var i = 0; i < config.perpage.length; i++) {
-       var key = config.perpage[i];
-
-       perpage_html += '<option value="' + key + '"';
-       if (key == config.perpage_default) {
-           perpage_html += ' selected="selected"';
-       }
-       perpage_html += '>' + key + '</option>';
-    }
-    perpage_html += '</select>';
-
-    return perpage_html;
-}
-
-/*
- * Run service-proxy authentication in background (after page load).
- * The username/password is configured in the apache config file
- * for the site.
- */
-function mkws_service_proxy_auth(auth_url) {
-    if (!auth_url)
-       auth_url = "http://mkws.indexdata.com/service-proxy-auth";
-
-    debug("Run service proxy auth URL: " + auth_url);
-
-    var request = new pzHttpRequest(auth_url);
-    request.get(null, function(data) {
-       if (!jQuery.isXMLDoc(data)) {
-           alert("service proxy auth response document is not valid XML document, give up!");
-           return;
-       }
-       var status = $(data).find("status");
-       if (status.text() != "OK") {
-           alert("service proxy auth repsonse status: " + status.text() + ", give up!");
-           return;
-       }
-    });
-}
-
-/* create locale language menu */
-function mkws_html_lang(mkws_config) {
-    var lang_default = "en";
-    var lang = mkws_config.lang || lang_default;
-    var list = [];
-
-    /* display a list of configured languages, or all */
-    var lang_display = mkws_config.lang_display || [];
-    var hash = {};
-    for (var i = 0; i < lang_display.length; i++) {
-       hash[lang_display[i]] = 1;
-    }
-
-    for (var k in mkws_locale_lang) {
-       if (hash[k] == 1 || lang_display.length == 0)
-           list.push(k);
-    }
-
-    // add english link
-    if (lang_display.length == 0 || hash[lang_default] == 1)
-        list.push(lang_default);
-
-    debug("Language menu for: " + list.join(", "));
-
-    /* the HTML part */
-    var data = "";
-    for(var i = 0; i < list.length; i++) {
-       var l = list[i];
-
-       if (data)
-           data += ' | ';
-
-       if (lang == l) {
-           data += ' <span>' + l + '</span> ';
-       } else {
-           data += ' <a href="?lang=' + l + '">' + l + '</a> '
-       }
-    }
-
-    $("#mkwsLang").html(data);
-}
-
-function mkws_mobile_resize () {
-    debug("resize width: " + $(window).height() + ", width: " + $(window).width());
-    var list = ["mkwsSwitch"];
-    var obj;
-    // alert($(window).width());
-
-    var width = mkws_config.responsive_design_width || 980;
-
-    if ($(window).width() <= width) {
-       for(var i = 0; i < list.length; i++) {
-           $("#" + list[i]).hide();
-       }
-
-       $("#mkwsTermlists").hide();
-       obj = $("#mkwsTermlists").html();
-        $("#mkwsShiftedTermlists").html(obj);
-    } else {
-       for(var i = 0; i < list.length; i++) {
-           $("#" + list[i]).show();
-       }
-       $("#mkwsTermlists").show();
-       $("#mkwsShiftedTermlists").html("");
-    }
-};
-
-/* locale */
-function M(word) {
-    var lang = mkws_config.lang;
-
-    if (!lang || !mkws_locale_lang[lang])
-       return word;
-
-    return mkws_locale_lang[lang][word] ? mkws_locale_lang[lang][word] : word;
-}
-
-/* implement jQuery.parseQuerystring() for parsing URL parameters */
-jQuery.extend({
-  parseQuerystring: function() {
-    var nvpair = {};
-    var qs = window.location.search.replace('?', '');
-    var pairs = qs.split('&');
-    $.each(pairs, function(i, v){
-       var pair = v.split('=');
-       nvpair[pair[0]] = pair[1];
-    });
-    return nvpair;
-  },
-  pazpar2: function(data) {
-       document.write('<div id="mkwsSwitch"></div>\
-    <div id="mkwsLang"></div>\
-    <div id="mkwsSearch"></div>\
-    <div id="mkwsResults"></div>\
-    <div id="mkwsTargets"></div>\
-    <div id="mkwsFooter">\
-      <div id="mkwsStat"></div>\
-      <span>Powered by MKWS &copy; 2013 <a target="_new" href="http://www.indexdata.com">Index Data</a></span>\
-    </div>');
-
-    mkws_html_all(mkws_config);
-  }
-});
-
-function debug(string) {
-    if (!mkws_debug)
-       return;
-
-    if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
-       return;
-    }
-
-    // you need to disable use strict at the top of the file!!!
-    if (mkws_debug >= 3) {
-       console.log(arguments.callee.caller);
-    } else if (mkws_debug >= 2) {
-       console.log(">>> called from function " + arguments.callee.caller.name + ' <<<');
-    }
-    console.log(string);
-}
-
-/* magic */
-$(document).ready(function() { mkws_html_all(mkws_config) });
diff --git a/experiments/spclient/mkwsStyle.css b/experiments/spclient/mkwsStyle.css
deleted file mode 100644 (file)
index 08e2fbf..0000000
+++ /dev/null
@@ -1,196 +0,0 @@
-#mkwsLang,
-#mkwsSwitch,
-#mkwsSearch,
-#mkwsTermlists,
-#mkwsRanking,
-#mkwsPager,
-#mkwsNavi,
-#mkwsRecords,
-#mkwsTargets,
-#mkwsStat,
-#mkwsShiftedTermlists,
-#mkwsEmbeddedMOTD {
-    font-family: Gill Sans, "Gillius ADF", Gillius, GilliusADF, Verdana, Sans-Serif;
-}
-
-#mkwsLang {
-    float: left;
-    padding-left: 1em;
-    padding-top: 0.4em;
-}
-
-#mkwsLang a {
-    background: #d0e0ff;
-    padding: 1px 4px;
-}
-
-#mkwsLang span {
-    border: solid 1px #d0e0ff;
-    padding: 0px 3px;
-}
-
-#mkwsSearch {
-    float: right;
-}
-
-#mkwsSwitch {
-    float: right;
-    padding-left: 1em;
-    padding-top: 0.4em;
-}
-
-#mkwsTargets {
-    background-color: #fafafa;
-}
-
-#mkwsStat {
-    margin-top: 10px;
-    border-top: 1px solid  #156a16;
-    padding-top: 5px;
-    font-size: small;
-}
-
-#mkwsStat span.head {
-    font-weight: bold;
-}
-
-#mkwsStat span.clients:before {
-    content: "Active clients: ";
-}
-
-#mkwsStat span.records:before {
-    content: "Retrieved records: ";
-}
-
-#mkwsSwitch a,
-#mkwsLang a,
-#mkwsTermlists a,
-#mkwsRanking a,
-#mkwsPager a,
-#mkwsNavi a,
-#mkwsRecords a,
-#mkwsShiftedTermlists a {
-    color: #005701;
-    text-decoration: none;
-}
-
-#mkwsSwitch a:hover,
-#mkwsLang a:hover,
-#mkwsTermlists a:hover,
-#mkwsPager a:hover,
-#mkwsRecords a:hover,
-#mkwsShiftedTermlists a:hover {
-    text-decoration: underline;
-}
-
-#mkwsNavi a.crossout:hover {
-    text-decoration: line-through;
-}
-
-#mkwsSearch input#mkwsButton {
-    border: 3px outset #132194;
-    background-color: #132194;
-    padding: 2px;
-    width: 6em;
-    color: #FFFFFF;
-    font-weight: bold;
-    text-transform: uppercase;
-    font-size: 10px;
-    margin-left: 8px;
-    cursor: pointer;
-}
-
-#mkwsSearch input#mkwsQuery {
-    border: 2px inset #e0f0ff;
-    padding: 3px;
-    font-size: 12px;
-    background: #f0f8ff;
-}
-
-#mkwsTermlists .title,
-#mkwsShiftedTermlists .title {
-    font-size: large;
-    font-weight: bold;
-    text-transform: uppercase;
-}
-
-#mkwsTermlists,
-#mkwsShiftedTermlists div#termlist  {
-    background: #d0e0ff;
-    padding: 0.7em;
-    font-size: small;
-
-    border-top-right-radius: 10px;
-    -moz-border-top-right-radius: 10px;
-    -webkit-border-top-right-radius: 10px;
-}
-
-#mkwsTermlists div.facet,
-#mkwsShiftedTermlists div.facet {
-    background: #e0f0ff;
-    padding: 0.7em;
-    margin-top: 0.7em;
-
-    border-top-right-radius: 10px;
-    -moz-border-top-right-radius: 10px;
-    -webkit-border-top-right-radius: 10px;
-}
-
-#mkwsTermlists div.termtitle,
-#mkwsShiftedTermlists div.termtitle {
-    font-weight: bold;
-}
-
-#mkwsRecords div.record,
-#mkwsShiftedTermlists div.record {
-    padding: 5px;
-}
-
-#mkwsRecords div.details {
-    border: 1px solid #404040;
-    background: #e8e8e8;
-    color: darkgray;
-    padding: 5px 10px;
-    margin: 10px 0px;
-    box-shadow: 10px 10px 5px #808080;
-
-    border-top-right-radius: 10px;
-    -moz-border-top-right-radius: 10px;
-    -webkit-border-top-right-radius: 10px;
-}
-
-#mkwsRecords div.details th,
-#mkwsShiftedTermlists div.details th {
-    text-align: right;
-    vertical-align: top;
-    padding-right: 0.6em;
-}
-
-#mkwsRecords div.details th:after,
-#mkwsShiftedTermlists div.details th:after {
-    content: ":";
-}
-
-#mkwsPager {
-    background: #e0e0e0;
-    padding: 0.3em;
-}
-
-#mkwsBytarget table thead tr td {
-    background-color: #132194;
-    color: white;
-    font-weight: bold;
-    padding: 0.2em 0.5em;
-}
-
-#mkwsBytarget table tbody tr:nth-child(odd) {
-    background-color: #e0f0ff;
-}
-
-#mkwsBytarget table tbody tr:nth-child(even) {
-    background-color: #d0e0ff;
-}
-
-#mkwsBytarget table tbody tr td {
-    padding: 0.2em 0.5em;
-}
diff --git a/experiments/spclient/robots.txt b/experiments/spclient/robots.txt
deleted file mode 100644 (file)
index 1f53798..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /
diff --git a/tools/apache2/README b/tools/apache2/README
new file mode 100644 (file)
index 0000000..351fc7f
--- /dev/null
@@ -0,0 +1,5 @@
+You will need to enable the Rewrite module for this to work:
+
+$ sudo a2enmod rewrite
+$ sudo service apache2 reload
+
diff --git a/tools/apache2/mkws-dev b/tools/apache2/mkws-dev
new file mode 100644 (file)
index 0000000..b4a7e8a
--- /dev/null
@@ -0,0 +1,26 @@
+# Configuration for the apache web server                 -*- apache -*-
+
+# pazpar2 / service proxy config
+<VirtualHost *:80>
+    ServerName spclient.example.com
+    ServerAlias spclient-dev.indexdata.com
+    ServerAdmin webmaster@example.com
+    ErrorLog /var/log/apache2/spdemo-error.log
+    CustomLog /var/log/apache2/spdemo-access.log combined
+
+    RewriteEngine on
+    RewriteLogLevel 1
+    RewriteLog /var/log/apache2/spdemo-rewrite.log 
+
+    DocumentRoot /home/indexdata/mkws/experiments/spclient
+
+    RewriteRule /service-proxy-auth  /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
+
+    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+
+    ProxyPass        /pazpar2/         http://localhost:8004/pazpar2/
+    ProxyPassReverse /pazpar2/         http://localhost:8004/pazpar2/
+
+</VirtualHost>
+
diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
new file mode 100644 (file)
index 0000000..dfa7ed4
--- /dev/null
@@ -0,0 +1,39 @@
+# Configuration for the apache web server
+# Running on caliban
+
+
+<VirtualHost *:80>
+    ServerName somesite.indexdata.com
+    DocumentRoot /home/indexdata/mkws/experiments/spclient/
+    ErrorLog /var/log/apache2/somesite-error.log
+    CustomLog /var/log/apache2/somesite-access.log combined
+</VirtualHost>
+
+
+<VirtualHost *:80>
+    ServerName mkws.indexdata.com
+
+    ErrorLog /var/log/apache2/mkws-error.log
+    CustomLog /var/log/apache2/mkws-access.log combined
+
+    DocumentRoot /home/indexdata/mkws/experiments/spclient/
+    Alias /libjs-pz2/ /home/indexdata/libjs-pz2/
+    Alias /index.html /home/indexdata/mkws/experiments/spclient/index-mkws.html
+
+    RewriteEngine on
+    RewriteLogLevel 1
+    RewriteLog /var/log/apache2/mkws-rewrite.log 
+    RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=demo&password=demo [P] # [NE,P]
+
+    Header set Access-Control-Allow-Credentials true
+
+    # For MKC Service Proxy
+    ProxyPass        /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
+    ProxyPassReverse /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
+
+    PerlOptions +Parent
+    PerlSwitches -I/home/indexdata/mkws/etc/mod_perl
+    <Location /service-proxy>
+        PerlOutputFilterHandler MyApache2::SetACAO
+    </Location>
+</VirtualHost>
diff --git a/tools/apache2/mkws-mike b/tools/apache2/mkws-mike
new file mode 100644 (file)
index 0000000..44efb2b
--- /dev/null
@@ -0,0 +1,29 @@
+# Configuration for the apache web server
+# Running on Mike's local development box
+
+<VirtualHost *:80>
+    ServerName x.spclient.indexdata.com
+    ErrorLog /var/log/apache2/spclient-error.log
+    CustomLog /var/log/apache2/spclient-access.log combined
+
+    DocumentRoot /usr/local/src/git/mkws/experiments/spclient/
+    Alias /libjs-pz2/ /usr/local/src/git/libjs-pz2/
+
+    RewriteEngine on
+    RewriteLogLevel 1
+    RewriteLog /var/log/apache2/spclient-rewrite.log 
+    RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
+
+    # For MKC Service Proxy
+    ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+    ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+
+    # For local Service Proxy running as mvn jetty:run
+    #ProxyPass        /service-proxy/ http://localhost:8585/service-proxy/
+    #ProxyPassReverse /service-proxy/ http://localhost:8585/service-proxy/
+
+    # Needed on Mac, which locks Apache down hard by default.
+    <Directory />
+        Allow from all
+    </Directory>
+</VirtualHost>
diff --git a/tools/apache2/mkws-proxy b/tools/apache2/mkws-proxy
new file mode 100644 (file)
index 0000000..4e16c51
--- /dev/null
@@ -0,0 +1,19 @@
+<VirtualHost *:80>
+    ServerName mkws.indexdata.com
+    ServerAlias somesite.indexdata.com
+
+    ProxyRequests off
+    ProxyVia On
+    ProxyPreserveHost On
+    <Proxy *>
+      Order deny,allow
+      Allow from all
+    </Proxy>
+
+    ProxyPass         / http://caliban:80/
+    ProxyPassReverse  / http://caliban:80/
+
+    # These are the logs for the proxying operation
+    ErrorLog /var/log/apache2/mkws-proxy-error.log
+    CustomLog /var/log/apache2/mkws-proxy-access.log combined
+</VirtualHost>
diff --git a/tools/htdocs/.gitignore b/tools/htdocs/.gitignore
new file mode 100644 (file)
index 0000000..a7392c7
--- /dev/null
@@ -0,0 +1 @@
+mkws-complete.js
diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
new file mode 100644 (file)
index 0000000..38d83f4
--- /dev/null
@@ -0,0 +1,23 @@
+######################################################################
+# Copyright (c) 2013 IndexData ApS. http://indexdata.com
+#
+
+MKWS_JS=       mkws-complete.js
+all: ${MKWS_JS}
+
+mkws-js ${MKWS_JS}: ../../../libjs-pz2/pz2api.1.js mkws.js
+       ( echo "/* created at: $$(date)"; \
+         echo "   mkws.js GIT id: $$(git log mkws.js | head -n 1 | perl -npe 's,\S+\s+,,') */"; \
+         curl -sSf http://code.jquery.com/jquery-1.10.0.min.js; \
+         cat ../../../libjs-pz2/pz2api.1.js mkws.js ) > ${MKWS_JS}.new 
+       mv -f ${MKWS_JS}.new ${MKWS_JS}
+
+distclean: clean
+clean:
+       rm -f ${MKWS_JS}
+
+help:
+       @echo "make [ help | mkws-js | clean ]"
+       @echo ""
+       @echo "Please check ./README file too!"
+
diff --git a/tools/htdocs/README b/tools/htdocs/README
new file mode 100644 (file)
index 0000000..bcd492c
--- /dev/null
@@ -0,0 +1,128 @@
+An embryonic MasterKey Widget Set
+=================================
+
+This directory contains an embryonic MasterKey Widget Set, based
+initially on "jsdemo" though now far removed from those beginnnings.
+
+
+How this works
+--------------
+
+The goal is to make it that as much of the searching functionality as
+possible is hosted on
+       http://mkws.indexdata.com/
+so that very simple websites such as
+       http://somesite.indexdata.com/
+can have MasterKey searching with minimal effort.
+
+The following files must be hosted on mkws.indexdata.com:
+       mkws.js
+       mkwsStyle.css
+       /libjs-pz2/pz2api.1.js (*)
+
+The following files make up the application:
+       index.html
+       favicon.ico [optional]
+       robots.txt [optional]
+
+(At present, the client application's configuruation also needs an
+Alias for /service-proxy/, to avoid cross-site scripting issues. We
+will fix this.)
+
+(*) if you don't have already installed libjs-pz2 on the machine, you can
+do it by installing a debian package or check it out from GIT:
+$ git clone ssh://git.indexdata.com:222/home/git/pub/libjs-pz2
+
+Configuring a client
+--------------------
+
+The application's HTML must contains the following elements as well as
+whatever makes up the application itself:
+
+Prerequisites:
+    <link rel="stylesheet" href="mkwsStyle.css" />
+    <script type="text/javascript">
+       var mkws_config = { };
+    </script>
+    <script type="text/javascript" src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="/libjs-pz2/pz2api.1.js"></script>
+    <script type="text/javascript" src="mkws.js"></script>
+(Yes, we're using JQuery. We use it only in the most trivial ways, and
+could probably get rid of it without too much pain. I'd like to have
+mkws.js automatically pull in pz2api.1.js, too, so you don't need to
+do so many things, but that's not quite trivial.)
+
+Then the following special <div>s can be added (with no content), and
+will be filled in by MKWS:
+    <div id="mkwsSwitch"></div> -- switch between record and target views
+    <div id="mkwsLang"></div>   -- switch between English, Danish and German
+    <div id="mkwsSearch"></div> -- search box and button
+    <div id="mkwsResults"></div> -- result list, including pager/sorting
+    <div id="mkwsTargets"></div> -- target list, including status
+    <div id="mkwsStat"></div> -- summary statistics
+
+At present, MKWS will not work correctly if any of these is
+missing. One of the TODOs is to fix it so that it doesn't try to use
+whatever is not there, and just uses what is.
+
+
+You can configure and control the client with the JavaScript mkws_config object.
+
+Here is an example of all possible options
+    <script type="text/javascript">
+        var mkws_config = {
+                use_service_proxy: true,    /* true, flase: use service proxy instead pazpar2 */
+               switch_menu: true,          /* true, false: show/hide Records|Targets menu */
+               lang_menu: true,            /* true, false: show/hide language menu */
+               sort_menu: true,            /* true, false: show/hide sort menu */
+               perpage_menu: true,         /* true, false: show/hide perpage menu */
+               lang_display: ["en", "de", "da"], /* display languages links for given
+                                                    languages, [] for all */
+               facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */
+                sort_default: "relevance",  /* "relevance", "title:1", "date:0", "date:1" */
+               query_width: 50,            /* 5..50 */
+                perpage_default: 20,       /* 10, 20, 30, 50 */
+                lang: "en",                 /* "en", "de", "da" */
+               debug: 0,                   /* debug level for development: 0..2 */
+
+               responsive_design: false    /* true, false: resize for smaller mobile devices */
+               pazpar2_url: "/pazpar2/search.pz2",        /* URL */
+               service_proxy_url: "/service-proxy/",      /* URL */
+               service_proxy_auth: "/service-proxy-auth", /* URL */
+         };
+    </script>
+
+Note: the mkws_config object which must be loaded before the mkws.js and pz2api.js files.
+
+Supported Browsers
+------------------
+
+Any modern HTML5 browser will work fine. JavaScript must be enabled.
+
+* IE8 or later
+* Firefox 17 or later
+* Google Chrome 27 or later
+* Safari 6 or later
+* Opera  12 or later
+* iOS 6.x (iPhone, iPad)
+* Android 4.x
+
+Not supported: IE6, IE7
+
+New Features since jsdemo
+--------------------------
+- multilinguality: English (default), Danish, German
+- depends on the new pazpar2 JS library libjs-pz2/pz2api.1.js
+  which will make the development of pazpar2 plugins faster and
+  easier to share code between projects
+- supports basic pazpar2 and service-proxy requests
+- simplified HTML
+- the search page is fully configurable by a JSON object
+
+
+What next?
+----------
+
+Main areas of work:
+* Make MKWS robust to missing widgets
+* Clean up the code
diff --git a/tools/htdocs/html-structure.txt b/tools/htdocs/html-structure.txt
new file mode 100644 (file)
index 0000000..c6d0da8
--- /dev/null
@@ -0,0 +1,62 @@
+The HTML structure of the MKWS <div>s is as follows. This is useful to
+know when working on stylesheets. As in CSS, #ID indicates a unique
+identifier and .CLASS indicates an instance of a class.
+
+
+#mkwsSwitch
+  a*
+
+#mkwsLang
+  ( a | span )*
+
+#mkwsSearch
+  form
+    input#mkwsQuery type=text
+    input#mkwsButton type=submit
+
+#mkwsBlanket
+  (no contents -- used only for masking)
+
+#mkwsResults
+  table
+    tbody
+      tr
+        td
+          #mkwsTermlists
+            div.title
+            div.facet*
+              div.termtitle
+              ( a span br )*
+        td
+          div#mkwsRanking
+            form#mkwsSelect
+              select#mkwsSort
+              select#mkwsPerpage
+          #mkwsPager
+          #mkwsNavi
+          #mkwsRecords
+            div.record*
+              span (for sequence number)
+              a (for title)
+              span (for other information such as author)
+              div.details (sometimes)
+                table
+                  tbody
+                    tr*
+                      th
+                      td
+#mkwsTargets
+  #mkwsBytarget
+    table
+      thead
+        tr*
+          td*
+      tbody
+        tr*
+          td*
+
+#mkwsStat
+  span.head
+  span.clients
+  span.records
+
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
new file mode 100644 (file)
index 0000000..98ac5ee
--- /dev/null
@@ -0,0 +1,873 @@
+/* A very simple client that shows a basic usage of the pz2.js
+*/
+
+"use strict"; // HTML5: disable for debug >= 2
+
+/*
+ * global config object: mkws_config
+ *
+ * needs to be defined in the HTML header before
+ * including this JS file
+ */
+
+if (!mkws_config)
+    var mkws_config = {}; // for the guys who forgot to define mkws_config...
+
+if (typeof mkws_config.use_service_proxy === 'undefined')
+    mkws_config.use_service_proxy = true;
+
+// global debug flag
+var mkws_debug;
+
+var pazpar2_url = mkws_config.pazpar2_url ? mkws_config.pazpar2_url : "/pazpar2/search.pz2";
+var service_proxy_url = mkws_config.service_proxy_url ? mkws_config.service_proxy_url : "http://mkws.indexdata.com/service-proxy/";
+
+var pazpar2path = mkws_config.use_service_proxy ? service_proxy_url : pazpar2_url;
+var usesessions = mkws_config.use_service_proxy ? false : true;
+
+
+var mkws_locale_lang = {
+    "de": {
+       "Authors": "Autoren",
+       "Subjects": "Schlagw&ouml;rter",
+       "Sources": "Daten und Quellen",
+       "Termlists": "Termlisten",
+       "Next": "Weiter",
+       "Prev": "Zur&uuml;ck",
+       "Search": "Suche",
+       "Sort by": "Sortieren nach",
+       "and show": "und zeige",
+       "per page": "pro Seite",
+       "Displaying": "Zeige",
+       "to": "von",
+       "of": "aus",
+       "found": "gefunden",
+       "Title": "Titel",
+       "Author": "Autor",
+       "Date": "Datum",
+       "Subject": "Schlagwort",
+       "Location": "Ort",
+
+       "dummy": "dummy"
+    },
+
+    "da": {
+       "Authors": "Forfattere",
+       "Subjects": "Emner",
+       "Sources": "Kilder",
+       "Termlists": "Termlists",
+       "Next": "N&aelig;ste",
+       "Prev": "Forrige",
+       "Search": "S&oslash;g",
+       "Sort by": "Sorter efter",
+       "and show": "og vis",
+       "per page": "per side",
+       "Displaying": "Viser",
+       "to": "til",
+       "of": "ud af",
+       "found": "fandt",
+       "Title": "Title",
+       "Author": "Forfatter",
+       "Date": "Dato",
+       "Subject": "Emneord",
+       "Location": "Lokation",
+
+       "dummy": "dummy"
+    }
+};
+
+
+for (var key in mkws_config) {
+    if (mkws_config.hasOwnProperty(key)) {
+       if (key.match(/^language_/)) {
+           var lang = key.replace(/^language_/, "");
+           // Copy custom languages into list
+           mkws_locale_lang[lang] = mkws_config[key];
+       }
+    }
+}
+
+
+// create a parameters array and pass it to the pz2's constructor
+// then register the form submit event with the pz2.search function
+// autoInit is set to true on default
+var my_paz = new pz2( { "onshow": my_onshow,
+                    "showtime": 500,            //each timer (show, stat, term, bytarget) can be specified this way
+                    "pazpar2path": pazpar2path,
+                    "oninit": my_oninit,
+                    "onstat": my_onstat,
+                    "onterm": my_onterm,
+                    "termlist": "xtargets,subject,author",
+                    "onbytarget": my_onbytarget,
+                   "usesessions" : usesessions,
+                    "showResponseType": '', // or "json" (for debugging?)
+                    "onrecord": my_onrecord } );
+// some state vars
+var curPage = 1;
+var recPerPage = 20;
+var totalRec = 0;
+var curDetRecId = '';
+var curDetRecData = null;
+var curSort = 'relevance';
+var curFilter = null;
+var submitted = false;
+var SourceMax = 16;
+var SubjectMax = 10;
+var AuthorMax = 10;
+
+//
+// pz2.js event handlers:
+//
+function my_oninit() {
+    my_paz.stat();
+    my_paz.bytarget();
+}
+
+function my_onshow(data) {
+    totalRec = data.merged;
+    // move it out
+    var pager = document.getElementById("mkwsPager");
+    pager.innerHTML = "";
+    pager.innerHTML +='<div style="float: right">' + M('Displaying') + ': '
+                    + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
+                     ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
+                     + data.total + ')</div>';
+    drawPager(pager);
+    // navi
+    var results = document.getElementById("mkwsRecords");
+
+    var html = [];
+    for (var i = 0; i < data.hits.length; i++) {
+        var hit = data.hits[i];
+             html.push('<div class="record" id="mkwsRecdiv_'+hit.recid+'" >'
+            +'<span>'+ (i + 1 + recPerPage * (curPage - 1)) +'. </span>'
+            +'<a href="#" id="mkwsRec_'+hit.recid
+            +'" onclick="showDetails(this.id);return false;"><b>'
+            + hit["md-title"] +' </b></a>');
+             if (hit["md-title-remainder"] !== undefined) {
+               html.push('<span>' + hit["md-title-remainder"] + ' </span>');
+             }
+             if (hit["md-title-responsibility"] !== undefined) {
+           html.push('<span><i>'+hit["md-title-responsibility"]+'</i></span>');
+       }
+        if (hit.recid == curDetRecId) {
+            html.push(renderDetails(curDetRecData));
+        }
+       html.push('</div>');
+    }
+    replaceHtml(results, html.join(''));
+}
+
+function my_onstat(data) {
+    var stat = document.getElementById("mkwsStat");
+    if (stat == null)
+       return;
+
+    stat.innerHTML = '<span class="head">Status info</span>' +
+       ' -- ' +
+       '<span class="clients">' + data.activeclients + '/' + data.clients + '</span>' +
+       ' -- ' +
+        '<span class="records">' + data.records + '/' + data.hits + '</span>';
+}
+
+function my_onterm(data) {
+    // no facets
+    if (!mkws_config.facets || mkws_config.facets.length == 0) {
+       $("#mkwsTermlists").hide();
+       return;
+    }
+
+    // display if we first got results
+    $("#mkwsTermlists").show();
+
+    var acc = [];
+    acc.push('<div class="title">' + M('Termlists') + '</div>');
+    var facets = mkws_config.facets;
+
+    for(var i = 0; i < facets.length; i++) {
+       if (facets[i] == "sources") {
+           add_single_facet(acc, "Sources",  data.xtargets, SourceMax, null);
+       } else if (facets[i] == "subjects") {
+           add_single_facet(acc, "Subjects", data.subject,  SubjectMax, "su");
+       } else if (facets[i] == "authors") {
+           add_single_facet(acc, "Authors",  data.author,   AuthorMax, "au");
+       } else {
+           alert("bad facet configuration: '" + facets[i] + "'");
+       }
+    }
+
+    var termlist = document.getElementById("mkwsTermlists");
+    replaceHtml(termlist, acc.join(''));
+
+    if (mkws_config.responsive_design)
+        mkws_mobile_resize();
+}
+
+function add_single_facet(acc, caption, data, max, cclIndex) {
+    acc.push('<div class="facet">');
+    acc.push('<div class="termtitle">' + M(caption) + '</div>');
+    for (var i = 0; i < data.length && i < max; i++ ) {
+        acc.push('<a href="#" ');
+       var action;
+       if (!cclIndex) {
+           // Special case: target selection
+           acc.push('target_id='+data[i].id+' ');
+           action = 'limitTarget(this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
+       } else {
+           action = 'limitQuery(\'' + cclIndex + '\', this.firstChild.nodeValue)';
+       }
+       acc.push('onclick="' + action + ';return false;">' + data[i].name + '</a>'
+                + '<span> (' + data[i].freq + ')</span><br/>');
+    }
+    acc.push('</div>');
+}
+
+function my_onrecord(data) {
+    // FIXME: record is async!!
+    clearTimeout(my_paz.recordTimer);
+    // in case on_show was faster to redraw element
+    var detRecordDiv = document.getElementById('mkwsDet_'+data.recid);
+    if (detRecordDiv) return;
+    curDetRecData = data;
+    var recordDiv = document.getElementById('mkwsRecdiv_'+curDetRecData.recid);
+    var html = renderDetails(curDetRecData);
+    recordDiv.innerHTML += html;
+}
+
+function my_onbytarget(data) {
+    var targetDiv = document.getElementById("mkwsBytarget");
+    var table ='<table><thead><tr><td>Target ID</td><td>Hits</td><td>Diags</td>'
+        +'<td>Records</td><td>State</td></tr></thead><tbody>';
+
+    for (var i = 0; i < data.length; i++ ) {
+        table += "<tr><td>" + data[i].id +
+            "</td><td>" + data[i].hits +
+            "</td><td>" + data[i].diagnostic +
+            "</td><td>" + data[i].records +
+            "</td><td>" + data[i].state + "</td></tr>";
+    }
+
+    table += '</tbody></table>';
+    targetDiv.innerHTML = table;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+// wait until the DOM is ready
+function domReady ()
+{
+    document.mkwsSearchForm.onsubmit = onFormSubmitEventHandler;
+    document.mkwsSearchForm.mkwsQuery.value = '';
+    if (document.mkwsSelect) {
+       if (document.mkwsSelect.mkwsSort)
+           document.mkwsSelect.mkwsSort.onchange = onSelectDdChange;
+       if (document.mkwsSelect.mkwsPerpage)
+           document.mkwsSelect.mkwsPerpage.onchange = onSelectDdChange;
+    }
+}
+
+// when search button pressed
+function onFormSubmitEventHandler()
+{
+    resetPage();
+    loadSelect();
+    triggerSearch();
+    switchView('records'); // In case it's configured to start off as hidden
+    submitted = true;
+    return false;
+}
+
+function onSelectDdChange()
+{
+    if (!submitted) return false;
+    resetPage();
+    loadSelect();
+    my_paz.show(0, recPerPage, curSort);
+    return false;
+}
+
+function resetPage()
+{
+    curPage = 1;
+    totalRec = 0;
+}
+
+function triggerSearch ()
+{
+    my_paz.search(document.mkwsSearchForm.mkwsQuery.value, recPerPage, curSort, curFilter);
+}
+
+function loadSelect ()
+{
+    if (document.mkwsSelect) {
+       if (document.mkwsSelect.mkwsSort)
+           curSort = document.mkwsSelect.mkwsSort.value;
+       if (document.mkwsSelect.mkwsPerpage)
+           recPerPage = document.mkwsSelect.mkwsPerpage.value;
+    }
+}
+
+// limit the query after clicking the facet
+function limitQuery (field, value)
+{
+    document.mkwsSearchForm.query.value += ' and ' + field + '="' + value + '"';
+    onFormSubmitEventHandler();
+}
+
+// limit by target functions
+function limitTarget (id, name)
+{
+    var navi = document.getElementById('mkwsNavi');
+    navi.innerHTML =
+        'Source: <a class="crossout" href="#" onclick="delimitTarget();return false;">'
+        + name + '</a>';
+    curFilter = 'pz:id=' + id;
+    resetPage();
+    loadSelect();
+    triggerSearch();
+    return false;
+}
+
+function delimitTarget ()
+{
+    var navi = document.getElementById('mkwsNavi');
+    navi.innerHTML = '';
+    curFilter = null;
+    resetPage();
+    loadSelect();
+    triggerSearch();
+    return false;
+}
+
+function drawPager (pagerDiv)
+{
+    //client indexes pages from 1 but pz2 from 0
+    var onsides = 6;
+    var pages = Math.ceil(totalRec / recPerPage);
+
+    var firstClkbl = ( curPage - onsides > 0 )
+        ? curPage - onsides
+        : 1;
+
+    var lastClkbl = firstClkbl + 2*onsides < pages
+        ? firstClkbl + 2*onsides
+        : pages;
+
+    var prev = '<span id="mkwsPrev">&#60;&#60; ' + M('Prev') + '</span><b> | </b>';
+    if (curPage > 1)
+        prev = '<a href="#" id="mkwsPrev" onclick="pagerPrev();">'
+        +'&#60;&#60; ' + M('Prev') + '</a><b> | </b>';
+
+    var middle = '';
+    for(var i = firstClkbl; i <= lastClkbl; i++) {
+        var numLabel = i;
+        if(i == curPage)
+            numLabel = '<b>' + i + '</b>';
+
+        middle += '<a href="#" onclick="showPage(' + i + ')"> '
+            + numLabel + ' </a>';
+    }
+
+    var next = '<b> | </b><span id="mkwsNext">' + M('Next') + ' &#62;&#62;</span>';
+    if (pages - curPage > 0)
+        next = '<b> | </b><a href="#" id="mkwsNext" onclick="pagerNext()">'
+        + M('Next') + ' &#62;&#62;</a>';
+
+    var predots = '';
+    if (firstClkbl > 1)
+        predots = '...';
+
+    var postdots = '';
+    if (lastClkbl < pages)
+        postdots = '...';
+
+    pagerDiv.innerHTML += '<div style="float: clear">'
+        + prev + predots + middle + postdots + next + '</div>';
+}
+
+function showPage (pageNum)
+{
+    curPage = pageNum;
+    my_paz.showPage( curPage - 1 );
+}
+
+// simple paging functions
+
+function pagerNext() {
+    if ( totalRec - recPerPage*curPage > 0) {
+        my_paz.showNext();
+        curPage++;
+    }
+}
+
+function pagerPrev() {
+    if ( my_paz.showPrev() != false )
+        curPage--;
+}
+
+// switching view between targets and records
+
+function switchView(view) {
+    var targets = document.getElementById('mkwsTargets');
+    var results = document.getElementById('mkwsResults') ||
+                 document.getElementById('mkwsRecords');
+    var blanket = document.getElementById('mkwsBlanket');
+    var motd    = document.getElementById('mkwsEmbeddedMOTD');
+
+    switch(view) {
+        case 'targets':
+            if (targets) targets.style.display = "block";
+            if (results) results.style.display = "none";
+            if (blanket) blanket.style.display = "none";
+            if (motd) motd.style.display = "none";
+            break;
+        case 'records':
+            if (targets) targets.style.display = "none";
+            if (results) results.style.display = "block";
+            if (blanket) blanket.style.display = "block";
+            if (motd) motd.style.display = "none";
+            break;
+       case 'none':
+            if (targets) targets.style.display = "none";
+            if (results) results.style.display = "none";
+            if (blanket) blanket.style.display = "none";
+            if (motd) motd.style.display = "none";
+            break;
+        default:
+            alert("Unknown view '" + view + "'");
+    }
+}
+
+// detailed record drawing
+function showDetails (prefixRecId) {
+    var recId = prefixRecId.replace('mkwsRec_', '');
+    var oldRecId = curDetRecId;
+    curDetRecId = recId;
+
+    // remove current detailed view if any
+    var detRecordDiv = document.getElementById('mkwsDet_'+oldRecId);
+    // lovin DOM!
+    if (detRecordDiv)
+      detRecordDiv.parentNode.removeChild(detRecordDiv);
+
+    // if the same clicked, just hide
+    if (recId == oldRecId) {
+        curDetRecId = '';
+        curDetRecData = null;
+        return;
+    }
+    // request the record
+    my_paz.record(recId);
+}
+
+function replaceHtml(el, html) {
+  var oldEl = typeof el === "string" ? document.getElementById(el) : el;
+  /*@cc_on // Pure innerHTML is slightly faster in IE
+    oldEl.innerHTML = html;
+    return oldEl;
+    @*/
+  var newEl = oldEl.cloneNode(false);
+  newEl.innerHTML = html;
+  oldEl.parentNode.replaceChild(newEl, oldEl);
+  /* Since we just removed the old element from the DOM, return a reference
+     to the new element, which can be used to restore variable references. */
+  return newEl;
+};
+
+function renderDetails(data, marker)
+{
+    var details = '<div class="details" id="mkwsDet_'+data.recid+'"><table>';
+    if (marker) details += '<tr><td>'+ marker + '</td></tr>';
+
+    details += renderField("Title", data["md-title"], data["md-title-remainder"], data["md-title-responsibility"]);
+    details += renderField("Date", data["md-date"]);
+    details += renderField("Author", data["md-author"]);
+    details += renderField("URL", data["md-electronic-url"]);
+    details += renderField("Subject", data["location"][0]["md-subject"]);
+    details += renderField("Location", data["location"][0]["@name"], data["location"][0]["@id"]);
+    details += '</table></div>';
+
+    return details;
+}
+
+function renderField(caption, data, data2, data3) {
+    if (data === undefined) {
+       return "";
+    }
+
+    if (caption == "URL") {
+       data = '<a href="' + data + '" target="_blank">' + data + '</a>';
+    }
+
+    if (data2 != undefined) {
+       data = data + " (" + data2 + ")";
+    }
+
+    if (data3 != undefined) {
+       data = data + " <i>" + data3 + "</i>";
+    }
+
+    return '<tr><th>' + M(caption) + '</th><td>' + data + '</td></tr>';
+}
+
+
+/*
+ * All the HTML stuff to render the search forms and
+ * result pages.
+ */
+function mkws_html_all(config) {
+
+    /* default mkws config */
+    var mkws_config_default = {
+       sort: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
+       perpage: [10, 20, 30, 50],
+       sort_default: "relevance",
+       perpage_default: 20,
+       query_width: 50,
+       switch_menu: false,     /* show/hide Records|Targets menu */
+       lang_menu: true,        /* show/hide language menu */
+       sort_menu: true,        /* show/hide sort menu */
+       perpage_menu: true,     /* show/hide perpage menu */
+       lang_display: [],       /* display languages links for given languages, [] for all */
+       facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */
+       responsive_design_width: 980, /* a page with less pixel width considered as mobile */
+       debug: 1,     /* debug level for development: 0..2 */
+
+       dummy: "dummy"
+    };
+
+    /* set global debug flag early */
+    if (typeof config.debug !== 'undefined') {
+       mkws_debug = config.debug;
+    } else if (typeof mkws_config_default.debug !== 'undefined') {
+       mkws_debug = mkws_config_default.debug;
+    }
+
+    /* override standard config values by function parameters */
+    for (var k in mkws_config_default) {
+       if (typeof config[k] === 'undefined')
+          mkws_config[k] = mkws_config_default[k];
+       debug("Set config: " + k + ' => ' + mkws_config[k]);
+    }
+
+    if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
+       debug("Reset query width: " + mkws_config.query_width);
+       mkws_config.query_width = 50;
+    }
+
+    mkws_set_lang(mkws_config);
+    if (mkws_config.lang_menu)
+       mkws_html_lang(mkws_config);
+
+    // For some reason, doing this programmatically results in
+    // document.mkwsSearchForm.mkwsQuery being undefined, hence the raw HTML.
+    debug("HTML search form");
+    $("#mkwsSearch").html('\
+    <form name="mkwsSearchForm" action="" >\
+      <input id="mkwsQuery" type="text" size="' + mkws_config.query_width + '" />\
+      <input id="mkwsButton" type="submit" value="' + M('Search') + '" />\
+    </form>');
+
+    debug("HTML records");
+    // If the application has an #mkwsResults, populate it in the
+    // usual way. If not, assume that it's a smarter application that
+    // defines its own subcomponents:
+    // #mkwsTermlists
+    // #mkwsRanking
+    // #mkwsPager
+    // #mkwsNavi
+    // #mkwsRecords
+    if ($("#mkwsResults").length) {
+       $("#mkwsResults").html('\
+      <table width="100%" border="0" cellpadding="6" cellspacing="0">\
+        <tr>\
+          <td width="250" valign="top">\
+            <div id="mkwsTermlists"></div>\
+          </td>\
+          <td valign="top">\
+            <div id="mkwsRanking"></div>\
+            <div id="mkwsPager"></div>\
+            <div id="mkwsNavi"></div>\
+            <div id="mkwsRecords"></div>\
+            <div id="mkwsEmbeddedMOTD"></div>\
+          </td>\
+        </tr>\
+      </table>');
+    }
+
+    if ($("#mkwsRanking").length) {
+       var ranking_data = '';
+       ranking_data += '<form name="mkwsSelect" id="mkwsSelect" action="" >';
+       if (config.sort_menu) {
+           ranking_data +=  M('Sort by') + ' ' + mkws_html_sort(config) + ' ';
+       }
+       if (config.perpage_menu) {
+           ranking_data += M('and show') + ' ' + mkws_html_perpage(config) + ' ' + M('per page') + '.';
+       }
+        ranking_data += '</form>';
+
+       $("#mkwsRanking").html(ranking_data);
+    }
+
+    mkws_html_switch(config);
+
+    if (mkws_config.use_service_proxy)
+       mkws_service_proxy_auth(config.service_proxy_auth);
+
+    if (mkws_config.responsive_design)
+       mkws_responsive_design();
+
+    domReady();
+
+    // on first page, hide the termlist
+    $(document).ready(function() { $("#mkwsTermlists").hide(); } );
+    var elem = document.getElementById("mkwsMOTD");
+    if (elem) {
+       // Move the MOTD from the provided element down into the embedded one
+       document.getElementById("mkwsEmbeddedMOTD").innerHTML = elem.innerHTML;
+        elem.style.display = "none";
+    }
+}
+
+/* Responsive web design - change layout on the fly depending on
+ * the current screen size width/height. Required for mobile devices.
+ */
+function mkws_responsive_design () {
+    var timeout = null;
+
+    $(window).resize( function(e) {
+       if (timeout)
+           clearTimeout(timeout);
+       timeout = setTimeout(function () { mkws_mobile_resize() }, 50);
+    });
+
+    // initial check after page load
+    $(document).ready(function() { mkws_mobile_resize() });
+}
+
+function mkws_set_lang(mkws_config)  {
+    var lang = jQuery.parseQuerystring().lang || mkws_config.lang || "";
+    if (!lang || !mkws_locale_lang[lang]) {
+       mkws_config.lang = ""
+    } else {
+       mkws_config.lang = lang;
+    }
+
+    debug("Locale language: " + (mkws_config.lang ? mkws_config.lang : "none"));
+    return mkws_config.lang;
+}
+
+function mkws_html_switch(config) {
+    debug("HTML switch");
+
+    $("#mkwsSwitch").html($("<a/>", {
+       href: '#',
+       onclick: "switchView(\'records\')",
+       text: M("Records")
+    }));
+    $("#mkwsSwitch").append($("<span/>", { text: " | " }));
+    $("#mkwsSwitch").append($("<a/>", {
+       href: '#',
+       onclick: "switchView(\'targets\')",
+       text: M("Targets")
+    }));
+
+    debug("HTML targets");
+    $("#mkwsTargets").html('\
+      <div id="mkwsBytarget">\
+       No information available yet.\
+      </div>');
+    $("#mkwsTargets").css("display", "none");
+
+    if (!config.switch_menu) {
+       debug("disable switch menu");
+        $("#mkwsSwitch").css("display", "none");
+    }
+}
+
+function mkws_html_sort(config) {
+    debug("HTML sort");
+    var sort_html = '<select name="mkwsSort" id="mkwsSort">';
+
+    for(var i = 0; i < config.sort.length; i++) {
+       var key = config.sort[i][0];
+       var val = config.sort[i].length == 1 ? config.sort[i][0] : config.sort[i][1];
+
+       sort_html += '<option value="' + key + '"';
+       if (key == config.sort_default) {
+           sort_html += ' selected="selected"';
+       }
+       sort_html += '>' + val + '</option>';
+    }
+    sort_html += '</select>';
+
+    return sort_html;
+}
+
+function mkws_html_perpage(config) {
+    debug("HTML perpage");
+    var perpage_html = '<select name="mkwsPerpage" id="mkwsPerpage">';
+
+    for(var i = 0; i < config.perpage.length; i++) {
+       var key = config.perpage[i];
+
+       perpage_html += '<option value="' + key + '"';
+       if (key == config.perpage_default) {
+           perpage_html += ' selected="selected"';
+       }
+       perpage_html += '>' + key + '</option>';
+    }
+    perpage_html += '</select>';
+
+    return perpage_html;
+}
+
+/*
+ * Run service-proxy authentication in background (after page load).
+ * The username/password is configured in the apache config file
+ * for the site.
+ */
+function mkws_service_proxy_auth(auth_url) {
+    if (!auth_url)
+       auth_url = "http://mkws.indexdata.com/service-proxy-auth";
+
+    debug("Run service proxy auth URL: " + auth_url);
+
+    var request = new pzHttpRequest(auth_url);
+    request.get(null, function(data) {
+       if (!jQuery.isXMLDoc(data)) {
+           alert("service proxy auth response document is not valid XML document, give up!");
+           return;
+       }
+       var status = $(data).find("status");
+       if (status.text() != "OK") {
+           alert("service proxy auth repsonse status: " + status.text() + ", give up!");
+           return;
+       }
+    });
+}
+
+/* create locale language menu */
+function mkws_html_lang(mkws_config) {
+    var lang_default = "en";
+    var lang = mkws_config.lang || lang_default;
+    var list = [];
+
+    /* display a list of configured languages, or all */
+    var lang_display = mkws_config.lang_display || [];
+    var hash = {};
+    for (var i = 0; i < lang_display.length; i++) {
+       hash[lang_display[i]] = 1;
+    }
+
+    for (var k in mkws_locale_lang) {
+       if (hash[k] == 1 || lang_display.length == 0)
+           list.push(k);
+    }
+
+    // add english link
+    if (lang_display.length == 0 || hash[lang_default] == 1)
+        list.push(lang_default);
+
+    debug("Language menu for: " + list.join(", "));
+
+    /* the HTML part */
+    var data = "";
+    for(var i = 0; i < list.length; i++) {
+       var l = list[i];
+
+       if (data)
+           data += ' | ';
+
+       if (lang == l) {
+           data += ' <span>' + l + '</span> ';
+       } else {
+           data += ' <a href="?lang=' + l + '">' + l + '</a> '
+       }
+    }
+
+    $("#mkwsLang").html(data);
+}
+
+function mkws_mobile_resize () {
+    debug("resize width: " + $(window).height() + ", width: " + $(window).width());
+    var list = ["mkwsSwitch"];
+    var obj;
+    // alert($(window).width());
+
+    var width = mkws_config.responsive_design_width || 980;
+
+    if ($(window).width() <= width) {
+       for(var i = 0; i < list.length; i++) {
+           $("#" + list[i]).hide();
+       }
+
+       $("#mkwsTermlists").hide();
+       obj = $("#mkwsTermlists").html();
+        $("#mkwsShiftedTermlists").html(obj);
+    } else {
+       for(var i = 0; i < list.length; i++) {
+           $("#" + list[i]).show();
+       }
+       $("#mkwsTermlists").show();
+       $("#mkwsShiftedTermlists").html("");
+    }
+};
+
+/* locale */
+function M(word) {
+    var lang = mkws_config.lang;
+
+    if (!lang || !mkws_locale_lang[lang])
+       return word;
+
+    return mkws_locale_lang[lang][word] ? mkws_locale_lang[lang][word] : word;
+}
+
+/* implement jQuery.parseQuerystring() for parsing URL parameters */
+jQuery.extend({
+  parseQuerystring: function() {
+    var nvpair = {};
+    var qs = window.location.search.replace('?', '');
+    var pairs = qs.split('&');
+    $.each(pairs, function(i, v){
+       var pair = v.split('=');
+       nvpair[pair[0]] = pair[1];
+    });
+    return nvpair;
+  },
+  pazpar2: function(data) {
+       document.write('<div id="mkwsSwitch"></div>\
+    <div id="mkwsLang"></div>\
+    <div id="mkwsSearch"></div>\
+    <div id="mkwsResults"></div>\
+    <div id="mkwsTargets"></div>\
+    <div id="mkwsFooter">\
+      <div id="mkwsStat"></div>\
+      <span>Powered by MKWS &copy; 2013 <a target="_new" href="http://www.indexdata.com">Index Data</a></span>\
+    </div>');
+
+    mkws_html_all(mkws_config);
+  }
+});
+
+function debug(string) {
+    if (!mkws_debug)
+       return;
+
+    if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
+       return;
+    }
+
+    // you need to disable use strict at the top of the file!!!
+    if (mkws_debug >= 3) {
+       console.log(arguments.callee.caller);
+    } else if (mkws_debug >= 2) {
+       console.log(">>> called from function " + arguments.callee.caller.name + ' <<<');
+    }
+    console.log(string);
+}
+
+/* magic */
+$(document).ready(function() { mkws_html_all(mkws_config) });
diff --git a/tools/htdocs/mkwsStyle.css b/tools/htdocs/mkwsStyle.css
new file mode 100644 (file)
index 0000000..08e2fbf
--- /dev/null
@@ -0,0 +1,196 @@
+#mkwsLang,
+#mkwsSwitch,
+#mkwsSearch,
+#mkwsTermlists,
+#mkwsRanking,
+#mkwsPager,
+#mkwsNavi,
+#mkwsRecords,
+#mkwsTargets,
+#mkwsStat,
+#mkwsShiftedTermlists,
+#mkwsEmbeddedMOTD {
+    font-family: Gill Sans, "Gillius ADF", Gillius, GilliusADF, Verdana, Sans-Serif;
+}
+
+#mkwsLang {
+    float: left;
+    padding-left: 1em;
+    padding-top: 0.4em;
+}
+
+#mkwsLang a {
+    background: #d0e0ff;
+    padding: 1px 4px;
+}
+
+#mkwsLang span {
+    border: solid 1px #d0e0ff;
+    padding: 0px 3px;
+}
+
+#mkwsSearch {
+    float: right;
+}
+
+#mkwsSwitch {
+    float: right;
+    padding-left: 1em;
+    padding-top: 0.4em;
+}
+
+#mkwsTargets {
+    background-color: #fafafa;
+}
+
+#mkwsStat {
+    margin-top: 10px;
+    border-top: 1px solid  #156a16;
+    padding-top: 5px;
+    font-size: small;
+}
+
+#mkwsStat span.head {
+    font-weight: bold;
+}
+
+#mkwsStat span.clients:before {
+    content: "Active clients: ";
+}
+
+#mkwsStat span.records:before {
+    content: "Retrieved records: ";
+}
+
+#mkwsSwitch a,
+#mkwsLang a,
+#mkwsTermlists a,
+#mkwsRanking a,
+#mkwsPager a,
+#mkwsNavi a,
+#mkwsRecords a,
+#mkwsShiftedTermlists a {
+    color: #005701;
+    text-decoration: none;
+}
+
+#mkwsSwitch a:hover,
+#mkwsLang a:hover,
+#mkwsTermlists a:hover,
+#mkwsPager a:hover,
+#mkwsRecords a:hover,
+#mkwsShiftedTermlists a:hover {
+    text-decoration: underline;
+}
+
+#mkwsNavi a.crossout:hover {
+    text-decoration: line-through;
+}
+
+#mkwsSearch input#mkwsButton {
+    border: 3px outset #132194;
+    background-color: #132194;
+    padding: 2px;
+    width: 6em;
+    color: #FFFFFF;
+    font-weight: bold;
+    text-transform: uppercase;
+    font-size: 10px;
+    margin-left: 8px;
+    cursor: pointer;
+}
+
+#mkwsSearch input#mkwsQuery {
+    border: 2px inset #e0f0ff;
+    padding: 3px;
+    font-size: 12px;
+    background: #f0f8ff;
+}
+
+#mkwsTermlists .title,
+#mkwsShiftedTermlists .title {
+    font-size: large;
+    font-weight: bold;
+    text-transform: uppercase;
+}
+
+#mkwsTermlists,
+#mkwsShiftedTermlists div#termlist  {
+    background: #d0e0ff;
+    padding: 0.7em;
+    font-size: small;
+
+    border-top-right-radius: 10px;
+    -moz-border-top-right-radius: 10px;
+    -webkit-border-top-right-radius: 10px;
+}
+
+#mkwsTermlists div.facet,
+#mkwsShiftedTermlists div.facet {
+    background: #e0f0ff;
+    padding: 0.7em;
+    margin-top: 0.7em;
+
+    border-top-right-radius: 10px;
+    -moz-border-top-right-radius: 10px;
+    -webkit-border-top-right-radius: 10px;
+}
+
+#mkwsTermlists div.termtitle,
+#mkwsShiftedTermlists div.termtitle {
+    font-weight: bold;
+}
+
+#mkwsRecords div.record,
+#mkwsShiftedTermlists div.record {
+    padding: 5px;
+}
+
+#mkwsRecords div.details {
+    border: 1px solid #404040;
+    background: #e8e8e8;
+    color: darkgray;
+    padding: 5px 10px;
+    margin: 10px 0px;
+    box-shadow: 10px 10px 5px #808080;
+
+    border-top-right-radius: 10px;
+    -moz-border-top-right-radius: 10px;
+    -webkit-border-top-right-radius: 10px;
+}
+
+#mkwsRecords div.details th,
+#mkwsShiftedTermlists div.details th {
+    text-align: right;
+    vertical-align: top;
+    padding-right: 0.6em;
+}
+
+#mkwsRecords div.details th:after,
+#mkwsShiftedTermlists div.details th:after {
+    content: ":";
+}
+
+#mkwsPager {
+    background: #e0e0e0;
+    padding: 0.3em;
+}
+
+#mkwsBytarget table thead tr td {
+    background-color: #132194;
+    color: white;
+    font-weight: bold;
+    padding: 0.2em 0.5em;
+}
+
+#mkwsBytarget table tbody tr:nth-child(odd) {
+    background-color: #e0f0ff;
+}
+
+#mkwsBytarget table tbody tr:nth-child(even) {
+    background-color: #d0e0ff;
+}
+
+#mkwsBytarget table tbody tr td {
+    padding: 0.2em 0.5em;
+}
diff --git a/tools/mod_perl/MyApache2/CopyCookie.pm b/tools/mod_perl/MyApache2/CopyCookie.pm
new file mode 100644 (file)
index 0000000..3e29647
--- /dev/null
@@ -0,0 +1,41 @@
+package MyApache2::CopyCookie;
+
+use Apache2::Filter ();
+use Apache2::RequestRec ();
+use APR::Table ();
+
+use Apache2::Const -compile => qw(OK);
+
+use constant BUFF_LEN => 1024;
+
+sub handler {
+    my $f = shift;
+
+    # If the server generated a new cookie, make it available in a
+    # header other than the magic "Cookie" that clients can't read.
+    my $ho = $f->r->headers_out;
+    my $cookie = $ho->get('Set-Cookie');
+    if (defined $cookie && $cookie ne "") {
+       $ho->set('X-Set-Cake', $cookie);
+    }
+
+    # If the client sent an existing cookie as X-Cake, but didn't
+    # set Cookie, copy the former to the latter.
+    my $hi = $f->r->headers_in;
+    $cookie = $hi->get('Cookie');
+    if (!defined $cookie || $cookie eq "") {
+       $cookie = $hi->get('X-Cake');
+       if (defined $cookie && $cookie ne "") {
+           warn "copying X-Cake '$cookie' to Cookie";
+           $hi->set('Cookie', $cookie);
+       }
+    }
+
+    while ($f->read(my $buffer, BUFF_LEN)) {
+       $f->print($buffer);
+    }
+
+    return Apache2::Const::OK;
+}
+
+1;
diff --git a/tools/mod_perl/MyApache2/SetACAO.pm b/tools/mod_perl/MyApache2/SetACAO.pm
new file mode 100644 (file)
index 0000000..66334fc
--- /dev/null
@@ -0,0 +1,30 @@
+package MyApache2::SetACAO;
+
+use Apache2::Filter ();
+use Apache2::RequestRec ();
+use APR::Table ();
+
+use Apache2::Const -compile => qw(OK);
+
+use constant BUFF_LEN => 1024;
+
+sub handler {
+    my $f = shift;
+
+    # If the client generated an Origin header, echo its content back
+    # in an ACAO header. This is better than just using *, since it
+    # doesnt prevent credentials from being accepted.
+    my $origin = $f->r->headers_in->get('Origin');
+    if (defined $origin && $origin ne "") {
+       $f->r->headers_out->set('Access-Control-Allow-Origin', $origin);
+       warn "MyApache2::SetACAO copied Origin '$origin' to ACAO";
+    }
+
+    while ($f->read(my $buffer, BUFF_LEN)) {
+       $f->print($buffer);
+    }
+
+    return Apache2::Const::OK;
+}
+
+1;