X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=js%2Fpz2.js;h=d252eaaa24b75b6bb88c905d361b5b620367131e;hb=55c22e87453d25303491f854d4d7d290f6b080bf;hp=41fa14732e34d7f5548a7e01019217a0d4898e96;hpb=f6da80c5c801b2043c03c0f077de7472d8f26f46;p=pazpar2-moved-to-github.git

diff --git a/js/pz2.js b/js/pz2.js
index 41fa147..d252eaa 100644
--- a/js/pz2.js
+++ b/js/pz2.js
@@ -1,5 +1,20 @@
 /*
- * Mine
+ * !! WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!
+ *
+ * Do not edit this file. The current version of pz2.js now lives in
+ * its own git module ssh://git.indexdata.com/home/git/pub/pz2js and
+ * ALL FURTHER CHANGES SHOULD BE MADE TO THAT FILE.
+ *
+ * This copy will be removed as soon as we have good, solid Debian and
+ * Red Hat releases of the new independent pz2js package and have
+ * modified the pazpar2 packages to depend on it.
+ *
+ * !! WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!
+ */
+
+
+/*
+ * $Id$
 ** pz2.js - pazpar2's javascript client library.
 */
 
@@ -29,7 +44,7 @@ var pz2 = function ( paramArray )
     
     // at least one callback required
     if ( !paramArray )
-        throw new Error("Pz2.js: Array with parameters has to be suplied."); 
+        throw new Error("Pz2.js: Array with parameters has to be supplied."); 
 
     //supported pazpar2's protocol version
     this.suppProtoVer = '1';
@@ -124,7 +139,7 @@ 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;
@@ -201,6 +216,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 () {
@@ -281,13 +299,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;
 
@@ -391,7 +413,7 @@ pz2.prototype =
               "sort": this.currentSort, 
               "block": 1,
               "type": this.showResponseType,
-              "windowid" : window.name,
+              "windowid" : window.name
           };
         if (query_state)
           requestParameters["query-state"] = query_state;
@@ -441,7 +463,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;
@@ -1050,35 +1080,43 @@ Element_parseChildNodes = function (node)
 {
     var parsed = {};
     var hasChildElems = false;
+    var textContent = '';
 
     if (node.hasChildNodes()) {
         var children = node.childNodes;
         for (var i = 0; i < children.length; i++) {
             var child = children[i];
-            if (child.nodeType == Node.ELEMENT_NODE) {
+            switch (child.nodeType) {
+              case Node.ELEMENT_NODE:
                 hasChildElems = true;
                 var nodeName = child.nodeName; 
                 if (!(nodeName in parsed))
                     parsed[nodeName] = [];
                 parsed[nodeName].push(Element_parseChildNodes(child));
+                break;
+              case Node.TEXT_NODE:
+                textContent += child.nodeValue;
+                break;
+              case Node.CDATA_SECTION_NODE:
+                textContent += child.nodeValue;
+                break;
             }
         }
     }
 
     var attrs = node.attributes;
     for (var i = 0; i < attrs.length; i++) {
+        hasChildElems = true;
         var attrName = '@' + attrs[i].nodeName;
         var attrValue = attrs[i].nodeValue;
         parsed[attrName] = attrValue;
     }
 
-    // if no nested elements, get text content
-    if (node.hasChildNodes() && !hasChildElems) {
-        if (node.attributes.length) 
-            parsed['#text'] = node.firstChild.nodeValue;
-        else
-            parsed = node.firstChild.nodeValue;
-    }
+    // if no nested elements/attrs set value to text
+    if (hasChildElems)
+      parsed['#text'] = textContent;
+    else
+      parsed = textContent;
     
     return parsed;
 }