X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=3860b042526b67f8b4c00d920ddd655503dee2cb;hb=aa699b2f3c0fac6b719db6974eb462cb0d817855;hp=190da6af85bf964ae9215e13e30487b6cdb61942;hpb=f90cc5c1eed67a2c29f20025e9b3ed7113fe8468;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 190da6a..3860b04 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -1,4 +1,4 @@
-/*! MKWS, the MasterKey Widget Set. Copyright (C) 2013, Index Data */
+/*! MKWS, the MasterKey Widget Set. Copyright (C) 2013-2014, Index Data */
 
 "use strict"; // HTML5: disable for debug_level >= 2
 
@@ -9,25 +9,6 @@ var mkws = {
     sessions: {}
 };
 
-// Define empty mkws_config for simple applications that don't define it.
-if (mkws_config == null || typeof mkws_config != 'object') {
-    var mkws_config = {};
-}
-
-// wrapper for jQuery lib
-function _make_mkws_team($, teamName) {
-    if (console && console.log)
-	console.log("run _make_mkws_team(" + (teamName ? teamName : "") + ")");
-
-    // call this function only once
-    if (mkws.init) {
-	alert("_make_mkws_team() called twice: how did that happen?!");
-	return;
-    }
-
-var m_sort = 'relevance';
-var m_filters = [];
-
 mkws.locale_lang = {
     "de": {
 	"Authors": "Autoren",
@@ -82,8 +63,27 @@ mkws.locale_lang = {
     }
 };
 
+// Define empty mkws_config for simple applications that don't define it.
+if (mkws_config == null || typeof mkws_config != 'object') {
+    var mkws_config = {};
+}
+
+// wrapper for jQuery lib
+function _make_mkws_team($, teamName) {
+    if (console && console.log)
+	console.log("run _make_mkws_team(" + (teamName ? teamName : "") + ")");
+
+    // call this function only once
+    if (mkws.init) {
+	alert("_make_mkws_team() called twice: how did that happen?!");
+	return;
+    }
+
+var m_sort = 'relevance';
+var m_filters = [];
+
 // keep time state for debugging
-mkws.debug_time = {
+var m_debug_time = {
     "start": $.now(),
     "last": $.now()
 };
@@ -97,8 +97,8 @@ mkws.debug_function = function (string) {
     }
 
     var now = $.now();
-    var timestamp = ((now - mkws.debug_time.start)/1000).toFixed(3) + " (+" + ((now - mkws.debug_time.last)/1000).toFixed(3) + ") "
-    mkws.debug_time.last = now;
+    var timestamp = ((now - m_debug_time.start)/1000).toFixed(3) + " (+" + ((now - m_debug_time.last)/1000).toFixed(3) + ") "
+    m_debug_time.last = now;
 
     // you need to disable use strict at the top of the file!!!
     if (mkws.debug_level >= 3) {
@@ -220,8 +220,6 @@ Handlebars.registerHelper('commaList', function(items, options) {
 m_sort = mkws_config.sort_default;
 debug("copied mkws_config.sort_default '" + mkws_config.sort_default + "' to m_sort");
 
-mkws.usesessions = mkws_config.use_service_proxy ? false : true;
-
 if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
     debug("Reset query width: " + mkws_config.query_width);
     mkws_config.query_width = 50;
@@ -256,12 +254,10 @@ var my_paz = new pz2( { "onshow": my_onshow,
                     "onterm": my_onterm,
                     "termlist": "xtargets,subject,author",
                     "onbytarget": my_onbytarget,
-	 	    "usesessions" : mkws.usesessions,
+                    "usesessions" : mkws_config.use_service_proxy ? false : true,
                     "showResponseType": '', // or "json" (for debugging?)
                     "onrecord": my_onrecord } );
 
-mkws.my_paz = my_paz; // export
-
 // some state vars
 var curPage = 1;
 var recPerPage = 20;