X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=js%2Fpz2.js;h=4ff579842899f5d4224e3799211850973afbffe3;hb=0bb0ee0e00d750808e228b991c78cb4838bc989d;hp=ca0d28ce3486c137eecfdfbefe2899b3450a97f0;hpb=8b8537a615839fc6f9c348b21f172d80fc66c765;p=pazpar2-moved-to-github.git

diff --git a/js/pz2.js b/js/pz2.js
index ca0d28c..4ff5798 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
@@ -123,8 +124,10 @@ var pz2 = function ( paramArray )
     }
     // else, auto init session or wait for a user init?
     if (this.useSessions && paramArray.autoInit !== false) {
-        this.init(this.sessionId, this.serviceId);
+        this.init(this.sessionID, this.serviceId);
     }
+    // Version parameter
+    this.version = paramArray.version || null;
 };
 
 pz2.prototype = 
@@ -198,6 +201,9 @@ pz2.prototype =
                         context.sessionID = 
                             data.getElementsByTagName("session")[0]
                                 .childNodes[0].nodeValue;
+                        if (data.getElementsByTagName("keepAlive").length > 0) {
+                            context.keepAlive = data.getElementsByTagName("keepAlive")[0].childNodes[0].nodeValue;
+                        }
                         context.pingTimer =
                             setTimeout(
                                 function () {
@@ -278,13 +284,17 @@ pz2.prototype =
         else
             var start = 0;
 
-	      var searchParams = { 
+	var searchParams = { 
           "command": "search",
           "query": this.currQuery, 
           "session": this.sessionID,
           "windowid" : window.name
         };
 	
+        if( sort !== undefined ) {
+            this.currentSort = sort;
+	    searchParams["sort"] = sort;
+	}
         if (filter !== undefined)
 	        searchParams["filter"] = filter;
 
@@ -360,7 +370,7 @@ pz2.prototype =
             }
         );
     },
-    show: function(start, num, sort)
+    show: function(start, num, sort, query_state)
     {
         if( !this.searchStatusOK && this.useSessions )
             throw new Error(
@@ -379,17 +389,23 @@ pz2.prototype =
 
         var context = this;
         var request = new pzHttpRequest(this.pz2String, this.errorHandler);
-        request.safeGet(
+	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) {
             var show = null;
             var activeClients = 0;
@@ -432,7 +448,15 @@ pz2.prototype =
             } else {
               context.throwError('Show failed. Malformed WS resonse.',
                   114);
-            }
+            };
+	    
+	    var approxNode = data.getElementsByTagName("approximation");
+	    if (approxNode && approxNode[0] && approxNode[0].childNodes[0] && approxNode[0].childNodes[0].nodeValue)
+		show['approximation'] = 
+		  Number( approxNode[0].childNodes[0].nodeValue);
+	      
+
+	      data.getElementsByTagName("")
             context.activeClients = activeClients; 
             context.showCounter++;
             var delay = context.showTime;
@@ -552,7 +576,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") ) {
@@ -582,12 +608,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;
+                              
                         }
                     }
 
@@ -633,7 +669,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]
@@ -647,10 +684,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") {