X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=js%2Fpz2.js;h=8aab9bff345427d42919be79822eb18371bf246f;hb=b88bc9d42416104c748f1325540478be993598dd;hp=1471a5e00c77c18d4258da4a8cb1894b8caf1693;hpb=b40bdb2f4a3793471b478da5a691261d197cfcd4;p=pazpar2-moved-to-github.git

diff --git a/js/pz2.js b/js/pz2.js
index 1471a5e..8aab9bf 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" ) {
@@ -378,12 +381,13 @@ pz2.prototype =
             "block": 1,
             "type": this.showResponseType
           },
-          function(data, type) {           
+          function(data, type) {
             var show = null;
+            var activeClients = 0;
             if (type === "json") {
               show = {};
-              context.activeClients = Number(data.activeclients[0]);
-              show.activeclients = context.activeclients;
+              activeClients = Number(data.activeclients[0]);
+              show.activeclients = activeClients;
               show.merged = Number(data.merged[0]);
               show.total = Number(data.total[0]);
               show.start = Number(data.start[0]);
@@ -393,10 +397,9 @@ pz2.prototype =
                   .childNodes[0].nodeValue == "OK") {
                 // first parse the status data send along with records
                 // this is strictly bound to the format
-                var activeClients = 
+                activeClients = 
                   Number(data.getElementsByTagName("activeclients")[0]
                       .childNodes[0].nodeValue);
-                context.activeClients = activeClients; 
                 show = {
                   "activeclients": activeClients,
                   "merged": 
@@ -412,7 +415,7 @@ pz2.prototype =
                     Number( data.getElementsByTagName("num")[0]
                         .childNodes[0].nodeValue ),
                   "hits": []
-                };                
+                };
                 // parse all the first-level nodes for all <hit> tags
                 var hits = data.getElementsByTagName("hit");
                 for (i = 0; i < hits.length; i++)
@@ -421,6 +424,7 @@ pz2.prototype =
               context.throwError('Show failed. Malformed WS resonse.',
                   114);
             }
+            context.activeClients = activeClients; 
             context.showCounter++;
             var delay = context.showTime;
             if (context.showCounter > context.showFastCount)
@@ -431,7 +435,6 @@ pz2.prototype =
                   context.show();
                 }, 
                 delay);
-            global_show = show;
             context.showCallback(show);
           }
         );
@@ -634,6 +637,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 +719,7 @@ var pzHttpRequest = function ( url, errorHandler ) {
         }
 };
 
+
 pzHttpRequest.prototype = 
 {
     safeGet: function ( params, callback )
@@ -802,8 +818,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);