Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

diff --combined js/pz2.js
index 09dbf32,53c0c2a..b5dbca9
--- 1/js/pz2.js
--- 2/js/pz2.js
+++ b/js/pz2.js
@@@ -332,14 -332,14 +332,14 @@@ pz2.prototype 
                          "clients": 
                              Number( data.getElementsByTagName("clients")[0]
                                          .childNodes[0].nodeValue ),
 -                        "initializing": 
 -                            Number( data.getElementsByTagName("initializing")[0]
 +                        "unconnected": 
 +                            Number( data.getElementsByTagName("unconnected")[0]
                                          .childNodes[0].nodeValue ),
 -                        "searching": 
 -                            Number( data.getElementsByTagName("searching")[0]
 +                        "connecting": 
 +                            Number( data.getElementsByTagName("connecting")[0]
                                          .childNodes[0].nodeValue ),
 -                        "presenting": 
 -                            Number( data.getElementsByTagName("presenting")[0]
 +                        "working": 
 +                            Number( data.getElementsByTagName("working")[0]
                                          .childNodes[0].nodeValue ),
                          "idle": 
                              Number( data.getElementsByTagName("idle")[0]
@@@ -777,25 -777,17 +777,17 @@@ pzHttpRequest.prototype 
      _handleResponse: function ()
      {
          if ( this.request.readyState == 4 ) { 
-             // pick up pazpr2 errors first
-             if ( this.request.responseXML 
-                 && this.request.responseXML.documentElement.nodeName == 'error'
-                 && this.request.responseXML.getElementsByTagName("error")
-                     .length ) {
+             // pick up appplication errors first
+             var errNode = null;
+             if (this.request.responseXML &&
+                 (errNode = this.request.responseXML.documentElement)
+                 && errNode.nodeName == 'error') {
+                 var errMsg = errNode.getAttribute("msg");
+                 var errCode = errNode.getAttribute("code");
                  var errAddInfo = '';
-                 if ( this.request.responseXML.getElementsByTagName("error")[0]
-                         .childNodes.length )
-                     errAddInfo = ': ' + 
-                         this.request.responseXML
-                             .getElementsByTagName("error")[0]
-                             .childNodes[0].nodeValue;
-                 var errMsg = 
-                     this.request.responseXML.getElementsByTagName("error")[0]
-                         .getAttribute("msg");
-                 var errCode = 
-                     this.request.responseXML.getElementsByTagName("error")[0]
-                         .getAttribute("code");
-             
+                 if (errNode.childNodes.length)
+                     errAddInfo = ': ' + errNode.childNodes[0].nodeValue;
+                            
                  var err = new Error(errMsg + errAddInfo);
                  err.code = errCode;
            
@@@ -805,13 -797,13 +797,13 @@@
                  else {
                      throw err;
                  }
-             } else if ( this.request.status == 200 ) {
-                 this.callback( this.request.responseXML );
+             } else if (this.request.status == 200) {
+                 this.callback(this.request.responseXML);
              } else {
-                 var err = new Error("Pz2.js: HTTP request error (AJAX). Code: " 
-                             + this.request.status + " Info: " 
+                 var err = new Error("HTTP response not OK: " 
+                             + this.request.status + " - " 
                              + this.request.statusText );
-                 err.code = 'HTTP';
+                 err.code = '00' + this.request.status;
                  
                  if (this.errorHandler) {
                      this.errorHandler(err);