X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=js%2Fpz2.js;h=d252eaaa24b75b6bb88c905d361b5b620367131e;hb=41a35ca4946b829fd190decf27de1abe1372866e;hp=31d2c338d75c66078edc76705802a960aff47e1d;hpb=c7949a6cf267d6be3e3cbaf3fb2a0815adddcd73;p=pazpar2-moved-to-github.git diff --git a/js/pz2.js b/js/pz2.js index 31d2c33..d252eaa 100644 --- a/js/pz2.js +++ b/js/pz2.js @@ -1,5 +1,20 @@ /* - * Mine + * !! WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING !! + * + * Do not edit this file. The current version of pz2.js now lives in + * its own git module ssh://git.indexdata.com/home/git/pub/pz2js and + * ALL FURTHER CHANGES SHOULD BE MADE TO THAT FILE. + * + * This copy will be removed as soon as we have good, solid Debian and + * Red Hat releases of the new independent pz2js package and have + * modified the pazpar2 packages to depend on it. + * + * !! WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING !! + */ + + +/* + * $Id$ ** pz2.js - pazpar2's javascript client library. */ @@ -29,7 +44,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'; @@ -79,6 +94,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 +107,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; @@ -122,8 +139,10 @@ var pz2 = function ( paramArray ) } // else, auto init session or wait for a user init? if (this.useSessions && paramArray.autoInit !== false) { - this.init(this.sessionId, this.serviceId); + this.init(this.sessionID, this.serviceId); } + // Version parameter + this.version = paramArray.version || null; }; pz2.prototype = @@ -158,6 +177,7 @@ pz2.prototype = this.sessionID = null; this.initStatusOK = false; this.pingStatusOK = false; + clearTimeout(this.pingTimer); } this.searchStatusOK = false; this.stop(); @@ -196,12 +216,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(); } @@ -224,19 +248,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, "windowId" : self.window.name }, + { "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,13 +299,17 @@ pz2.prototype = else var start = 0; - var searchParams = { + var searchParams = { "command": "search", "query": this.currQuery, "session": this.sessionID, - "windowId" : self.window.name + "windowid" : window.name }; + if( sort !== undefined ) { + this.currentSort = sort; + searchParams["sort"] = sort; + } if (filter !== undefined) searchParams["filter"] = filter; @@ -323,7 +355,7 @@ pz2.prototype = var context = this; var request = new pzHttpRequest(this.pz2String, this.errorHandler); request.safeGet( - { "command": "stat", "session": this.sessionID, "windowId" : self.window.name }, + { "command": "stat", "session": this.sessionID, "windowid" : window.name }, function(data) { if ( data.getElementsByTagName("stat") ) { var activeClients = @@ -353,7 +385,7 @@ pz2.prototype = } ); }, - show: function(start, num, sort) + show: function(start, num, sort, query_state) { if( !this.searchStatusOK && this.useSessions ) throw new Error( @@ -372,17 +404,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, - "windowId" : self.window.name - }, + "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; @@ -425,7 +463,15 @@ 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; @@ -456,7 +502,7 @@ pz2.prototype = "command": "record", "session": this.sessionID, "id": this.currRecID, - "windowId" : self.window.name + "windowid" : window.name }; this.currRecOffset = null; @@ -545,7 +591,9 @@ pz2.prototype = "command": "termlist", "session": this.sessionID, "name": this.termKeys, - "windowId" : self.window.name + "windowid" : window.name, + "version" : this.version + }, function(data) { if ( data.getElementsByTagName("termlist") ) { @@ -575,12 +623,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; + } } @@ -622,7 +680,13 @@ pz2.prototype = var context = this; var request = new pzHttpRequest(this.pz2String, this.errorHandler); request.safeGet( - { "command": "bytarget", "session": this.sessionID, "windowId" : self.window.name}, + { + "command": "bytarget", + "session": this.sessionID, + "block": 1, + "windowid" : window.name, + "version" : this.version + }, function(data) { if ( data.getElementsByTagName("status")[0] .childNodes[0].nodeValue == "OK" ) { @@ -635,10 +699,17 @@ 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") { @@ -653,6 +724,11 @@ pz2.prototype = } 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++; @@ -1004,35 +1080,43 @@ 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]; - if (child.nodeType == Node.ELEMENT_NODE) { + 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, get text content - if (node.hasChildNodes() && !hasChildElems) { - if (node.attributes.length) - parsed['#text'] = node.firstChild.nodeValue; - else - parsed = node.firstChild.nodeValue; - } + // if no nested elements/attrs set value to text + if (hasChildElems) + parsed['#text'] = textContent; + else + parsed = textContent; return parsed; }