Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws

[mkws-moved-to-github.git] / tools / htdocs / mkws.js

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 9893577..12f3f71 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -11,60 +11,62 @@
 // indexed by windowid.
 var mkws = {
     authenticated: false,
-    sessions: {}
-};
-
-mkws.locale_lang = {
-    "de": {
-       "Authors": "Autoren",
-       "Subjects": "Schlagwörter",
-       "Sources": "Daten und Quellen",
-       "Termlists": "Termlisten",
-       "Next": "Weiter",
-       "Prev": "Zurü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",
-       "Records": "Datensätze",
-       "Targets": "Datenbanken",
-
-       "dummy": "dummy"
-    },
-
-    "da": {
-       "Authors": "Forfattere",
-       "Subjects": "Emner",
-       "Sources": "Kilder",
-       "Termlists": "Termlists",
-       "Next": "Næste",
-       "Prev": "Forrige",
-       "Search": "Sø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",
-       "Records": "Poster",
-       "Targets": "Baser",
-
-       "dummy": "dummy"
+    init: false,
+    debug_function: undefined, // will be set during initialisation
+    debug_level: undefined, // will be initialised from mkws_config
+    sessions: {},
+    locale_lang: {
+       "de": {
+           "Authors": "Autoren",
+           "Subjects": "Schlagwörter",
+           "Sources": "Daten und Quellen",
+           "Termlists": "Termlisten",
+           "Next": "Weiter",
+           "Prev": "Zurü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",
+           "Records": "Datensätze",
+           "Targets": "Datenbanken",
+
+           "dummy": "dummy"
+       },
+
+       "da": {
+           "Authors": "Forfattere",
+           "Subjects": "Emner",
+           "Sources": "Kilder",
+           "Termlists": "Termlists",
+           "Next": "Næste",
+           "Prev": "Forrige",
+           "Search": "Sø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",
+           "Records": "Poster",
+           "Targets": "Baser",
+
+           "dummy": "dummy"
+       }
     }
 };
 
@@ -75,8 +77,8 @@ if (mkws_config == null || typeof mkws_config != 'object') {
 
 // wrapper for jQuery lib
 function _make_mkws_team($, teamName) {
-    if (console && console.log)
-       console.log("run _make_mkws_team(" + (teamName ? teamName : "") + ")");
+    // if (console && console.log) // disabled, will fail in IE8
+    // console.log("run _make_mkws_team(" + (teamName ? teamName : "") + ")");
 
     // call this function only once
     if (mkws.init) {
@@ -273,6 +275,7 @@ function _make_mkws_team($, teamName) {
     var SourceMax = 16;
     var SubjectMax = 10;
     var AuthorMax = 10;
+    var m_query; // initially undefined
 
     if (!isNaN(parseInt(mkws_config.perpage_default))) {
        recPerPage = parseInt(mkws_config.perpage_default);
@@ -491,7 +494,7 @@ function _make_mkws_team($, teamName) {
 
        // Re-use previous query/sort if new ones are not specified
        if (query) {
-           mkws.query = query;
+           m_query = query;
        }
        if (sort) {
            m_sort = sort;
@@ -526,9 +529,9 @@ function _make_mkws_team($, teamName) {
        if (windowid) {
            params.windowid = windowid;
        }
-       debug("triggerSearch(" + mkws.query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
+       debug("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
 
-       m_paz.search(mkws.query, recPerPage, m_sort, pp2filter, undefined, params);
+       m_paz.search(m_query, recPerPage, m_sort, pp2filter, undefined, params);
     }
 
     function loadSelect ()