Added new parameter for pz2 object: pazpar2path which sets Pazpar2 path.

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

diff --git a/js/pz2.js b/js/pz2.js
index 0b2560b..58c2f1e 100644 (file)
--- a/js/pz2.js
+++ b/js/pz2.js
@@ -1,5 +1,5 @@
 /*
-** $Id: pz2.js,v 1.33 2007-06-05 15:19:25 jakub Exp $
+** $Id: pz2.js,v 1.37 2007-06-21 09:42:46 adam Exp $
 ** pz2.js - pazpar2's javascript client library.
 */
 
@@ -30,7 +30,7 @@ var pz2 = function(paramArray) {
 
     //supported pazpar2's protocol version
     __myself.suppProtoVer = '1';
-    __myself.pz2String = "search.pz2";
+    __myself.pz2String = paramArray.pazpar2path || "search.pz2";
     __myself.stylesheet = paramArray.detailstylesheet || null;
 
     //load stylesheet if required in async mode
@@ -109,23 +109,25 @@ var pz2 = function(paramArray) {
     if (paramArray.autoInit !== false)
         __myself.init();
 };
-pz2.prototype = {
-    stop: function ()
-    {
-        clearTimeout(__myself.statTimer);
-        clearTimeout(__myself.showTimer);
-        clearTimeout(__myself.termTimer);
-        clearTimeout(__myself.bytargetTimer);
+pz2.prototype = 
+{
+   stop: function ()
+   {
+       clearTimeout(__myself.statTimer);
+       clearTimeout(__myself.showTimer);
+       clearTimeout(__myself.termTimer);
+       clearTimeout(__myself.bytargetTimer);
     },
+    
     reset: function ()
     {
         __myself.sessionID = null;
         __myself.initStatusOK = false;
         __myself.pingStatusOK = false;
         __myself.searchStatusOK = false;
-        
+
         __myself.stop();
-               
+            
         if ( __myself.resetCallback )
                 __myself.resetCallback();
     },
@@ -408,7 +410,7 @@ pz2.prototype = {
         clearTimeout(__myself.termTimer);
         var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
         request.get(
-            { "command": "termlist", "session": __myself.sessionID, "name": __myself.termKeys, "block": "1" },
+            { "command": "termlist", "session": __myself.sessionID, "name": __myself.termKeys },
             function(data) {
                 if ( data.getElementsByTagName("termlist") ) {
                     var activeClients = Number( data.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue );
@@ -520,6 +522,7 @@ var pzHttpRequest = function ( url, errorHandler ) {
         this.request = null;
         this.url = url;
         this.errorHandler = errorHandler || null;
+        this.async = true;
         
         if ( window.XMLHttpRequest ) {
             this.request = new XMLHttpRequest();
@@ -536,8 +539,28 @@ pzHttpRequest.prototype =
 {
     get: function ( params, callback ) 
     {
+        this._send( 'GET', params, null, callback );
+    },
+
+    post: function ( params, data, callback )
+    {
+        this._send( 'POST', params, data, callback );
+    },
+
+    _send: function ( type, params, data, callback )
+    {
         this.callback = callback;
-        
+        var context = this;
+        this.request.open( type, this._urlAppendParams(params), this.async );
+        //this.request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+        this.request.onreadystatechange = function () {
+            context._handleResponse();
+        }
+        this.request.send(data);
+    },
+
+    _urlAppendParams: function (params)
+    {
         var getUrl = this.url;
         var paramArr = new Array();
 
@@ -548,14 +571,7 @@ pzHttpRequest.prototype =
         if ( paramArr.length )
             getUrl += '?' + paramArr.join('&');
 
-        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();
-        }
-        this.request.send(null);
+        return getUrl;
     },
 
     _handleResponse: function ()
@@ -611,10 +627,6 @@ var pzQuery = function()
     this.filterNums = 0;
 };
 pzQuery.prototype = {
-    clearSimpleQuery: function()
-    {
-        this.simpleQuery = '';
-    },
     reset: function()
     {
         this.simpleQuery = '';
@@ -622,6 +634,10 @@ pzQuery.prototype = {
         this.simpleFilter = null;
         this.numTerms = 0;
     },
+    clearSimpleQuery: function()
+    {
+        this.simpleQuery = '';
+    },
     addTerm: function(field, value)
     {
         var term = {"field": field, "value": value};