Ignore this.

[pazpar2-moved-to-github.git] / js / pz2.js

diff --git a/js/pz2.js b/js/pz2.js
index e161dea..0b2560b 100644 (file)
--- a/js/pz2.js
+++ b/js/pz2.js
@@ -1,5 +1,5 @@
 /*
-** $Id: pz2.js,v 1.25 2007-06-01 08:20:39 jakub Exp $
+** $Id: pz2.js,v 1.33 2007-06-05 15:19:25 jakub Exp $
 ** pz2.js - pazpar2's javascript client library.
 */
 
@@ -110,18 +110,22 @@ var pz2 = function(paramArray) {
         __myself.init();
 };
 pz2.prototype = {
+    stop: function ()
+    {
+        clearTimeout(__myself.statTimer);
+        clearTimeout(__myself.showTimer);
+        clearTimeout(__myself.termTimer);
+        clearTimeout(__myself.bytargetTimer);
+    },
     reset: function ()
     {
         __myself.sessionID = null;
         __myself.initStatusOK = false;
         __myself.pingStatusOK = false;
         __myself.searchStatusOK = false;
-
-        clearTimeout(__myself.statTimer);
-        clearTimeout(__myself.showTimer);
-        clearTimeout(__myself.termTimer);
-        clearTimeout(__myself.bytargetTimer);
-            
+        
+        __myself.stop();
+               
         if ( __myself.resetCallback )
                 __myself.resetCallback();
     },
@@ -314,7 +318,9 @@ pz2.prototype = {
                                }
                                else {
                                    var nodeName = hits[i].childNodes[j].nodeName;
-                                    var nodeText = hits[i].childNodes[j].firstChild.nodeValue;
+                                    var nodeText = 'ERROR'
+                                    if ( hits[i].childNodes[j].firstChild )
+                                        nodeText = hits[i].childNodes[j].firstChild.nodeValue;
                                    show.hits[i][nodeName] = nodeText;
                                }
                             }
@@ -352,6 +358,7 @@ pz2.prototype = {
                 if ( recordNode = data.getElementsByTagName("record")[0] ) {
                     // if stylesheet was fetched do not parse the response
                     if ( __myself.xslDoc ) {
+                        record['recid'] = recordNode.getElementsByTagName("recid")[0].firstChild.nodeValue;
                         record['xmlDoc'] = data;
                         record['xslDoc'] = __myself.xslDoc;
                     } else {
@@ -401,7 +408,7 @@ pz2.prototype = {
         clearTimeout(__myself.termTimer);
         var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
         request.get(
-            { "command": "termlist", "session": __myself.sessionID, "name": __myself.termKeys },
+            { "command": "termlist", "session": __myself.sessionID, "name": __myself.termKeys, "block": "1" },
             function(data) {
                 if ( data.getElementsByTagName("termlist") ) {
                     var activeClients = Number( data.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue );
@@ -416,8 +423,10 @@ pz2.prototype = {
                         //for each term in the list
                         for (j = 0; j < terms.length; j++) { 
                             var term = {
-                                "name": terms[j].getElementsByTagName("name")[0].childNodes[0].nodeValue,
-                                "freq": terms[j].getElementsByTagName("frequency")[0].childNodes[0].nodeValue
+                                "name": (terms[j].getElementsByTagName("name")[0].childNodes.length 
+                                                ? terms[j].getElementsByTagName("name")[0].childNodes[0].nodeValue
+                                                : 'ERROR'),
+                                "freq": terms[j].getElementsByTagName("frequency")[0].childNodes[0].nodeValue || 'ERROR'
                             };
 
                             var termIdNode = terms[j].getElementsByTagName("id");
@@ -533,7 +542,7 @@ pzHttpRequest.prototype =
         var paramArr = new Array();
 
         for ( var key in params ) {
-            paramArr.push(key + '=' + params[key] );
+            paramArr.push(key + '=' + encodeURI(params[key]) );
         }
 
         if ( paramArr.length )
@@ -542,6 +551,7 @@ pzHttpRequest.prototype =
         var context = this;
         this.request.open( 'GET', getUrl, true );
         this.request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
+        //this.request.setRequestHeader('Accept-Charset', 'UTF-8');
         this.request.onreadystatechange = function () {
             context._handleResponse();
         }
@@ -601,6 +611,10 @@ var pzQuery = function()
     this.filterNums = 0;
 };
 pzQuery.prototype = {
+    clearSimpleQuery: function()
+    {
+        this.simpleQuery = '';
+    },
     reset: function()
     {
         this.simpleQuery = '';