Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 18 Jul 2014 13:44:43 +0000 (13:44 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 18 Jul 2014 13:44:43 +0000 (13:44 +0000)
examples/htdocs/jasmine-cors-popup.html
examples/htdocs/popup-dev.html [new file with mode: 0644]
examples/htdocs/popup.html
tools/service-proxy/service-proxy.properties

index 4263d0d..59ada3e 100644 (file)
     </script>
 
     <script type="text/javascript" src="//mkws.indexdata.com/mkws-complete.js"></script>
-    <link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/mkws.css" />
-
+    <script>var _jquery = jQuery; $ = jQuery = mkws.$; </script>
     <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
+    <script>jQuery = $ = _jquery; </script>
+
+    <link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/mkws.css" />
     <link rel="stylesheet" type="text/css" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
 
     <link rel="shortcut icon" type="image/png" href="jasmine/lib/jasmine-1.3.1/jasmine_favicon.png">
     <link rel="stylesheet" type="text/css" href="jasmine/lib/jasmine-1.3.1/jasmine.css">
+
     <script type="text/javascript" src="jasmine/lib/jasmine-1.3.1/jasmine.js"></script>
     <script type="text/javascript" src="jasmine/lib/jasmine-1.3.1/jasmine-html.js"></script>
 
diff --git a/examples/htdocs/popup-dev.html b/examples/htdocs/popup-dev.html
new file mode 100644 (file)
index 0000000..174fc37
--- /dev/null
@@ -0,0 +1,61 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>MKWS demo: Reference widget with popup window</title>
+    <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
+    <link rel="stylesheet" type="text/css" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
+    <link rel="stylesheet" type="text/css" href="mkws-widget-reference.css" />
+    <link rel="stylesheet" type="text/css" href="mkws-widget-credo.css" />
+
+    <script type="text/javascript">
+      var mkws_config = {
+         service_proxy_auth: "//mkws.indexdata.com/service-proxy-credoauth"
+      };
+    </script>
+
+    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
+
+    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
+
+    <script type="text/javascript" src="src/mkws-handlebars.js"></script>
+    <script type="text/javascript" src="src/mkws-core.js"></script>
+    <script type="text/javascript" src="src/mkws-team.js"></script>
+    <script type="text/javascript" src="src/mkws-filter.js"></script>
+    <script type="text/javascript" src="src/mkws-popup.js"></script>
+    <script type="text/javascript" src="src/mkws-widget.js"></script>
+    <script type="text/javascript" src="src/mkws-widget-main.js"></script>
+    <script type="text/javascript" src="src/mkws-widget-termlists.js"></script>
+    <script type="text/javascript" src="src/mkws-widget-authname.js"></script>
+    <script type="text/javascript" src="src/mkws-widget-categories.js"></script>
+    <script type="text/javascript" src="src/mkws-widget-log.js"></script>
+    <script type="text/javascript" src="src/mkws-widget-record.js"></script>
+    <script type="text/javascript" src="src/mkws-widget-reference.js"></script>
+    <script type="text/javascript" src="src/mkws-widget-builder.js"></script>
+
+    <script type="text/javascript" src="mkws-widget-credo.js"></script>
+  </head>
+  <body>
+    <h3>MKWS widgets in a popup window</h3>
+
+    <div class="mkwsSearch"></div>
+    <div class="mkwsPopup" popup_width="1024" popup_height="650" popup_modal="0" popup_autoOpen="0" popup_button="input.mkwsButton">
+      <div class="mkwsSwitch"></div>
+      <div class="mkwsLang"></div>
+      <div class="mkwsResults"></div>
+      <div class="mkwsTargets"></div>
+      <div class="mkwsStat"></div>
+    </div>
+
+    <div class="mkwsPopup" popup_width="1024" popup_height="800" popup_autoOpen="1">
+      <div class="mkwsCredo mkwsTeam_credo" autosearch="!param!q">mkwsCredo result will appear here</div>
+    </div>
+
+    <div class="mkwsPopup" popup_width="700" popup_height="600" popup_autoOpen="1">
+      <div class="mkwsReference mkwsTeam_credo" sentences="1" autosearch="!param!q">mkwsReference result will appear here</div>
+    </div>
+
+  </body>
+</html>
index 174fc37..9a1a35e 100644 (file)
@@ -2,10 +2,10 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo: Reference widget with popup window</title>
-    <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
+    <link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/mkws.css" />
     <link rel="stylesheet" type="text/css" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
-    <link rel="stylesheet" type="text/css" href="mkws-widget-reference.css" />
-    <link rel="stylesheet" type="text/css" href="mkws-widget-credo.css" />
+    <link rel="stylesheet" type="text/css" href="//example.indexdata.com/mkws-widget-reference.css" />
+    <link rel="stylesheet" type="text/css" href="//example.indexdata.com/mkws-widget-credo.css" />
 
     <script type="text/javascript">
       var mkws_config = {
       };
     </script>
 
-    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
+    <!--
+    <script type="text/javascript" src="tools/htdocs/mkws-complete.js"></script>
+    <script>jQuery = mkws.$</script>
     <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
-
-    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
-    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
-    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
-
-    <script type="text/javascript" src="src/mkws-handlebars.js"></script>
-    <script type="text/javascript" src="src/mkws-core.js"></script>
-    <script type="text/javascript" src="src/mkws-team.js"></script>
-    <script type="text/javascript" src="src/mkws-filter.js"></script>
-    <script type="text/javascript" src="src/mkws-popup.js"></script>
-    <script type="text/javascript" src="src/mkws-widget.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-main.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-termlists.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-authname.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-categories.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-log.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-record.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-reference.js"></script>
-    <script type="text/javascript" src="src/mkws-widget-builder.js"></script>
-
-    <script type="text/javascript" src="mkws-widget-credo.js"></script>
+    -->
+    <script type="text/javascript" src="//code.jquery.com/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="//jquery-json.googlecode.com/files/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
+    <script type="text/javascript" src="//git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/pz2.js;hb=HEAD"></script>
+    <script type="text/javascript" src="//builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.1.2.js"></script>
+    <script type="text/javascript" src="//mkws.indexdata.com/mkws.js"></script>
+   
+    <script type="text/javascript" src="//example.indexdata.com/mkws-widget-credo.js"></script>
   </head>
   <body>
     <h3>MKWS widgets in a popup window</h3>
index 126a119..4f851bf 100644 (file)
@@ -1,30 +1,16 @@
-## Service Proxy configuration for MKWS (host sp-mkws.indexdata.com)
-## Based on MKC's configuration, mk2-config-mkcadmin/service-proxy/service-proxy.properties
+# Service Proxy configuration for MKWS (host sp-mkws.indexdata.com)
+# Initially based on MKC's configuration
 
-## chains.<name> controls plugin mapping to the chain invoked with 
-## 'command=<name>' param, can contain comma-separated list of plugins
-
-## by default map everything to pazpar2 relayer
-chains.*      = relay
-chains.record = relay
-
-## other plugins may be mapped to specific commands
-chains.auth   = authn
-chains.categories = categories
-chains.ils = ils
-
-## register pugin classes with custom names
+# Register plugin classes with custom names
 plugins.relay      = com.indexdata.serviceproxy.plugins.Pazpar2RelayPlugin
 plugins.authn      = com.indexdata.serviceproxy.plugins.AuthNTorusPlugin
 plugins.categories = com.indexdata.serviceproxy.plugins.TargetCategoriesPlugin
-plugins.ils  = com.indexdata.serviceproxy.plugins.ILSPlugin
-#inlead, maps to 'record'
-#plugins.holdings-json  = com.indexdata.serviceproxy.plugins.SecondaryLookup
-#plugins.rdf-json  = com.indexdata.serviceproxy.plugins.SecondaryLookup
+plugins.ils        = com.indexdata.serviceproxy.plugins.ILSPlugin
 
-## Configuration properties for plug-ins 
 
-## relay plugin
+# Configuration properties for individual plug-ins 
+
+# relay plugin, proxies commands through to Pazpar2
 relay.PROXY_MODE = 3
 relay.PAZPAR2_URL = http://localhost:8004
 relay.PAZPAR2_SERVICE_ID = mkc
@@ -35,24 +21,29 @@ relay.STREAMBUFF_SIZE = 4096
 relay.PARSE_RESPONSES = true
 relay.CF_ENGINE_ADDRESS = localhost:9003
 
-## authn plugin
-## used for torus based authentication 
-authn.TORUS_URL = http://mkc-admin.indexdata.com/torus2/identity.USERS/records/
+# authn plugin, for torus based authentication 
+authn.TORUS_URL        = http://mkc-admin.indexdata.com/torus2/identity.USERS/records/
 authn.MASTER_TORUS_URL = http://mkc-admin.indexdata.com/torus2/admin.admin/records/
+authn.ACTION_SEQUENCE = check,login,ipauth,referrer
+#authn.SPECIFIC_CONSTRAINT = vhost=${thisHost} 
 
-## categories plugin, for torus based target categories
-categories.TORUS_BASEURL = http://mkc-admin.indexdata.com/torus2/
-categories.EXCLUDE_EMPTY_CATEGORIES = true
+# categories plugin, for Torus-based target categories
+categories.TORUS_BASEURL            = http://mkc-admin.indexdata.com/torus2/
 categories.TORUS_BASEURL_SEARCHABLE = http://mkc-admin.indexdata.com/torus2/
+categories.EXCLUDE_EMPTY_CATEGORIES = true
 
+# ils plugin, for ILS operations such as holds and renewals
 ils.CFWS_URL = http://localhost:9003/connector
 
-# holdings-json.URL_PATTERN = http://www.deich.folkebibl.no/cgi-bin/rest_service/copies/1.0-alpha/data/${md-id/u}
 
-#holdings-json.IN_LOC_ID = z3950.deich.folkebibl.no:210/data
-#holdings-json.OUT_LOC_ID = z3950.deich.folkebibl.no:210/data
+# Map SP commands to command-separated sequences of plugins
+chains.auth = authn
+chains.categories = categories
+chains.ils = ils
+# Map all other commands to the Pazpar2 relayer
+chains.* = relay
 
-#rdf-json.URL_PATTERN = http://data.deichman.no/resource/tnr_${md-id/u}.json
 
-#rdf-json.IN_LOC_ID = z3950.deich.folkebibl.no:210/data
-#rdf-json.OUT_LOC_ID = z3950.deich.folkebibl.no:210/data
+# Just so I can check that this particular SP config is in use
+chains.mike = info
+plugins.info = com.indexdata.serviceproxy.plugins.InfoPlugin