X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=js%2Fpz2.js;h=bf6a9b8235a2e7432a00b5227494c0325995284f;hb=05d6317190cd52051660b96a4fa873e5391bbc73;hp=f290eec6bedaa40ddba2006e48035fbdc610e0cb;hpb=36e4fc5a6921f12deb5b07a8f8b2091121d7bda5;p=pazpar2-moved-to-github.git

diff --git a/js/pz2.js b/js/pz2.js
index f290eec..bf6a9b8 100644
--- a/js/pz2.js
+++ b/js/pz2.js
@@ -1,5 +1,4 @@
 /*
-** $Id: pz2.js,v 1.70 2008-03-12 11:36:57 jakub Exp $
 ** pz2.js - pazpar2's javascript client library.
 */
 
@@ -251,6 +250,7 @@ pz2.prototype =
         this.termCounter = 0;
         this.bytargetCounter = 0;
         this.statCounter = 0;
+        this.activeClients = 1;
         
         // no proxy mode
         if( !this.initStatusOK )
@@ -324,37 +324,9 @@ pz2.prototype =
                         Number( data.getElementsByTagName("activeclients")[0]
                                     .childNodes[0].nodeValue );
                     context.activeClients = activeClients;
-                    var stat = {
-                        "activeclients": activeClients,
-                        "hits": 
-                            Number( data.getElementsByTagName("hits")[0]
-                                        .childNodes[0].nodeValue ),
-                        "records": 
-                            Number( data.getElementsByTagName("records")[0]
-                                        .childNodes[0].nodeValue ),
-                        "clients": 
-                            Number( data.getElementsByTagName("clients")[0]
-                                        .childNodes[0].nodeValue ),
-                        "initializing": 
-                            Number( data.getElementsByTagName("initializing")[0]
-                                        .childNodes[0].nodeValue ),
-                        "searching": 
-                            Number( data.getElementsByTagName("searching")[0]
-                                        .childNodes[0].nodeValue ),
-                        "presenting": 
-                            Number( data.getElementsByTagName("presenting")[0]
-                                        .childNodes[0].nodeValue ),
-                        "idle": 
-                            Number( data.getElementsByTagName("idle")[0]
-                                        .childNodes[0].nodeValue ),
-                        "failed": 
-                            Number( data.getElementsByTagName("failed")[0]
-                                        .childNodes[0].nodeValue ),
-                        "error": 
-                            Number( data.getElementsByTagName("error")[0]
-                                        .childNodes[0].nodeValue )
-                    };
-                    
+
+		    var stat = Element_parseChildNodes(data.documentElement);
+
                     context.statCounter++;
 		    var delay = context.statTime 
                         + context.statCounter * context.dumpFactor;
@@ -778,7 +750,7 @@ pzHttpRequest.prototype =
         for (var key in this.requestHeaders)
             this.request.setRequestHeader(key, this.requestHeaders[key]);
         this.request.onreadystatechange = function () {
-            context._handleResponse();
+            context._handleResponse(url); /// url used ONLY for error reporting
         }
         this.request.send(data);
     },
@@ -791,7 +763,7 @@ pzHttpRequest.prototype =
             return this.url;
     },
 
-    _handleResponse: function ()
+    _handleResponse: function (savedUrlForErrorReporting)
     {
         if ( this.request.readyState == 4 ) { 
             // pick up appplication errors first
@@ -814,6 +786,16 @@ pzHttpRequest.prototype =
                 else {
                     throw err;
                 }
+            } else if (this.request.status == 200 && 
+                       this.request.responseXML == null) {
+                var err = new Error("XML response is empty but no error " +
+                                    "for " + savedUrlForErrorReporting);
+                err.code = -1;
+                if (this.errorHandler) {
+                    this.errorHandler(err);
+                } else {
+                    throw err;
+                }
             } else if (this.request.status == 200) {
                 this.callback(this.request.responseXML);
             } else {