Cont.

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

diff --git a/js/pz2.js b/js/pz2.js
index 0dc578d..52d6ba9 100644 (file)
--- a/js/pz2.js
+++ b/js/pz2.js
@@ -1,5 +1,5 @@
 /*
-** $Id: pz2.js,v 1.19 2007-05-21 09:07:43 jakub Exp $
+** $Id: pz2.js,v 1.32 2007-06-04 12:49:21 jakub Exp $
 ** pz2.js - pazpar2's javascript client library.
 */
 
@@ -314,7 +314,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 +354,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 {
@@ -383,12 +386,13 @@ pz2.prototype = {
                             }
                         }
                     }
+                    
                     __myself.recordCallback(record);
                 }
                 else
                     // if it gets here the http return code was 200 (pz2 errors are 417)
                     // but the response was invalid, it should never occur
-                    setTimeout("__myself.record(__myself.currRecID)", 1000);
+                    setTimeout("__myself.record(__myself.currRecID)", 500);
             }
         );
     },
@@ -415,8 +419,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");
@@ -532,7 +538,7 @@ pzHttpRequest.prototype =
         var paramArr = new Array();
 
         for ( var key in params ) {
-            paramArr.push(key + '=' + escape(params[key]));
+            paramArr.push(key + '=' + encodeURI(params[key]) );
         }
 
         if ( paramArr.length )
@@ -540,6 +546,8 @@ 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();
         }
@@ -650,7 +658,7 @@ pzQuery.prototype = {
     {   
         var ccl = '';
         if( this.simpleQuery != '')
-            ccl = '"'+this.simpleQuery+'"';
+            ccl = this.simpleQuery;
         for(var i = 0; i < this.advTerms.length; i++)
         {
             if (ccl != '') ccl = ccl + ' and ';