Only use XDR when doing CORS
[pazpar2-moved-to-github.git] / js / pz2.js
index 4d7f784..8ae1379 100644 (file)
--- a/js/pz2.js
+++ b/js/pz2.js
@@ -1,5 +1,5 @@
 /*
-** $Id: pz2.js,v 1.68 2007-12-20 13:09:40 jakub Exp $
+ * $Id$
 ** pz2.js - pazpar2's javascript client library.
 */
 
@@ -29,7 +29,7 @@ var pz2 = function ( paramArray )
     
     // at least one callback required
     if ( !paramArray )
-        throw new Error("Pz2.js: Array with parameters has to be suplied."); 
+        throw new Error("Pz2.js: Array with parameters has to be supplied."); 
 
     //supported pazpar2's protocol version
     this.suppProtoVer = '1';
@@ -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;
@@ -68,15 +69,19 @@ var pz2 = function ( paramArray )
         this.keepAlive = paramArray.keepAlive;
 
     this.sessionID = null;
+    this.serviceId = paramArray.serviceId || null;
     this.initStatusOK = false;
     this.pingStatusOK = false;
     this.searchStatusOK = false;
+    this.mergekey = paramArray.mergekey || null;
+    this.rank = paramArray.rank || null;
     
     // for sorting
     this.currentSort = "relevance";
 
     // where are we?
     this.currentStart = 0;
+    // currentNum can be overwritten in show 
     this.currentNum = 20;
 
     // last full record retrieved
@@ -85,7 +90,11 @@ var pz2 = function ( paramArray )
     // current query
     this.currQuery = null;
 
+    //current raw record offset
+    this.currRecOffset = null;
+
     //timers
+    this.pingTimer = null;
     this.statTime = paramArray.stattime || 1000;
     this.statTimer = null;
     this.termTime = paramArray.termtime || 1000;
@@ -95,6 +104,8 @@ var pz2 = function ( paramArray )
     this.showFastCount = 4;
     this.bytargetTime = paramArray.bytargettime || 1000;
     this.bytargetTimer = null;
+    this.recordTime = paramArray.recordtime || 500;
+    this.recordTimer = null;
 
     // counters for each command and applied delay
     this.dumpFactor = 500;
@@ -102,6 +113,7 @@ var pz2 = function ( paramArray )
     this.termCounter = 0;
     this.statCounter = 0;
     this.bytargetCounter = 0;
+    this.recordCounter = 0;
 
     // active clients, updated by stat and show
     // might be an issue since bytarget will poll accordingly
@@ -114,8 +126,10 @@ var pz2 = function ( paramArray )
     }
     // else, auto init session or wait for a user init?
     if (this.useSessions && paramArray.autoInit !== false) {
-        this.init();
+        this.init(this.sessionID, this.serviceId);
     }
+    // Version parameter
+    this.version = paramArray.version || null;
 };
 
 pz2.prototype = 
@@ -150,6 +164,7 @@ pz2.prototype =
             this.sessionID = null;
             this.initStatusOK = false;
             this.pingStatusOK = false;
+            clearTimeout(this.pingTimer);
         }
         this.searchStatusOK = false;
         this.stop();
@@ -158,12 +173,12 @@ pz2.prototype =
                 this.resetCallback();
     },
 
-    init: function ( sessionId ) 
+    init: function (sessionId, serviceId) 
     {
         this.reset();
         
         // session id as a param
-        if ( sessionId != undefined && this.useSessions ) {
+        if (sessionId && this.useSessions ) {
             this.initStatusOK = true;
             this.sessionID = sessionId;
             this.ping();
@@ -171,8 +186,10 @@ pz2.prototype =
         } else if (this.useSessions) {
             var context = this;
             var request = new pzHttpRequest(this.pz2String, this.errorHandler);
-            request.get(
-                { "command": "init" },
+            var opts = {'command' : 'init'};
+            if (serviceId) opts.service = serviceId;
+            request.safeGet(
+                opts,
                 function(data) {
                     if ( data.getElementsByTagName("status")[0]
                             .childNodes[0].nodeValue == "OK" ) {
@@ -186,12 +203,16 @@ pz2.prototype =
                         context.sessionID = 
                             data.getElementsByTagName("session")[0]
                                 .childNodes[0].nodeValue;
-                        setTimeout(
-                            function () {
-                                context.ping();
-                            },
-                            context.keepAlive
-                        );
+                        if (data.getElementsByTagName("keepAlive").length > 0) {
+                            context.keepAlive = data.getElementsByTagName("keepAlive")[0].childNodes[0].nodeValue;
+                        }
+                        context.pingTimer =
+                            setTimeout(
+                                function () {
+                                    context.ping();
+                                },
+                                context.keepAlive
+                            );
                         if ( context.initCallback )
                             context.initCallback();
                     }
@@ -214,19 +235,23 @@ pz2.prototype =
             'Pz2.js: Ping not allowed (proxy mode) or session not initialized.'
             );
         var context = this;
+
+        clearTimeout(context.pingTimer);
+
         var request = new pzHttpRequest(this.pz2String, this.errorHandler);
-        request.get(
-            { "command": "ping", "session": this.sessionID },
+        request.safeGet(
+            { "command": "ping", "session": this.sessionID, "windowid" : window.name },
             function(data) {
                 if ( data.getElementsByTagName("status")[0]
                         .childNodes[0].nodeValue == "OK" ) {
                     context.pingStatusOK = true;
-                    setTimeout(
-                        function () {
-                            context.ping();
-                        }, 
-                        context.keepAlive
-                    );
+                    context.pingTimer =
+                        setTimeout(
+                            function () {
+                                context.ping();
+                            },
+                            context.keepAlive
+                        );
                 }
                 else
                     context.throwError('Ping failed. Malformed WS resonse.',
@@ -234,7 +259,7 @@ pz2.prototype =
             }
         );
     },
-    search: function (query, num, sort, filter, showfrom)
+    search: function (query, num, sort, filter, showfrom, addParamsArr)
     {
         clearTimeout(this.statTimer);
         clearTimeout(this.showTimer);
@@ -245,6 +270,7 @@ pz2.prototype =
         this.termCounter = 0;
         this.bytargetCounter = 0;
         this.statCounter = 0;
+        this.activeClients = 1;
         
         // no proxy mode
         if( !this.initStatusOK )
@@ -261,17 +287,31 @@ pz2.prototype =
             var start = 0;
 
        var searchParams = { 
-            "command": "search",
-            "query": this.currQuery, 
-            "session": this.sessionID 
+          "command": "search",
+          "query": this.currQuery, 
+          "session": this.sessionID,
+          "windowid" : window.name
         };
        
-        if (filter !== undefined)
-           searchParams["filter"] = filter;
+        if( sort !== undefined ) {
+            this.currentSort = sort;
+           searchParams["sort"] = sort;
+       }
+        if (filter !== undefined) searchParams["filter"] = filter;
+        if (this.mergekey) searchParams["mergekey"] = this.mergekey;
+        if (this.rank) searchParams["rank"] = this.rank;
+
+        // copy additional parmeters, do not overwrite
+        if (addParamsArr != undefined) {
+            for (var prop in addParamsArr) {
+                if (!searchParams.hasOwnProperty(prop))
+                    searchParams[prop] = addParamsArr[prop];
+            }
+        }
         
         var context = this;
         var request = new pzHttpRequest(this.pz2String, this.errorHandler);
-        request.get(
+        request.safeGet(
             searchParams,
             function(data) {
                 if ( data.getElementsByTagName("status")[0]
@@ -279,11 +319,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
@@ -302,45 +342,17 @@ pz2.prototype =
         
         var context = this;
         var request = new pzHttpRequest(this.pz2String, this.errorHandler);
-        request.get(
-            { "command": "stat", "session": this.sessionID },
+        request.safeGet(
+            { "command": "stat", "session": this.sessionID, "windowid" : window.name },
             function(data) {
                 if ( data.getElementsByTagName("stat") ) {
                     var activeClients = 
                         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;
@@ -361,7 +373,7 @@ pz2.prototype =
             }
         );
     },
-    show: function(start, num, sort)
+    show: function(start, num, sort, query_state)
     {
         if( !this.searchStatusOK && this.useSessions )
             throw new Error(
@@ -380,213 +392,168 @@ pz2.prototype =
 
         var context = this;
         var request = new pzHttpRequest(this.pz2String, this.errorHandler);
-        request.get(
-            { 
-                "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");
-                    var hit = new Array();
-                    for (i = 0; i < hits.length; i++) {
-                        show.hits[i] = new Array();
-                       show.hits[i]['location'] = new Array();
-                       var locCount = 0;
-                        for ( j = 0; j < hits[i].childNodes.length; j++) {
-                            if ( hits[i].childNodes[j].nodeType 
-                                == Node.ELEMENT_NODE ) {
-                               if (hits[i].childNodes[j].nodeName 
-                                    == 'location') {
-                                   var locNode = hits[i].childNodes[j];
-                                   var id = locNode.getAttribute('id');
-                                   show.hits[i]['location'][locCount] = {
-                                       "id": locNode.getAttribute("id"),
-                                       "name": locNode.getAttribute("name")
-                                   };
-                                    locCount++;
-                               }
-                               else {
-                                   var nodeName = 
-                                        hits[i].childNodes[j].nodeName;
-                                    var nodeText = 'ERROR'
-                                    if ( hits[i].childNodes[j].firstChild )
-                                        nodeText = 
-                                            hits[i].childNodes[j]
-                                                .firstChild.nodeValue;
-                                   show.hits[i][nodeName] = nodeText;
-                               }
-                            }
-                        }
-                    }
-                    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);
+       var requestParameters = 
+          {
+              "command": "show", 
+              "session": this.sessionID, 
+              "start": this.currentStart,
+              "num": this.currentNum, 
+              "sort": this.currentSort, 
+              "block": 1,
+              "type": this.showResponseType,
+              "windowid" : window.name
+          };
+        if (query_state)
+          requestParameters["query-state"] = query_state;
+       if (this.version && this.version > 0)
+           requestParameters["version"] = this.version;
+        request.safeGet(
+         requestParameters,
+          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);
+            };
+           
+           var approxNode = data.getElementsByTagName("approximation");
+           if (approxNode && approxNode[0] && approxNode[0].childNodes[0] && approxNode[0].childNodes[0].nodeValue)
+               show['approximation'] = 
+                 Number( approxNode[0].childNodes[0].nodeValue);
+             
 
-                    context.showCallback(show);
-                }
-                else
-                    context.throwError('Show failed. Malformed WS resonse.',
-                                        114);
-            }
+             data.getElementsByTagName("")
+            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, pass_params)
+    record: function(id, offset, syntax, handler)
     {
         // we may call record with no previous search if in proxy mode
-        if( !this.searchStatusOK && this.useSessions)
+        if(!this.searchStatusOK && this.useSessions)
            throw new Error(
             'Pz2.js: record command has to be preceded with a search command.'
             );
-        var params = {};
-        if ( pass_params != undefined )
-            params = pass_params;
-
-        var callback;
-        if ( params.callback != undefined ) {
-            callback = params.callback;
-        } else {
-            callback = this.recordCallback;
-        }
         
-        var handle;
-        if ( params['handle'] == undefined )
-            handle = {};
-        else
-            handle = params['handle'];
-
         if( id !== undefined )
             this.currRecID = id;
         
-        var context = this;
-        var request = new pzHttpRequest(this.pz2String, this.errorHandler);
-
-       var recordParams = { "command": "record", 
-                            "session": this.sessionID,
-                            "id": this.currRecID };
+       var recordParams = { 
+            "command": "record", 
+            "session": this.sessionID,
+            "id": this.currRecID,
+            "windowid" : window.name
+        };
        
-        if (offset !== undefined) {
+       this.currRecOffset = null;
+        if (offset != undefined) {
            recordParams["offset"] = offset;
-       }
-
-        if (params.syntax != undefined) {
-            recordParams['syntax'] = params.syntax;
+            this.currRecOffset = offset;
         }
 
-       this.currRecOffset = offset;
+        if (syntax != undefined)
+            recordParams['syntax'] = syntax;
+
+        //overwrite default callback id needed
+        var callback = this.recordCallback;
+        var args = undefined;
+        if (handler != undefined) {
+            callback = handler['callback'];
+            args = handler['args'];
+        }
+        
+        var context = this;
+        var request = new pzHttpRequest(this.pz2String, this.errorHandler);
 
-        request.get(
+        request.safeGet(
            recordParams,
             function(data) {
                 var recordNode;
-                var record = new Array();
-                record['xmlDoc'] = data;
-               if (context.currRecOffset !== undefined) {
+                var record;                                
+                //raw record
+                if (context.currRecOffset !== null) {
+                    record = new Array();
+                    record['xmlDoc'] = data;
                     record['offset'] = context.currRecOffset;
-                    callback(record, handle);
+                    callback(record, args);
+                //pz2 record
                 } else if ( recordNode = 
                     data.getElementsByTagName("record")[0] ) {
                     // if stylesheet was fetched do not parse the response
                     if ( context.xslDoc ) {
+                        record = new Array();
+                        record['xmlDoc'] = data;
+                        record['xslDoc'] = context.xslDoc;
                         record['recid'] = 
                             recordNode.getElementsByTagName("recid")[0]
                                 .firstChild.nodeValue;
-                        record['xslDoc'] = 
-                            context.xslDoc;
+                    //parse record
                     } else {
-                        for ( i = 0; i < recordNode.childNodes.length; i++) {
-                            if ( recordNode.childNodes[i].nodeType 
-                                == Node.ELEMENT_NODE
-                                && recordNode.childNodes[i].nodeName 
-                                != 'location' ) {
-                                var nodeName = 
-                                    recordNode.childNodes[i].nodeName;
-                                var nodeText = '';
-                                if (recordNode.childNodes[i].firstChild)
-                                    nodeText = recordNode.childNodes[i]
-                                        .firstChild.nodeValue;
-                                record[nodeName] = nodeText;                            
-                            }
-                        }
-                        // the location might be empty!!
-                        var locationNodes = 
-                            recordNode.getElementsByTagName("location");
-                        record["location"] = new Array();
-                        for ( i = 0; i < locationNodes.length; i++ ) {
-                            record["location"][i] = {
-                                "id": locationNodes[i].getAttribute("id"),
-                                "name": locationNodes[i].getAttribute("name")
-                            };
-                            
-                            for (j = 0; 
-                                j < locationNodes[i].childNodes.length; 
-                                j++) {
-                                if ( locationNodes[i].childNodes[j].nodeType 
-                                    == Node.ELEMENT_NODE ) {
-                                    var nodeName = 
-                                        locationNodes[i].childNodes[j].nodeName;
-                                    var nodeText = '';
-                                    if (locationNodes[i].childNodes[j]
-                                            .firstChild)
-                                        nodeText = 
-                                            locationNodes[i].childNodes[j]
-                                                .firstChild.nodeValue;
-                                    // this is stupid
-                                    if (nodeName == 'md-subject') {
-                                        if (record["location"][i][nodeName]) {
-                                            record["location"][i][nodeName]
-                                                .push(nodeText)
-                                        } else {
-                                            record["location"][i][nodeName] 
-                                                = new Array();
-                                            record["location"][i][nodeName]
-                                                .push(nodeText)
-                                        }
-                                    } else {
-                                        record["location"][i][nodeName] 
-                                            = nodeText;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    
-                    callback(record, handle);
+                        record = Element_parseChildNodes(recordNode);
+                    }    
+                   var activeClients = 
+                      Number( data.getElementsByTagName("activeclients")[0]
+                               .childNodes[0].nodeValue );
+                   context.activeClients = activeClients; 
+                    context.recordCounter++;
+                    var delay = context.recordTime + context.recordCounter * context.dumpFactor;
+                    if ( activeClients > 0 )
+                        context.recordTimer = 
+                           setTimeout ( 
+                               function() {
+                                  context.record(id, offset, syntax, handler);
+                                  },
+                                  delay
+                               );                                    
+                    callback(record, args);
                 }
                 else
                     context.throwError('Record failed. Malformed WS resonse.',
@@ -607,11 +574,14 @@ pz2.prototype =
         
         var context = this;
         var request = new pzHttpRequest(this.pz2String, this.errorHandler);
-        request.get(
+        request.safeGet(
             { 
                 "command": "termlist", 
                 "session": this.sessionID, 
-                "name": this.termKeys 
+                "name": this.termKeys,
+                "windowid" : window.name, 
+               "version" : this.version
+       
             },
             function(data) {
                 if ( data.getElementsByTagName("termlist") ) {
@@ -641,12 +611,22 @@ pz2.prototype =
                                     .childNodes[0].nodeValue || 'ERROR'
                             };
 
+                           // Only for xtargets: id, records, filtered
                             var termIdNode = 
                                 terms[j].getElementsByTagName("id");
                             if(terms[j].getElementsByTagName("id").length)
                                 term["id"] = 
                                     termIdNode[0].childNodes[0].nodeValue;
                             termList[listName][j] = term;
+
+                           var recordsNode  = terms[j].getElementsByTagName("records");
+                           if (recordsNode && recordsNode.length)
+                               term["records"] = recordsNode[0].childNodes[0].nodeValue;
+                              
+                           var filteredNode  = terms[j].getElementsByTagName("filtered");
+                           if (filteredNode && filteredNode.length)
+                               term["filtered"] = filteredNode[0].childNodes[0].nodeValue;
+                              
                         }
                     }
 
@@ -687,8 +667,14 @@ pz2.prototype =
         
         var context = this;
         var request = new pzHttpRequest(this.pz2String, this.errorHandler);
-        request.get(
-            { "command": "bytarget", "session": this.sessionID },
+        request.safeGet(
+            { 
+               "command": "bytarget", 
+               "session": this.sessionID, 
+               "block": 1,
+               "windowid" : window.name,
+               "version" : this.version
+           },
             function(data) {
                 if ( data.getElementsByTagName("status")[0]
                         .childNodes[0].nodeValue == "OK" ) {
@@ -701,12 +687,36 @@ pz2.prototype =
                                 == Node.ELEMENT_NODE ) {
                                 var nodeName = 
                                     targetNodes[i].childNodes[j].nodeName;
-                                var nodeText = 
-                                    targetNodes[i].childNodes[j]
-                                        .firstChild.nodeValue;
-                                bytarget[i][nodeName] = nodeText;
+                               if (targetNodes[i].childNodes[j].firstChild != null) 
+                               {
+                                    var nodeText = targetNodes[i].childNodes[j]
+                                       .firstChild.nodeValue;
+                                    bytarget[i][nodeName] = nodeText;
+                               }
+                               else { 
+                                   bytarget[i][nodeName] = "";  
+                               }
+
+
                             }
                         }
+                        if (bytarget[i]["state"]=="Client_Disconnected") {
+                          bytarget[i]["hits"] = "Error";
+                        } else if (bytarget[i]["state"]=="Client_Error") {
+                          bytarget[i]["hits"] = "Error";                          
+                        } else if (bytarget[i]["state"]=="Client_Working") {
+                          bytarget[i]["hits"] = "...";
+                        }
+                        if (bytarget[i].diagnostic == "1") {
+                          bytarget[i].diagnostic = "Permanent system error";
+                        } else if (bytarget[i].diagnostic == "2") {
+                          bytarget[i].diagnostic = "Temporary system error";
+                        } 
+                        var targetsSuggestions = targetNodes[i].getElementsByTagName("suggestions");
+                        if (targetsSuggestions != undefined && targetsSuggestions.length>0) {
+                          var suggestions = targetsSuggestions[0];
+                          bytarget[i]["suggestions"] = Element_parseChildNodes(suggestions);
+                        }
                     }
                     
                     context.bytargetCounter++;
@@ -758,33 +768,58 @@ pz2.prototype =
 ** AJAX HELPER CLASS ***********************************************************
 ********************************************************************************
 */
-var pzHttpRequest = function ( url, errorHandler ) {
+var pzHttpRequest = function (url, errorHandler, cookieDomain) {
+        this.maxUrlLength = 2048;
         this.request = null;
         this.url = url;
         this.errorHandler = errorHandler || null;
         this.async = true;
-        
-        if ( window.XMLHttpRequest ) {
-            this.request = new XMLHttpRequest();
-        } else if ( window.ActiveXObject ) {
-            try {
-                this.request = new ActiveXObject( 'Msxml2.XMLHTTP' );
-            } catch (err) {
-                this.request = new ActiveXObject( 'Microsoft.XMLHTTP' );
-            }
+        this.requestHeaders = {};
+        this.isXDR = false;
+        this.domainRegex = /https?:\/\/([^:/]+).*/;
+        this.cookieDomain = cookieDomain || null;
+
+        var xhr = new XMLHttpRequest();
+        var domain = this._getDomainFromUrl(url);
+        if ("withCredentials" in xhr) {
+          // XHR for Chrome/Firefox/Opera/Safari.
+        } else if (domain && this._isCrossDomain(domain) &&
+            typeof XDomainRequest != "undefined") {
+          // use XDR (IE7/8) when no other way
+          xhr = new XDomainRequest();
+          this.isXDR = true;
+        } else {
+          // CORS not supported.
         }
+        this.request = xhr;
 };
 
+
 pzHttpRequest.prototype = 
 {
+    safeGet: function ( params, callback )
+    {
+        var encodedParams =  this.encodeParams(params);
+        var url = this._urlAppendParams(encodedParams);
+        if (url.length >= this.maxUrlLength) {
+            this.requestHeaders["Content-Type"]
+                = "application/x-www-form-urlencoded";
+            this._send( 'POST', this.url, encodedParams, callback );
+        } else {
+            this._send( 'GET', url, '', callback );
+        }
+    },
+
     get: function ( params, callback ) 
     {
-        this._send( 'GET', params, '', callback );
+        this._send( 'GET', this._urlAppendParams(this.encodeParams(params)), 
+            '', callback );
     },
 
     post: function ( params, data, callback )
     {
-        this._send( 'POST', params, data, callback );
+        this._send( 'POST', this._urlAppendParams(this.encodeParams(params)), 
+            data, callback );
     },
 
     load: function ()
@@ -796,55 +831,152 @@ pzHttpRequest.prototype =
             return this.request.responseXML;
     },
 
-    _send: function ( type, params, data, callback )
+    encodeParams: function (params)
+    {
+        var sep = "";
+        var encoded = "";
+        for (var key in params) {
+            if (params[key] != null) {
+                encoded += sep + key + '=' + encodeURIComponent(params[key]);
+                sep = '&';
+            }
+        }
+        return encoded;
+    },
+
+    _getDomainFromUrl: function (url)
+    {
+      if (this.cookieDomain) return this.cookieDomain; //explicit cookie domain
+      var m = this.domainRegex.exec(url);
+      return (m && m.length > 1) ? m[1] : null;
+    },
+
+    _strEndsWith: function (str, suffix) 
+    {
+      return str.indexOf(suffix, str.length - suffix.length) !== -1;
+    },
+
+    _isCrossDomain: function (domain)
+    {
+      if (this.cookieDomain) return true; //assume xdomain is cookie domain set
+      return !this._strEndsWith(domain, document.domain); 
+    },
+
+    getCookie: function (sKey) {
+      return decodeURI(document.cookie.replace(new RegExp("(?:(?:^|.*;)\\s*" 
+        + encodeURI(sKey).replace(/[\-\.\+\*]/g, "\\$&") 
+        + "\\s*\\=\\s*([^;]*).*$)|^.*$"), "$1")) || null;
+    },
+
+    setCookie: function (sKey, sValue, vEnd, sPath, sDomain, bSecure) {
+      if (!sKey || /^(?:expires|max\-age|path|domain|secure)$/i.test(sKey)) { 
+        return false; 
+      }
+      var sExpires = "";
+      if (vEnd) {
+        switch (vEnd.constructor) {
+          case Number:
+            sExpires = vEnd === Infinity 
+              ? "; expires=Fri, 31 Dec 9999 23:59:59 GMT" 
+              : "; max-age=" + vEnd;
+            break;
+          case String:
+            sExpires = "; expires=" + vEnd;
+            break;
+          case Date:
+            sExpires = "; expires=" + vEnd.toGMTString();
+            break;
+        }
+      }
+      document.cookie = encodeURI(sKey) + "=" + encodeURI(sValue) 
+        + sExpires 
+        + (sDomain ? "; domain=" + sDomain : "") 
+        + (sPath ? "; path=" + sPath : "") 
+        + (bSecure ? "; secure" : "");
+      return true;
+    },
+    
+    _send: function ( type, url, data, callback)
     {
-        this.callback = callback;
         var context = this;
+        this.callback = callback;
         this.async = true;
-        this.request.open( type, this._urlAppendParams(params), this.async );
-        this.request.onreadystatechange = function () {
-            context._handleResponse();
+        //we never do withCredentials, so if it's CORS and we have
+        //session cookie, resend it
+        var domain = this._getDomainFromUrl(url);
+        if (domain && this._isCrossDomain(domain) &&
+            this.getCookie(domain+":SESSID")) {
+          //rewrite the URL
+          var sessparam = ';jsessionid=' + this.getCookie(domain+":SESSID");
+          var q = url.indexOf('?');
+          if (q == -1) {
+            url += sessparam;            
+          } else {
+            url = url.substring(0, q) + sessparam + url.substring(q);
+          }
+        }
+        this.request.open( type, url, this.async );
+        if (!this.isXDR) {
+          //setting headers is only allowed with XHR
+          for (var key in this.requestHeaders)
+            this.request.setRequestHeader(key, this.requestHeaders[key]);
+        }
+        if (this.isXDR) {
+          this.request.onload = function () {
+            //fake XHR props
+            context.request.status = 200;
+            context.request.readyState = 4;
+            //handle
+            context._handleResponse(url);
+          }
+          this.request.onerror = function () {
+            //fake XHR props
+            context.request.status = 417; //not really, but what can we do
+            context.request.readyState = 4;
+            //handle
+            context._handleResponse(url);
+          }
+        } else {
+          this.request.onreadystatechange = function () {
+            context._handleResponse(url); /// url used ONLY for error reporting
+          }
         }
         this.request.send(data);
     },
 
-    _urlAppendParams: function (params)
+    _urlAppendParams: function (encodedParams)
     {
-        var getUrl = this.url;
-
-       var sep = '?';
-        var el = params;
-        for (var key in el) {
-            if (el[key] != null) {
-                getUrl += sep + key + '=' + encodeURIComponent(el[key]);
-                sep = '&';
-            }
-        }
-        return getUrl;
+        if (encodedParams)
+            return this.url + "?" + encodedParams;
+        else
+            return this.url;
     },
 
-    _handleResponse: function ()
+    _handleResponse: function (requestUrl)
     {
         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;
+            // xdomainreq does not have responseXML
+            if (this.isXDR) {
+              if (this.request.contentType.match(/\/xml/)){                
+                var dom = new ActiveXObject('Microsoft.XMLDOM');
+                dom.async = false;                
+                dom.loadXML(this.request.responseText);
+                this.request.responseXML = dom;
+              } else {
+                this.request.responseXML = 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;
            
@@ -854,14 +986,47 @@ pzHttpRequest.prototype =
                 else {
                     throw err;
                 }
-            } else if ( this.request.status == 200 ) {
-                this.callback( this.request.responseXML );
+            } 
+            else if (this.request.status == 200 && 
+                     this.request.responseXML === null) {
+              if (this.request.responseText !== null) {
+                //assume JSON
+                       var json = null; 
+                       var text = this.request.responseText;
+                       if (typeof window.JSON == "undefined") {
+                         json = eval("(" + text + ")");
+                } else { 
+                         try {
+                           json = JSON.parse(text);
+                         } catch (e) {
+                  }
+                       } 
+                       this.callback(json, "json");
+              } else {
+                var err = new Error("XML/Text response is empty but no error " +
+                                    "for " + requestUrl);
+                err.code = -1;
+                if (this.errorHandler) {
+                    this.errorHandler(err);
+                } else {
+                    throw err;
+                }
+              }
+            } else if (this.request.status == 200) {
+                //set cookie manually only if cross-domain
+                var domain = this._getDomainFromUrl(requestUrl);
+                if (domain && this._isCrossDomain(domain)) {
+                  var jsessionId = this.request.responseXML
+                    .documentElement.getAttribute('jsessionId');
+                  if (jsessionId)                  
+                    this.setCookie(domain+":SESSID", jsessionId);
+                }
+                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);
                 }
@@ -996,5 +1161,50 @@ Element_getTextContent = function (DOM_Element)
     }
 }
 
+Element_parseChildNodes = function (node)
+{
+    var parsed = {};
+    var hasChildElems = false;
+    var textContent = '';
+
+    if (node.hasChildNodes()) {
+        var children = node.childNodes;
+        for (var i = 0; i < children.length; i++) {
+            var child = children[i];
+            switch (child.nodeType) {
+              case Node.ELEMENT_NODE:
+                hasChildElems = true;
+                var nodeName = child.nodeName; 
+                if (!(nodeName in parsed))
+                    parsed[nodeName] = [];
+                parsed[nodeName].push(Element_parseChildNodes(child));
+                break;
+              case Node.TEXT_NODE:
+                textContent += child.nodeValue;
+                break;
+              case Node.CDATA_SECTION_NODE:
+                textContent += child.nodeValue;
+                break;
+            }
+        }
+    }
+
+    var attrs = node.attributes;
+    for (var i = 0; i < attrs.length; i++) {
+        hasChildElems = true;
+        var attrName = '@' + attrs[i].nodeName;
+        var attrValue = attrs[i].nodeValue;
+        parsed[attrName] = attrValue;
+    }
+
+    // if no nested elements/attrs set value to text
+    if (hasChildElems)
+      parsed['#text'] = textContent;
+    else
+      parsed = textContent;
+    
+    return parsed;
+}
+
 /* do not remove trailing bracket */
 }