X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=js%2Fpz2.js;h=5d0c614761c00d3a958e51380e8b684099d066be;hb=c4bb40d07ac3ec2dcfa466ebe0a62385db2ddf83;hp=1b586dfe2bdce3c17ea4dd4fa839b8bf8669deaf;hpb=d7aab7777fc655e0d0927ee1748ba4695d203859;p=pazpar2-moved-to-github.git

diff --git a/js/pz2.js b/js/pz2.js
index 1b586df..5d0c614 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
@@ -125,6 +126,8 @@ var pz2 = function ( paramArray )
     if (this.useSessions && paramArray.autoInit !== false) {
         this.init(this.sessionId, this.serviceId);
     }
+    // Version parameter
+    this.version = paramArray.version || null;
 };
 
 pz2.prototype = 
@@ -360,7 +363,7 @@ pz2.prototype =
             }
         );
     },
-    show: function(start, num, sort)
+    show: function(start, num, sort, query_state)
     {
         if( !this.searchStatusOK && this.useSessions )
             throw new Error(
@@ -379,7 +382,7 @@ pz2.prototype =
 
         var context = this;
         var request = new pzHttpRequest(this.pz2String, this.errorHandler);
-        request.safeGet(
+	var requestParameters = 
           {
             "command": "show", 
             "session": this.sessionID, 
@@ -389,7 +392,11 @@ pz2.prototype =
             "block": 1,
             "type": this.showResponseType,
             "windowid" : window.name
-          },
+          };
+        if (query_state)
+          requestParameters["query-state"] = query_state;
+        request.safeGet(
+	  requestParameters,
           function(data, type) {
             var show = null;
             var activeClients = 0;
@@ -430,10 +437,6 @@ pz2.prototype =
                 for (i = 0; i < hits.length; i++)
                   show.hits[i] = Element_parseChildNodes(hits[i]);
             } else {
-		// We prob. got a 417 Already blocked, need to retry
-		context.showTimer = setTimeout(function () {
-		    context.show();
-                }, delay);
               context.throwError('Show failed. Malformed WS resonse.',
                   114);
             }
@@ -556,7 +559,9 @@ pz2.prototype =
                 "command": "termlist", 
                 "session": this.sessionID, 
                 "name": this.termKeys,
-                "windowid" : window.name
+                "windowid" : window.name, 
+		"version" : this.version
+	
             },
             function(data) {
                 if ( data.getElementsByTagName("termlist") ) {
@@ -586,12 +591,22 @@ pz2.prototype =
                                     .childNodes[0].nodeValue || 'ERROR'
                             };
 
+			    // Only for xtargets: id, records, filtered
                             var termIdNode = 
                                 terms[j].getElementsByTagName("id");
                             if(terms[j].getElementsByTagName("id").length)
                                 term["id"] = 
                                     termIdNode[0].childNodes[0].nodeValue;
                             termList[listName][j] = term;
+
+			    var recordsNode  = terms[j].getElementsByTagName("records");
+			    if (recordsNode && recordsNode.length)
+				term["records"] = recordsNode[0].childNodes[0].nodeValue;
+                              
+			    var filteredNode  = terms[j].getElementsByTagName("filtered");
+			    if (filteredNode && filteredNode.length)
+				term["filtered"] = filteredNode[0].childNodes[0].nodeValue;
+                              
                         }
                     }
 
@@ -637,7 +652,8 @@ pz2.prototype =
 		"command": "bytarget", 
 		"session": this.sessionID, 
 		"block": 1,
-		"windowid" : window.name
+		"windowid" : window.name,
+		"version" : this.version
 	    },
             function(data) {
                 if ( data.getElementsByTagName("status")[0]
@@ -651,10 +667,17 @@ pz2.prototype =
                                 == Node.ELEMENT_NODE ) {
                                 var nodeName = 
                                     targetNodes[i].childNodes[j].nodeName;
-                                var nodeText = 
-                                    targetNodes[i].childNodes[j]
-                                        .firstChild.nodeValue;
-                                bytarget[i][nodeName] = nodeText;
+				if (targetNodes[i].childNodes[j].firstChild != null) 
+				{
+                                    var nodeText = targetNodes[i].childNodes[j]
+					.firstChild.nodeValue;
+                                    bytarget[i][nodeName] = nodeText;
+				}
+				else { 
+				    bytarget[i][nodeName] = "";  
+				}
+
+
                             }
                         }
                         if (bytarget[i]["state"]=="Client_Disconnected") {