Removing array pushes.

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

diff --git a/js/pz2.js b/js/pz2.js
index 950cfa1..6d173a9 100644 (file)
--- a/js/pz2.js
+++ b/js/pz2.js
@@ -1,5 +1,5 @@
 /*
-** $Id: pz2.js,v 1.39 2007-06-22 10:52:09 adam Exp $
+** $Id: pz2.js,v 1.42 2007-07-02 12:52:03 jakub Exp $
 ** pz2.js - pazpar2's javascript client library.
 */
 
@@ -40,6 +40,7 @@ var pz2 = function(paramArray) {
     //load stylesheet if required in async mode
     if( __myself.stylesheet ) {
         var request = new pzHttpRequest( __myself.stylesheet );
+        request.async = false;
         request.get(
                 [],
                 function ( doc ) {
@@ -146,7 +147,7 @@ pz2.prototype =
         } else if (__myself.useSessions) {
             var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
             request.get(
-                [ { "command": "init" } ],
+                { "command": "init" },
                 function(data) {
                     if ( data.getElementsByTagName("status")[0].childNodes[0].nodeValue == "OK" ) {
                         if ( data.getElementsByTagName("protocol")[0].childNodes[0].nodeValue != __myself.suppProtoVer )
@@ -161,7 +162,9 @@ pz2.prototype =
                         setTimeout("__myself.init()", 1000);
                 }
             );
-        }
+        } else {
+            __myself.initStatusOK = true;
+       }
     },
     // no need to ping explicitly
     ping: function () 
@@ -171,7 +174,7 @@ pz2.prototype =
             // session is not initialized code here
         var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
         request.get(
-            [ { "command": "ping", "session": __myself.sessionID } ],
+            { "command": "ping", "session": __myself.sessionID },
             function(data) {
                 if ( data.getElementsByTagName("status")[0].childNodes[0].nodeValue == "OK" ) {
                     __myself.pingStatusOK = true;
@@ -204,10 +207,11 @@ pz2.prototype =
         else
             throw new Error("You need to supply query to the search command");
 
-       var searchParams = [{ "command": "search", "query": __myself.currQuery }];
-       searchParams.push({"session":__myself.sessionID});
-       if (filter !== undefined)
-           searchParams.push({"filter": filter});
+       var searchParams = { "command": "search", "query": __myself.currQuery, "session": __myself.sessionID };
+       
+        if (filter !== undefined)
+           searchParams["filter"] = filter;
+        
         var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
         request.get(
             searchParams,
@@ -241,7 +245,7 @@ pz2.prototype =
         clearTimeout(__myself.statTimer);
         var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
         request.get(
-            [ { "command": "stat", "session": __myself.sessionID } ],
+            { "command": "stat", "session": __myself.sessionID },
             function(data) {
                 if ( data.getElementsByTagName("stat") ) {
                     var activeClients = Number( data.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue );
@@ -289,8 +293,8 @@ pz2.prototype =
         var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
         var context = this;
         request.get(
-            [ { "command": "show", "session": __myself.sessionID, "start": __myself.currentStart,
-              "num": __myself.currentNum, "sort": __myself.currentSort, "block": 1 } ],
+            { "command": "show", "session": __myself.sessionID, "start": __myself.currentStart,
+              "num": __myself.currentNum, "sort": __myself.currentSort, "block": 1 },
             function(data) {
                 if ( data.getElementsByTagName("status")[0].childNodes[0].nodeValue == "OK" ) {
                     // first parse the status data send along with records
@@ -357,7 +361,7 @@ pz2.prototype =
             __myself.currRecID = id;
         var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
         request.get(
-            [ { "command": "record", "session": __myself.sessionID, "id": __myself.currRecID } ],
+            { "command": "record", "session": __myself.sessionID, "id": __myself.currRecID },
             function(data) {
                 var recordNode;
                 var record = new Array();
@@ -414,7 +418,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 },
             function(data) {
                 if ( data.getElementsByTagName("termlist") ) {
                     var activeClients = Number( data.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue );
@@ -466,7 +470,7 @@ pz2.prototype =
         clearTimeout(__myself.bytargetTimer);
         var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
         request.get(
-            [ { "command": "bytarget", "session": __myself.sessionID } ],
+            { "command": "bytarget", "session": __myself.sessionID },
             function(data) {
                 if ( data.getElementsByTagName("status")[0].childNodes[0].nodeValue == "OK" ) {
                     var targetNodes = data.getElementsByTagName("target");
@@ -568,15 +572,13 @@ pzHttpRequest.prototype =
         var getUrl = this.url;
 
        var sep = '?';
-       for (var i = 0; i < params.length; i++) {
-           var el = params[i];
-           for (var key in el) {
-               if (el[key] != null) {
-                   getUrl += sep + key + '=' + encodeURI(el[key]);
-                   sep = '&';
-               }
-           }
-       }
+        var el = params;
+        for (var key in el) {
+            if (el[key] != null) {
+                getUrl += sep + key + '=' + encodeURI(el[key]);
+                sep = '&';
+            }
+        }
         return getUrl;
     },