X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=js%2Fpz2.js;h=4ff579842899f5d4224e3799211850973afbffe3;hb=0bb0ee0e00d750808e228b991c78cb4838bc989d;hp=1471a5e00c77c18d4258da4a8cb1894b8caf1693;hpb=b40bdb2f4a3793471b478da5a691261d197cfcd4;p=pazpar2-moved-to-github.git diff --git a/js/pz2.js b/js/pz2.js index 1471a5e..4ff5798 100644 --- a/js/pz2.js +++ b/js/pz2.js @@ -69,6 +69,7 @@ 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; @@ -78,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 @@ -90,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; @@ -121,8 +124,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 = @@ -157,6 +162,7 @@ pz2.prototype = this.sessionID = null; this.initStatusOK = false; this.pingStatusOK = false; + clearTimeout(this.pingTimer); } this.searchStatusOK = false; this.stop(); @@ -165,12 +171,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(); @@ -178,8 +184,10 @@ pz2.prototype = } else if (this.useSessions) { var context = this; var request = new pzHttpRequest(this.pz2String, this.errorHandler); + var opts = {'command' : 'init'}; + if (serviceId) opts.service = serviceId; request.safeGet( - { "command": "init" }, + opts, function(data) { if ( data.getElementsByTagName("status")[0] .childNodes[0].nodeValue == "OK" ) { @@ -193,12 +201,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(); } @@ -221,19 +233,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.', @@ -269,13 +285,18 @@ 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( sort !== undefined ) { + this.currentSort = sort; + searchParams["sort"] = sort; + } if (filter !== undefined) - searchParams["filter"] = filter; + searchParams["filter"] = filter; // copy additional parmeters, do not overwrite if (addParamsArr != undefined) { @@ -319,7 +340,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 = @@ -349,7 +370,7 @@ pz2.prototype = } ); }, - show: function(start, num, sort) + show: function(start, num, sort, query_state) { if( !this.searchStatusOK && this.useSessions ) throw new Error( @@ -368,22 +389,30 @@ 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 - }, - function(data, type) { + "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 = {}; - context.activeClients = Number(data.activeclients[0]); - show.activeclients = context.activeclients; + 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]); @@ -393,10 +422,9 @@ pz2.prototype = .childNodes[0].nodeValue == "OK") { // first parse the status data send along with records // this is strictly bound to the format - var activeClients = + activeClients = Number(data.getElementsByTagName("activeclients")[0] .childNodes[0].nodeValue); - context.activeClients = activeClients; show = { "activeclients": activeClients, "merged": @@ -412,7 +440,7 @@ pz2.prototype = Number( data.getElementsByTagName("num")[0] .childNodes[0].nodeValue ), "hits": [] - }; + }; // parse all the first-level nodes for all tags var hits = data.getElementsByTagName("hit"); for (i = 0; i < hits.length; i++) @@ -420,7 +448,16 @@ pz2.prototype = } 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); + + + data.getElementsByTagName("") + context.activeClients = activeClients; context.showCounter++; var delay = context.showTime; if (context.showCounter > context.showFastCount) @@ -431,7 +468,6 @@ pz2.prototype = context.show(); }, delay); - global_show = show; context.showCallback(show); } ); @@ -450,7 +486,8 @@ pz2.prototype = var recordParams = { "command": "record", "session": this.sessionID, - "id": this.currRecID + "id": this.currRecID, + "windowid" : window.name }; this.currRecOffset = null; @@ -538,7 +575,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") ) { @@ -568,12 +608,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; + } } @@ -615,7 +665,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" ) { @@ -628,12 +684,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++; @@ -704,6 +784,7 @@ var pzHttpRequest = function ( url, errorHandler ) { } }; + pzHttpRequest.prototype = { safeGet: function ( params, callback ) @@ -802,8 +883,33 @@ pzHttpRequest.prototype = this.request.responseXML == null) { if (this.request.responseText != null) { //assume JSON - var json = eval("(" + this.request.responseText + ")"); - this.callback(json, "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) { + // 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 " + "for " + savedUrlForErrorReporting);