X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=js%2Fpz2.js;h=c2568004995f3c36c70602a41f262d437868d4f2;hb=c049bb4a3ff37089474950a62efaada8eeb1c820;hp=34c507b91e0b0435284df6074dd9d48f692c1f80;hpb=71ba296a6f9bbde7755b9f6e010517ee429f5817;p=pazpar2-moved-to-github.git

diff --git a/js/pz2.js b/js/pz2.js
index 34c507b..c256800 100644
--- a/js/pz2.js
+++ b/js/pz2.js
@@ -69,6 +69,7 @@ var pz2 = function ( paramArray )
         this.keepAlive = paramArray.keepAlive;
 
     this.sessionID = null;
+    this.serviceId = paramArray.serviceId || null;
     this.initStatusOK = false;
     this.pingStatusOK = false;
     this.searchStatusOK = false;
@@ -121,7 +122,7 @@ var pz2 = function ( paramArray )
     }
     // else, auto init session or wait for a user init?
     if (this.useSessions && paramArray.autoInit !== false) {
-        this.init();
+        this.init(this.sessionId, this.serviceId);
     }
 };
 
@@ -165,12 +166,12 @@ pz2.prototype =
                 this.resetCallback();
     },
 
-    init: function ( sessionId ) 
+    init: function (sessionId, serviceId) 
     {
         this.reset();
         
         // session id as a param
-        if ( sessionId != undefined && this.useSessions ) {
+        if (sessionId && this.useSessions ) {
             this.initStatusOK = true;
             this.sessionID = sessionId;
             this.ping();
@@ -178,8 +179,10 @@ pz2.prototype =
         } else if (this.useSessions) {
             var context = this;
             var request = new pzHttpRequest(this.pz2String, this.errorHandler);
+            var opts = {'command' : 'init'};
+            if (serviceId) opts.service = serviceId;
             request.safeGet(
-                { "command": "init" },
+                opts,
                 function(data) {
                     if ( data.getElementsByTagName("status")[0]
                             .childNodes[0].nodeValue == "OK" ) {
@@ -223,7 +226,7 @@ pz2.prototype =
         var context = this;
         var request = new pzHttpRequest(this.pz2String, this.errorHandler);
         request.safeGet(
-            { "command": "ping", "session": this.sessionID },
+            { "command": "ping", "session": this.sessionID, "windowid" : window.name },
             function(data) {
                 if ( data.getElementsByTagName("status")[0]
                         .childNodes[0].nodeValue == "OK" ) {
@@ -268,14 +271,15 @@ pz2.prototype =
         else
             var start = 0;
 
-	var searchParams = { 
-            "command": "search",
-            "query": this.currQuery, 
-            "session": this.sessionID 
+	      var searchParams = { 
+          "command": "search",
+          "query": this.currQuery, 
+          "session": this.sessionID,
+          "windowid" : window.name
         };
 	
         if (filter !== undefined)
-	    searchParams["filter"] = filter;
+	        searchParams["filter"] = filter;
 
         // copy additional parmeters, do not overwrite
         if (addParamsArr != undefined) {
@@ -319,7 +323,7 @@ pz2.prototype =
         var context = this;
         var request = new pzHttpRequest(this.pz2String, this.errorHandler);
         request.safeGet(
-            { "command": "stat", "session": this.sessionID },
+            { "command": "stat", "session": this.sessionID, "windowid" : window.name },
             function(data) {
                 if ( data.getElementsByTagName("stat") ) {
                     var activeClients = 
@@ -376,7 +380,8 @@ pz2.prototype =
             "num": this.currentNum, 
             "sort": this.currentSort, 
             "block": 1,
-            "type": this.showResponseType
+            "type": this.showResponseType,
+            "windowid" : window.name
           },
           function(data, type) {
             var show = null;
@@ -450,7 +455,8 @@ pz2.prototype =
 	var recordParams = { 
             "command": "record", 
             "session": this.sessionID,
-            "id": this.currRecID 
+            "id": this.currRecID,
+            "windowid" : window.name
         };
 	
 	this.currRecOffset = null;
@@ -538,7 +544,8 @@ pz2.prototype =
             { 
                 "command": "termlist", 
                 "session": this.sessionID, 
-                "name": this.termKeys 
+                "name": this.termKeys,
+                "windowid" : window.name
             },
             function(data) {
                 if ( data.getElementsByTagName("termlist") ) {
@@ -615,7 +622,7 @@ pz2.prototype =
         var context = this;
         var request = new pzHttpRequest(this.pz2String, this.errorHandler);
         request.safeGet(
-            { "command": "bytarget", "session": this.sessionID },
+            { "command": "bytarget", "session": this.sessionID, "windowid" : window.name},
             function(data) {
                 if ( data.getElementsByTagName("status")[0]
                         .childNodes[0].nodeValue == "OK" ) {
@@ -634,6 +641,18 @@ pz2.prototype =
                                 bytarget[i][nodeName] = nodeText;
                             }
                         }
+                        if (bytarget[i]["state"]=="Client_Disconnected") {
+                          bytarget[i]["hits"] = "Error";
+                        } else if (bytarget[i]["state"]=="Client_Error") {
+                          bytarget[i]["hits"] = "Error";                          
+                        } else if (bytarget[i]["state"]=="Client_Working") {
+                          bytarget[i]["hits"] = "...";
+                        }
+                        if (bytarget[i].diagnostic == "1") {
+                          bytarget[i].diagnostic = "Permanent system error";
+                        } else if (bytarget[i].diagnostic == "2") {
+                          bytarget[i].diagnostic = "Temporary system error";
+                        } 
                     }
                     
                     context.bytargetCounter++;
@@ -704,6 +723,7 @@ var pzHttpRequest = function ( url, errorHandler ) {
         }
 };
 
+
 pzHttpRequest.prototype = 
 {
     safeGet: function ( params, callback )
@@ -802,8 +822,33 @@ pzHttpRequest.prototype =
                        this.request.responseXML == null) {
               if (this.request.responseText != null) {
                 //assume JSON
-                var json = eval("(" + this.request.responseText + ")");
-                this.callback(json, "json");
+		
+		var json = null; 
+		var text = this.request.responseText;
+		if (typeof window.JSON == "undefined") 
+		    json = eval("(" + text + ")");
+		else { 
+		    try	{
+		    	json = JSON.parse(text);
+		    }
+		    catch (e) {
+			// Safari: eval will fail as well. Considering trying JSON2 (non-native implementation) instead
+			/* DEBUG only works in mk2-mobile
+			if (document.getElementById("log")) 
+			    document.getElementById("log").innerHTML = "" + e + " " + length + ": " + text;
+			*/
+			try {
+			    json = eval("(" + text + ")");
+			}
+			catch (e) {
+			    /* DEBUG only works in mk2-mobile
+			    if (document.getElementById("log")) 
+				document.getElementById("log").innerHTML = "" + e + " " + length + ": " + text;
+			    */
+			}
+		    }
+		} 
+		this.callback(json, "json");
               } else {
                 var err = new Error("XML response is empty but no error " +
                                     "for " + savedUrlForErrorReporting);