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

diff --git a/js/pz2.js b/js/pz2.js
index 8aab9bf..bfeade9 100644
--- a/js/pz2.js
+++ b/js/pz2.js
@@ -79,6 +79,7 @@ var pz2 = function ( paramArray )
 
     // where are we?
     this.currentStart = 0;
+    // currentNum can be overwritten in show 
     this.currentNum = 20;
 
     // last full record retrieved
@@ -91,6 +92,7 @@ var pz2 = function ( paramArray )
     this.currRecOffset = null;
 
     //timers
+    this.pingTimer = null;
     this.statTime = paramArray.stattime || 1000;
     this.statTimer = null;
     this.termTime = paramArray.termtime || 1000;
@@ -158,6 +160,7 @@ pz2.prototype =
             this.sessionID = null;
             this.initStatusOK = false;
             this.pingStatusOK = false;
+            clearTimeout(this.pingTimer);
         }
         this.searchStatusOK = false;
         this.stop();
@@ -196,12 +199,13 @@ pz2.prototype =
                         context.sessionID = 
                             data.getElementsByTagName("session")[0]
                                 .childNodes[0].nodeValue;
-                        setTimeout(
-                            function () {
-                                context.ping();
-                            },
-                            context.keepAlive
-                        );
+                        context.pingTimer =
+                            setTimeout(
+                                function () {
+                                    context.ping();
+                                },
+                                context.keepAlive
+                            );
                         if ( context.initCallback )
                             context.initCallback();
                     }
@@ -224,19 +228,23 @@ pz2.prototype =
             'Pz2.js: Ping not allowed (proxy mode) or session not initialized.'
             );
         var context = this;
+
+        clearTimeout(context.pingTimer);
+
         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" ) {
                     context.pingStatusOK = true;
-                    setTimeout(
-                        function () {
-                            context.ping();
-                        }, 
-                        context.keepAlive
-                    );
+                    context.pingTimer =
+                        setTimeout(
+                            function () {
+                                context.ping();
+                            },
+                            context.keepAlive
+                        );
                 }
                 else
                     context.throwError('Ping failed. Malformed WS resonse.',
@@ -271,14 +279,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) {
@@ -322,7 +331,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 = 
@@ -379,7 +388,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;
@@ -453,7 +463,8 @@ pz2.prototype =
 	var recordParams = { 
             "command": "record", 
             "session": this.sessionID,
-            "id": this.currRecID 
+            "id": this.currRecID,
+            "windowid" : window.name
         };
 	
 	this.currRecOffset = null;
@@ -541,7 +552,8 @@ pz2.prototype =
             { 
                 "command": "termlist", 
                 "session": this.sessionID, 
-                "name": this.termKeys 
+                "name": this.termKeys,
+                "windowid" : window.name
             },
             function(data) {
                 if ( data.getElementsByTagName("termlist") ) {
@@ -618,7 +630,12 @@ 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, 
+		"block": 1,
+		"windowid" : window.name
+	    },
             function(data) {
                 if ( data.getElementsByTagName("status")[0]
                         .childNodes[0].nodeValue == "OK" ) {
@@ -649,6 +666,11 @@ pz2.prototype =
                         } else if (bytarget[i].diagnostic == "2") {
                           bytarget[i].diagnostic = "Temporary system error";
                         } 
+                        var targetsSuggestions = targetNodes[i].getElementsByTagName("suggestions");
+                        if (targetsSuggestions != undefined && targetsSuggestions.length>0) {
+                          var suggestions = targetsSuggestions[0];
+                          bytarget[i]["suggestions"] = Element_parseChildNodes(suggestions);
+                        }
                     }
                     
                     context.bytargetCounter++;