X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=js%2Fpz2.js;h=41fa14732e34d7f5548a7e01019217a0d4898e96;hb=f6da80c5c801b2043c03c0f077de7472d8f26f46;hp=fde4ce1fb834dd1b4eb396eec73908692bf6a879;hpb=fac659f2d2de40e7d5a18525b0ebd206d6944655;p=pazpar2-moved-to-github.git

diff --git a/js/pz2.js b/js/pz2.js
index fde4ce1..41fa147 100644
--- a/js/pz2.js
+++ b/js/pz2.js
@@ -126,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 = 
@@ -382,17 +384,19 @@ pz2.prototype =
         var request = new pzHttpRequest(this.pz2String, this.errorHandler);
 	var requestParameters = 
           {
-            "command": "show", 
-            "session": this.sessionID, 
-            "start": this.currentStart,
-            "num": this.currentNum, 
-            "sort": this.currentSort, 
-            "block": 1,
-            "type": this.showResponseType,
-            "windowid" : window.name
-          },
+              "command": "show", 
+              "session": this.sessionID, 
+              "start": this.currentStart,
+              "num": this.currentNum, 
+              "sort": this.currentSort, 
+              "block": 1,
+              "type": this.showResponseType,
+              "windowid" : window.name,
+          };
         if (query_state)
           requestParameters["query-state"] = query_state;
+	if (this.version && this.version > 0)
+	    requestParameters["version"] = this.version;
         request.safeGet(
 	  requestParameters,
           function(data, type) {
@@ -557,7 +561,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") ) {
@@ -587,12 +593,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;
+                              
                         }
                     }
 
@@ -638,7 +654,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]
@@ -652,10 +669,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") {