X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=js%2Fpz2.js;h=e2335da5678ec9fbaaed44617ddb34a56109520b;hb=d79b22b1adfe8828bc3239e0fb91c9481f699d12;hp=a78417e2aa8be6a199375e89122ea20797a255b9;hpb=6dec6061f0670a494291e704743581e62d51f681;p=pazpar2-moved-to-github.git diff --git a/js/pz2.js b/js/pz2.js index a78417e..e2335da 100644 --- a/js/pz2.js +++ b/js/pz2.js @@ -79,6 +79,7 @@ var pz2 = function ( paramArray ) // where are we? this.currentStart = 0; + // currentNum can be overwritten in show this.currentNum = 20; // last full record retrieved @@ -91,6 +92,7 @@ var pz2 = function ( paramArray ) this.currRecOffset = null; //timers + this.pingTimer = null; this.statTime = paramArray.stattime || 1000; this.statTimer = null; this.termTime = paramArray.termtime || 1000; @@ -124,6 +126,8 @@ var pz2 = function ( paramArray ) if (this.useSessions && paramArray.autoInit !== false) { this.init(this.sessionId, this.serviceId); } + // Version parameter + this.version = paramArray.version || null; }; pz2.prototype = @@ -158,6 +162,7 @@ pz2.prototype = this.sessionID = null; this.initStatusOK = false; this.pingStatusOK = false; + clearTimeout(this.pingTimer); } this.searchStatusOK = false; this.stop(); @@ -196,12 +201,13 @@ pz2.prototype = context.sessionID = data.getElementsByTagName("session")[0] .childNodes[0].nodeValue; - setTimeout( - function () { - context.ping(); - }, - context.keepAlive - ); + context.pingTimer = + setTimeout( + function () { + context.ping(); + }, + context.keepAlive + ); if ( context.initCallback ) context.initCallback(); } @@ -224,19 +230,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.safeGet( - { "command": "ping", "session": this.sessionID }, + { "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.', @@ -271,14 +281,15 @@ pz2.prototype = else var start = 0; - var searchParams = { - "command": "search", - "query": this.currQuery, - "session": this.sessionID + var searchParams = { + "command": "search", + "query": this.currQuery, + "session": this.sessionID, + "windowid" : window.name }; if (filter !== undefined) - searchParams["filter"] = filter; + searchParams["filter"] = filter; // copy additional parmeters, do not overwrite if (addParamsArr != undefined) { @@ -322,7 +333,7 @@ pz2.prototype = var context = this; var request = new pzHttpRequest(this.pz2String, this.errorHandler); request.safeGet( - { "command": "stat", "session": this.sessionID }, + { "command": "stat", "session": this.sessionID, "windowid" : window.name }, function(data) { if ( data.getElementsByTagName("stat") ) { var activeClients = @@ -352,7 +363,7 @@ pz2.prototype = } ); }, - show: function(start, num, sort) + show: function(start, num, sort, query_state) { if( !this.searchStatusOK && this.useSessions ) throw new Error( @@ -371,16 +382,23 @@ pz2.prototype = var context = this; var request = new pzHttpRequest(this.pz2String, this.errorHandler); - request.safeGet( + var requestParameters = { - "command": "show", - "session": this.sessionID, - "start": this.currentStart, - "num": this.currentNum, - "sort": this.currentSort, - "block": 1, - "type": this.showResponseType - }, + "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; @@ -423,7 +441,14 @@ pz2.prototype = } else { context.throwError('Show failed. Malformed WS resonse.', 114); - } + }; + var approxNode = data.getElementsByTagName("approximation"); + if (approxNode) + show['approximation'] = + Number( approxNode[0].childNodes[0].nodeValue); + + + data.getElementsByTagName("") context.activeClients = activeClients; context.showCounter++; var delay = context.showTime; @@ -453,7 +478,8 @@ pz2.prototype = var recordParams = { "command": "record", "session": this.sessionID, - "id": this.currRecID + "id": this.currRecID, + "windowid" : window.name }; this.currRecOffset = null; @@ -541,7 +567,10 @@ pz2.prototype = { "command": "termlist", "session": this.sessionID, - "name": this.termKeys + "name": this.termKeys, + "windowid" : window.name, + "version" : this.version + }, function(data) { if ( data.getElementsByTagName("termlist") ) { @@ -571,12 +600,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; + } } @@ -618,7 +657,13 @@ pz2.prototype = var context = this; var request = new pzHttpRequest(this.pz2String, this.errorHandler); request.safeGet( - { "command": "bytarget", "session": this.sessionID }, + { + "command": "bytarget", + "session": this.sessionID, + "block": 1, + "windowid" : window.name, + "version" : this.version + }, function(data) { if ( data.getElementsByTagName("status")[0] .childNodes[0].nodeValue == "OK" ) { @@ -631,12 +676,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++; @@ -707,6 +776,7 @@ var pzHttpRequest = function ( url, errorHandler ) { } }; + pzHttpRequest.prototype = { safeGet: function ( params, callback ) @@ -805,12 +875,32 @@ pzHttpRequest.prototype = this.request.responseXML == null) { if (this.request.responseText != null) { //assume JSON - + var json = null; - if (this.JSON == null) - json = eval("(" + this.request.responseText + ")"); - else - json = JSON.parse(this.request.responseText, null); + var text = this.request.responseText; + if (typeof window.JSON == "undefined") + json = eval("(" + text + ")"); + else { + try { + json = JSON.parse(text); + } + catch (e) { + // Safari: eval will fail as well. Considering trying JSON2 (non-native implementation) instead + /* DEBUG only works in mk2-mobile + if (document.getElementById("log")) + document.getElementById("log").innerHTML = "" + e + " " + length + ": " + text; + */ + try { + json = eval("(" + text + ")"); + } + catch (e) { + /* DEBUG only works in mk2-mobile + if (document.getElementById("log")) + document.getElementById("log").innerHTML = "" + e + " " + length + ": " + text; + */ + } + } + } this.callback(json, "json"); } else { var err = new Error("XML response is empty but no error " +