X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=js%2Fpz2.js;h=34c507b91e0b0435284df6074dd9d48f692c1f80;hb=71ba296a6f9bbde7755b9f6e010517ee429f5817;hp=800546e39f7cc3b5c397d9c64a2be4e04df2017c;hpb=b8fe4f668ee8f33ff8629e090dbcdf2860060a1b;p=pazpar2-moved-to-github.git

diff --git a/js/pz2.js b/js/pz2.js
index 800546e..34c507b 100644
--- a/js/pz2.js
+++ b/js/pz2.js
@@ -1,5 +1,5 @@
 /*
-** $Id: pz2.js,v 1.70 2008-03-12 11:36:57 jakub Exp $
+ * Mine
 ** pz2.js - pazpar2's javascript client library.
 */
 
@@ -48,6 +48,7 @@ var pz2 = function ( paramArray )
     }
     
     this.errorHandler = paramArray.errorhandler || null;
+    this.showResponseType = paramArray.showResponseType || "xml";
     
     // function callbacks
     this.initCallback = paramArray.oninit || null;
@@ -294,11 +295,11 @@ pz2.prototype =
                     context.searchStatusOK = true;
                     //piggyback search
                     context.show(start, num, sort);
-                    if ( context.statCallback )
+                    if (context.statCallback)
                         context.stat();
-                    if ( context.termlistCallback )
+                    if (context.termlistCallback)
                         context.termlist();
-                    if ( context.bytargetCallback )
+                    if (context.bytargetCallback)
                         context.bytarget();
                 }
                 else
@@ -368,61 +369,71 @@ pz2.prototype =
         var context = this;
         var request = new pzHttpRequest(this.pz2String, this.errorHandler);
         request.safeGet(
-            { 
-                "command": "show", 
-                "session": this.sessionID, 
-                "start": this.currentStart,
-                "num": this.currentNum, 
-                "sort": this.currentSort, 
-                "block": 1 
-            },
-            function(data) {
-                if ( data.getElementsByTagName("status")[0]
-                        .childNodes[0].nodeValue == "OK" ) {
-                    // first parse the status data send along with records
-                    // this is strictly bound to the format
-                    var activeClients = 
-                        Number( data.getElementsByTagName("activeclients")[0]
-                                    .childNodes[0].nodeValue );
-                    context.activeClients = activeClients; 
-                    var show = {
-                        "activeclients": activeClients,
-                        "merged": 
-                            Number( data.getElementsByTagName("merged")[0]
-                                        .childNodes[0].nodeValue ),
-                        "total": 
-                            Number( data.getElementsByTagName("total")[0]
-                                        .childNodes[0].nodeValue ),
-                        "start": 
-                            Number( data.getElementsByTagName("start")[0]
-                                        .childNodes[0].nodeValue ),
-                        "num": 
-                            Number( data.getElementsByTagName("num")[0]
-                                        .childNodes[0].nodeValue ),
-                        "hits": []
-                    };
-                    // parse all the first-level nodes for all <hit> tags
-                    var hits = data.getElementsByTagName("hit");
-                    for (i = 0; i < hits.length; i++)
-                        show.hits[i] = Element_parseChildNodes(hits[i]);
-                    
-                    context.showCounter++;
-		    var delay = context.showTime;
-		    if (context.showCounter > context.showFastCount)
-                            delay += context.showCounter * context.dumpFactor;
-                    if ( activeClients > 0 )
-                        context.showTimer = setTimeout(
-                            function () {
-                                context.show();
-                            }, 
-                            delay);
-                    global_show = show;
-                    context.showCallback(show);
-                }
-                else
-                    context.throwError('Show failed. Malformed WS resonse.',
-                                        114);
+          {
+            "command": "show", 
+            "session": this.sessionID, 
+            "start": this.currentStart,
+            "num": this.currentNum, 
+            "sort": this.currentSort, 
+            "block": 1,
+            "type": this.showResponseType
+          },
+          function(data, type) {
+            var show = null;
+            var activeClients = 0;
+            if (type === "json") {
+              show = {};
+              activeClients = Number(data.activeclients[0]);
+              show.activeclients = activeClients;
+              show.merged = Number(data.merged[0]);
+              show.total = Number(data.total[0]);
+              show.start = Number(data.start[0]);
+              show.num = Number(data.num[0]);
+              show.hits = data.hit;
+            } else if (data.getElementsByTagName("status")[0]
+                  .childNodes[0].nodeValue == "OK") {
+                // first parse the status data send along with records
+                // this is strictly bound to the format
+                activeClients = 
+                  Number(data.getElementsByTagName("activeclients")[0]
+                      .childNodes[0].nodeValue);
+                show = {
+                  "activeclients": activeClients,
+                  "merged": 
+                    Number( data.getElementsByTagName("merged")[0]
+                        .childNodes[0].nodeValue ),
+                  "total": 
+                    Number( data.getElementsByTagName("total")[0]
+                        .childNodes[0].nodeValue ),
+                  "start": 
+                    Number( data.getElementsByTagName("start")[0]
+                        .childNodes[0].nodeValue ),
+                  "num": 
+                    Number( data.getElementsByTagName("num")[0]
+                        .childNodes[0].nodeValue ),
+                  "hits": []
+                };
+                // parse all the first-level nodes for all <hit> tags
+                var hits = data.getElementsByTagName("hit");
+                for (i = 0; i < hits.length; i++)
+                  show.hits[i] = Element_parseChildNodes(hits[i]);
+            } else {
+              context.throwError('Show failed. Malformed WS resonse.',
+                  114);
             }
+            context.activeClients = activeClients; 
+            context.showCounter++;
+            var delay = context.showTime;
+            if (context.showCounter > context.showFastCount)
+              delay += context.showCounter * context.dumpFactor;
+            if ( activeClients > 0 )
+              context.showTimer = setTimeout(
+                function () {
+                  context.show();
+                }, 
+                delay);
+            context.showCallback(show);
+          }
         );
     },
     record: function(id, offset, syntax, handler)
@@ -751,7 +762,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);
     },
@@ -764,7 +775,7 @@ pzHttpRequest.prototype =
             return this.url;
     },
 
-    _handleResponse: function ()
+    _handleResponse: function (savedUrlForErrorReporting)
     {
         if ( this.request.readyState == 4 ) { 
             // pick up appplication errors first
@@ -787,14 +798,29 @@ pzHttpRequest.prototype =
                 else {
                     throw err;
                 }
+            } else if (this.request.status == 200 && 
+                       this.request.responseXML == null) {
+              if (this.request.responseText != null) {
+                //assume JSON
+                var json = eval("(" + this.request.responseText + ")");
+                this.callback(json, "json");
+              } else {
+                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 {
                 var err = new Error("HTTP response not OK: " 
                             + this.request.status + " - " 
                             + this.request.statusText );
-                err.code = '00' + this.request.status;
-                
+                err.code = '00' + this.request.status;        
                 if (this.errorHandler) {
                     this.errorHandler(err);
                 }
@@ -958,7 +984,7 @@ Element_parseChildNodes = function (node)
     // if no nested elements, get text content
     if (node.hasChildNodes() && !hasChildElems) {
         if (node.attributes.length) 
-            parsed['textContent'] = node.firstChild.nodeValue;
+            parsed['#text'] = node.firstChild.nodeValue;
         else
             parsed = node.firstChild.nodeValue;
     }