X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=js%2Fpz2.js;h=59c501d9021eafa19cbef25e37eee7614fcb58b3;hb=ae79789f61623d9a3e5a62a4321f6107f416c845;hp=581b77e66d6bdd6274730224d395fc6bc8519300;hpb=0ff1a97b2a69905755b9adb24a474d30f1c52150;p=pazpar2-moved-to-github.git diff --git a/js/pz2.js b/js/pz2.js index 581b77e..59c501d 100644 --- a/js/pz2.js +++ b/js/pz2.js @@ -1,5 +1,5 @@ /* -** $Id: pz2.js,v 1.56 2007-09-12 08:57:14 jakub Exp $ + * $Id$ ** pz2.js - pazpar2's javascript client library. */ @@ -29,197 +29,256 @@ var pz2 = function ( paramArray ) // at least one callback required if ( !paramArray ) - throw new Error("Pz2.js: An array with parameters has to be suplied when instantiating a class"); - - //for convenience - __myself = this; + throw new Error("Pz2.js: Array with parameters has to be supplied."); //supported pazpar2's protocol version - __myself.suppProtoVer = '1'; + this.windowid = paramArray.windowid || window.name; + this.suppProtoVer = '1'; if (typeof paramArray.pazpar2path != "undefined") - __myself.pz2String = paramArray.pazpar2path; + this.pz2String = paramArray.pazpar2path; else - __myself.pz2String = "/pazpar2/search.pz2"; - __myself.useSessions = true; + this.pz2String = "/pazpar2/search.pz2"; + this.useSessions = true; - __myself.stylesheet = paramArray.detailstylesheet || null; + this.stylesheet = paramArray.detailstylesheet || null; //load stylesheet if required in async mode - if( __myself.stylesheet ) { - var request = new pzHttpRequest( __myself.stylesheet ); - request.get( {}, function ( doc ) { __myself.xslDoc = doc; } ); + if( this.stylesheet ) { + var context = this; + var request = new pzHttpRequest( this.stylesheet ); + request.get( {}, function ( doc ) { context.xslDoc = doc; } ); } - __myself.errorHandler = paramArray.errorhandler || null; + this.errorHandler = paramArray.errorhandler || null; + this.showResponseType = paramArray.showResponseType || "xml"; // function callbacks - __myself.statCallback = paramArray.onstat || null; - __myself.showCallback = paramArray.onshow || null; - __myself.termlistCallback = paramArray.onterm || null; - __myself.recordCallback = paramArray.onrecord || null; - __myself.bytargetCallback = paramArray.onbytarget || null; - __myself.resetCallback = paramArray.onreset || null; + this.initCallback = paramArray.oninit || null; + this.statCallback = paramArray.onstat || null; + this.showCallback = paramArray.onshow || null; + this.termlistCallback = paramArray.onterm || null; + this.recordCallback = paramArray.onrecord || null; + this.bytargetCallback = paramArray.onbytarget || null; + this.resetCallback = paramArray.onreset || null; // termlist keys - __myself.termKeys = paramArray.termlist || "subject"; + this.termKeys = paramArray.termlist || "subject"; // some configurational stuff - __myself.keepAlive = 50000; + this.keepAlive = 50000; - if ( paramArray.keepAlive < __myself.keepAlive ) - __myself.keepAlive = paramArray.keepAlive; - - __myself.sessionID = null; - __myself.initStatusOK = false; - __myself.pingStatusOK = false; - __myself.searchStatusOK = false; + if ( paramArray.keepAlive < this.keepAlive ) + 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 - __myself.currentSort = "relevance"; + this.currentSort = "relevance"; // where are we? - __myself.currentStart = 0; - __myself.currentNum = 20; + this.currentStart = 0; + // currentNum can be overwritten in show + this.currentNum = 20; // last full record retrieved - __myself.currRecID = null; + this.currRecID = null; // current query - __myself.currQuery = null; + this.currQuery = null; + + //current raw record offset + this.currRecOffset = null; //timers - __myself.statTime = paramArray.stattime || 1000; - __myself.statTimer = null; - __myself.termTime = paramArray.termtime || 1000; - __myself.termTimer = null; - __myself.showTime = paramArray.showtime || 1000; - __myself.showTimer = null; - __myself.showFastCount = 4; - __myself.bytargetTime = paramArray.bytargettime || 1000; - __myself.bytargetTimer = null; + this.pingTimer = null; + this.statTime = paramArray.stattime || 1000; + this.statTimer = null; + this.termTime = paramArray.termtime || 1000; + this.termTimer = null; + this.showTime = paramArray.showtime || 1000; + this.showTimer = null; + 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 - __myself.dumpFactor = 500; - __myself.showCounter = 0; - __myself.termCounter = 0; - __myself.statCounter = 0; - __myself.bytargetCounter = 0; + this.dumpFactor = 500; + this.showCounter = 0; + 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 - __myself.activeClients = 1; + this.activeClients = 1; // if in proxy mode no need to init if (paramArray.usesessions != undefined) { - __myself.useSessions = paramArray.usesessions; - __myself.initStatusOK = true; + this.useSessions = paramArray.usesessions; + this.initStatusOK = true; } // else, auto init session or wait for a user init? - if (__myself.useSessions && paramArray.autoInit !== false) { - __myself.init(); + if (this.useSessions && paramArray.autoInit !== false) { + this.init(this.sessionID, this.serviceId); } + // Version parameter + this.version = paramArray.version || null; }; pz2.prototype = { + //error handler for async error throws + throwError: function (errMsg, errCode) + { + var err = new Error(errMsg); + if (errCode) err.code = errCode; + + if (this.errorHandler) { + this.errorHandler(err); + } + else { + throw err; + } + }, + // stop activity by clearing tiemouts stop: function () { - clearTimeout(__myself.statTimer); - clearTimeout(__myself.showTimer); - clearTimeout(__myself.termTimer); - clearTimeout(__myself.bytargetTimer); + clearTimeout(this.statTimer); + clearTimeout(this.showTimer); + clearTimeout(this.termTimer); + clearTimeout(this.bytargetTimer); }, // reset status variables reset: function () { - if ( __myself.useSessions ) { - __myself.sessionID = null; - __myself.initStatusOK = false; - __myself.pingStatusOK = false; + if ( this.useSessions ) { + this.sessionID = null; + this.initStatusOK = false; + this.pingStatusOK = false; + clearTimeout(this.pingTimer); } - __myself.searchStatusOK = false; - __myself.stop(); + this.searchStatusOK = false; + this.stop(); - if ( __myself.resetCallback ) - __myself.resetCallback(); + if ( this.resetCallback ) + this.resetCallback(this.windowid); }, - init: function ( sessionId ) + init: function (sessionId, serviceId) { - __myself.reset(); + this.reset(); // session id as a param - if ( sessionId != undefined && __myself.useSessions ) { - __myself.initStatusOK = true; - __myself.sessionID = sessionId; - __myself.ping(); + if (sessionId && this.useSessions ) { + this.initStatusOK = true; + this.sessionID = sessionId; + this.ping(); // old school direct pazpar2 init - } else if (__myself.useSessions) { - var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler); - request.get( - { "command": "init" }, + } 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( + opts, function(data) { - if ( data.getElementsByTagName("status")[0].childNodes[0].nodeValue == "OK" ) { - if ( data.getElementsByTagName("protocol")[0].childNodes[0].nodeValue - != __myself.suppProtoVer ) - throw new Error("Server's protocol not supported by the client"); - __myself.initStatusOK = true; - __myself.sessionID = data.getElementsByTagName("session")[0].childNodes[0].nodeValue; - setTimeout("__myself.ping()", __myself.keepAlive); + if ( data.getElementsByTagName("status")[0] + .childNodes[0].nodeValue == "OK" ) { + if ( data.getElementsByTagName("protocol")[0] + .childNodes[0].nodeValue + != context.suppProtoVer ) + throw new Error( + "Server's protocol not supported by the client" + ); + context.initStatusOK = true; + context.sessionID = + data.getElementsByTagName("session")[0] + .childNodes[0].nodeValue; + 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(context.windowid); } else - // if it gets here the http return code was 200 (pz2 errors are 417) - // but the response was invalid, it should never occur - setTimeout("__myself.init()", 1000); + context.throwError('Init failed. Malformed WS resonse.', + 110); } ); // when through proxy no need to init } else { - __myself.initStatusOK = true; + this.initStatusOK = true; } }, // no need to ping explicitly ping: function () { // pinging only makes sense when using pazpar2 directly - if( !__myself.initStatusOK || !__myself.useSessions ) - throw new Error('Pz2.js: Ping not allowed (proxy mode) or session not initialized.'); - // session is not initialized code here - - var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler); - request.get( - { "command": "ping", "session": __myself.sessionID }, + if( !this.initStatusOK || !this.useSessions ) + throw new Error( + '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" : context.windowid }, function(data) { - if ( data.getElementsByTagName("status")[0].childNodes[0].nodeValue == "OK" ) { - __myself.pingStatusOK = true; - setTimeout("__myself.ping()", __myself.keepAlive); + if ( data.getElementsByTagName("status")[0] + .childNodes[0].nodeValue == "OK" ) { + context.pingStatusOK = true; + context.pingTimer = + setTimeout( + function () { + context.ping(); + }, + context.keepAlive + ); } else - // if it gets here the http return code was 200 (pz2 errors are 417) - // but the response was invalid, it should never occur - setTimeout("__myself.ping()", 1000); + context.throwError('Ping failed. Malformed WS resonse.', + 111); } ); }, - search: function (query, num, sort, filter, showfrom) + search: function (query, num, sort, filter, showfrom, addParamsArr) { - clearTimeout(__myself.statTimer); - clearTimeout(__myself.showTimer); - clearTimeout(__myself.termTimer); - clearTimeout(__myself.bytargetTimer); + clearTimeout(this.statTimer); + clearTimeout(this.showTimer); + clearTimeout(this.termTimer); + clearTimeout(this.bytargetTimer); - __myself.showCounter = 0; - __myself.termCounter = 0; - __myself.bytargetCounter = 0; - __myself.statCounter = 0; + this.showCounter = 0; + this.termCounter = 0; + this.bytargetCounter = 0; + this.statCounter = 0; + this.activeClients = 1; // no proxy mode - if( !__myself.initStatusOK ) + if( !this.initStatusOK ) throw new Error('Pz2.js: session not initialized.'); if( query !== undefined ) - __myself.currQuery = query; + this.currQuery = query; else throw new Error("Pz2.js: no query supplied to the search command."); @@ -228,263 +287,309 @@ pz2.prototype = else var start = 0; - var searchParams = { "command": "search", "query": __myself.currQuery, "session": __myself.sessionID }; + var searchParams = { + "command": "search", + "query": this.currQuery, + "session": this.sessionID, + "windowid" : this.windowid + }; - 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 request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler); - request.get( + var context = this; + var request = new pzHttpRequest(this.pz2String, this.errorHandler); + request.safeGet( searchParams, function(data) { - if ( data.getElementsByTagName("status")[0].childNodes[0].nodeValue == "OK" ) { - __myself.searchStatusOK = true; + if ( data.getElementsByTagName("status")[0] + .childNodes[0].nodeValue == "OK" ) { + context.searchStatusOK = true; //piggyback search - __myself.show(start, num, sort); - if ( __myself.statCallback ) - __myself.stat(); - //__myself.statTimer = setTimeout("__myself.stat()", __myself.statTime / 4); - if ( __myself.termlistCallback ) - __myself.termlist(); - //__myself.termTimer = setTimeout("__myself.termlist()", __myself.termTime / 4); - if ( __myself.bytargetCallback ) - __myself.bytarget(); - //__myself.bytargetTimer = setTimeout("__myself.bytarget()", __myself.bytargetTime / 4); + context.show(start, num, sort); + if (context.statCallback) + context.stat(); + if (context.termlistCallback) + context.termlist(); + if (context.bytargetCallback) + context.bytarget(); } else - // if it gets here the http return code was 200 (pz2 errors are 417) - // but the response was invalid, it should never occur - setTimeout("__myself.search(__myself.currQuery)", 500); + context.throwError('Search failed. Malformed WS resonse.', + 112); } ); }, stat: function() { - if( !__myself.initStatusOK ) + if( !this.initStatusOK ) throw new Error('Pz2.js: session not initialized.'); // if called explicitly takes precedence - clearTimeout(__myself.statTimer); + clearTimeout(this.statTimer); - var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler); - request.get( - { "command": "stat", "session": __myself.sessionID }, + var context = this; + var request = new pzHttpRequest(this.pz2String, this.errorHandler); + request.safeGet( + { "command": "stat", "session": this.sessionID, "windowid" : context.windowid }, function(data) { if ( data.getElementsByTagName("stat") ) { - var activeClients = Number( data.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue ); - __myself.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 activeClients = + Number( data.getElementsByTagName("activeclients")[0] + .childNodes[0].nodeValue ); + context.activeClients = activeClients; + + var stat = Element_parseChildNodes(data.documentElement); + + context.statCounter++; + var delay = context.statTime + + context.statCounter * context.dumpFactor; - __myself.statCounter++; - var delay = __myself.statTime + __myself.statCounter * __myself.dumpFactor; if ( activeClients > 0 ) - __myself.statTimer = setTimeout("__myself.stat()", delay); - __myself.statCallback(stat); + context.statTimer = + setTimeout( + function () { + context.stat(); + }, + delay + ); + context.statCallback(stat, context.windowid); } else - // if it gets here the http return code was 200 (pz2 errors are 417) - // but the response was invalid, it should never occur - __myself.statTimer = setTimeout("__myself.stat()", __myself.statTime / 4); + context.throwError('Stat failed. Malformed WS resonse.', + 113); } ); }, - show: function(start, num, sort) + show: function(start, num, sort, query_state) { - if( !__myself.searchStatusOK && __myself.useSessions ) - throw new Error('Pz2.js: show command has to be preceded with a search command.'); + if( !this.searchStatusOK && this.useSessions ) + throw new Error( + 'Pz2.js: show command has to be preceded with a search command.' + ); // if called explicitly takes precedence - clearTimeout(__myself.showTimer); + clearTimeout(this.showTimer); if( sort !== undefined ) - __myself.currentSort = sort; + this.currentSort = sort; if( start !== undefined ) - __myself.currentStart = Number( start ); + this.currentStart = Number( start ); if( num !== undefined ) - __myself.currentNum = Number( num ); + this.currentNum = Number( num ); - var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler); var context = this; - request.get( - { "command": "show", "session": __myself.sessionID, "start": __myself.currentStart, - "num": __myself.currentNum, "sort": __myself.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 ); - __myself.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 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(); - for ( j = 0; j < hits[i].childNodes.length; j++) { - var locCount = 0; - 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'][id] = { - "id": locNode.getAttribute("id"), - "name": locNode.getAttribute("name") - }; - } - 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; - } - } - } - } - __myself.showCounter++; - var delay = __myself.showTime; - if (__myself.showCounter > __myself.showFastCount) - delay += __myself.showCounter * __myself.dumpFactor; - if ( activeClients > 0 ) - __myself.showTimer = setTimeout("__myself.show()", delay); - - __myself.showCallback(show); - } - else - // if it gets here the http return code was 200 (pz2 errors are 417) - // but the response was invalid, it should never occur - __myself.showTimer = setTimeout("__myself.show()", __myself.showTime / 4); - } + var request = new pzHttpRequest(this.pz2String, this.errorHandler); + var requestParameters = + { + "command": "show", + "session": this.sessionID, + "start": this.currentStart, + "num": this.currentNum, + "sort": this.currentSort, + "block": 1, + "type": this.showResponseType, + "windowid" : this.windowid + }; + 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 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); + + + 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, context.windowid); + } ); }, - record: function(id, offset, params) + record: function(id, offset, syntax, handler) { // we may call record with no previous search if in proxy mode - if( !__myself.searchStatusOK && __myself.useSessions) - throw new Error('Pz2.js: record command has to be preceded with a search command.'); - - if ( params == undefined ) - params = {}; - - if ( params.callback != undefined ) { - callback = params.callback; - } else { - callback = __myself.recordCallback; - } + if(!this.searchStatusOK && this.useSessions) + throw new Error( + 'Pz2.js: record command has to be preceded with a search command.' + ); - // what is that? - if ( params['handle'] == undefined ) - handle = {}; - else - handle = params['handle']; - if( id !== undefined ) - __myself.currRecID = id; + this.currRecID = id; - var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler); - - var recordParams = { "command": "record", - "session": __myself.sessionID, - "id": __myself.currRecID }; + var recordParams = { + "command": "record", + "session": this.sessionID, + "id": this.currRecID, + "windowid" : this.windowid + }; - if (offset !== undefined) { + this.currRecOffset = null; + if (offset != undefined) { recordParams["offset"] = offset; - } - - if (params.syntax != undefined) { - recordParams['syntax'] = params.syntax; + this.currRecOffset = offset; } - __myself.currRecOffset = offset; + if (syntax != undefined) + recordParams['syntax'] = syntax; - request.get( + //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.safeGet( recordParams, function(data) { var recordNode; - var record = new Array(); - record['xmlDoc'] = data; - if (__myself.currRecOffset !== undefined) { - record['offset'] = __myself.currRecOffset; - callback(record, handle); - } else if ( recordNode = data.getElementsByTagName("record")[0] ) { + var record; + //raw record + if (context.currRecOffset !== null) { + record = new Array(); + record['xmlDoc'] = data; + record['offset'] = context.currRecOffset; + callback(record, args, context.windowid); + //pz2 record + } else if ( recordNode = + data.getElementsByTagName("record")[0] ) { // if stylesheet was fetched do not parse the response - if ( __myself.xslDoc ) { - record['recid'] = recordNode.getElementsByTagName("recid")[0].firstChild.nodeValue; - record['xslDoc'] = __myself.xslDoc; + if ( context.xslDoc ) { + record = new Array(); + record['xmlDoc'] = data; + record['xslDoc'] = context.xslDoc; + record['recid'] = + recordNode.getElementsByTagName("recid")[0] + .firstChild.nodeValue; + //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 = 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; - 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, context.windowid); } else - // if it gets here the http return code was 200 (pz2 errors are 417) - // but the response was invalid, it should never occur - setTimeout("__myself.record(__myself.currRecID)", 500); + context.throwError('Record failed. Malformed WS resonse.', + 115); } ); }, termlist: function() { - if( !__myself.searchStatusOK && __myself.useSessions ) - throw new Error('Pz2.js: termlist command has to be preceded with a search command.'); + if( !this.searchStatusOK && this.useSessions ) + throw new Error( + 'Pz2.js: termlist command has to be preceded with a search command.' + ); // if called explicitly takes precedence - clearTimeout(__myself.termTimer); + clearTimeout(this.termTimer); - var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler); - request.get( - { "command": "termlist", "session": __myself.sessionID, "name": __myself.termKeys }, + var context = this; + var request = new pzHttpRequest(this.pz2String, this.errorHandler); + request.safeGet( + { + "command": "termlist", + "session": this.sessionID, + "name": this.termKeys, + "windowid" : this.windowid, + "version" : this.version + + }, function(data) { if ( data.getElementsByTagName("termlist") ) { - var activeClients = Number( data.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue ); - __myself.activeClients = activeClients; + var activeClients = + Number( data.getElementsByTagName("activeclients")[0] + .childNodes[0].nodeValue ); + context.activeClients = activeClients; var termList = { "activeclients": activeClients }; var termLists = data.getElementsByTagName("list"); //for each termlist @@ -495,76 +600,143 @@ pz2.prototype = //for each term in the list for (j = 0; j < terms.length; j++) { var term = { - "name": (terms[j].getElementsByTagName("name")[0].childNodes.length - ? terms[j].getElementsByTagName("name")[0].childNodes[0].nodeValue - : 'ERROR'), - "freq": terms[j].getElementsByTagName("frequency")[0].childNodes[0].nodeValue || 'ERROR' + "name": + (terms[j].getElementsByTagName("name")[0] + .childNodes.length + ? terms[j].getElementsByTagName("name")[0] + .childNodes[0].nodeValue + : 'ERROR'), + "freq": + terms[j] + .getElementsByTagName("frequency")[0] + .childNodes[0].nodeValue || 'ERROR' }; - var termIdNode = terms[j].getElementsByTagName("id"); + // 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; - + 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; + } } - __myself.termCounter++; - var delay = __myself.termTime + __myself.termCounter * __myself.dumpFactor; + context.termCounter++; + var delay = context.termTime + + context.termCounter * context.dumpFactor; if ( activeClients > 0 ) - __myself.termTimer = setTimeout("__myself.termlist()", delay); + context.termTimer = + setTimeout( + function () { + context.termlist(); + }, + delay + ); - __myself.termlistCallback(termList); + context.termlistCallback(termList, context.windowid); } else - // if it gets here the http return code was 200 (pz2 errors are 417) - // but the response was invalid, it should never occur - __myself.termTimer = setTimeout("__myself.termlist()", __myself.termTime / 4); + context.throwError('Termlist failed. Malformed WS resonse.', + 116); } ); }, bytarget: function() { - if( !__myself.initStatusOK && __myself.useSessions ) - throw new Error('Pz2.js: bytarget command has to be preceded with a search command.'); + if( !this.initStatusOK && this.useSessions ) + throw new Error( + 'Pz2.js: bytarget command has to be preceded with a search command.' + ); // no need to continue - if( !__myself.searchStatusOK ) + if( !this.searchStatusOK ) return; // if called explicitly takes precedence - clearTimeout(__myself.bytargetTimer); + clearTimeout(this.bytargetTimer); - var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler); - request.get( - { "command": "bytarget", "session": __myself.sessionID }, + var context = this; + var request = new pzHttpRequest(this.pz2String, this.errorHandler); + request.safeGet( + { + "command": "bytarget", + "session": this.sessionID, + "block": 1, + "windowid" : this.windowid, + "version" : this.version + }, function(data) { - if ( data.getElementsByTagName("status")[0].childNodes[0].nodeValue == "OK" ) { + if ( data.getElementsByTagName("status")[0] + .childNodes[0].nodeValue == "OK" ) { var targetNodes = data.getElementsByTagName("target"); var bytarget = new Array(); for ( i = 0; i < targetNodes.length; i++) { bytarget[i] = new Array(); for( j = 0; j < targetNodes[i].childNodes.length; j++ ) { - if ( targetNodes[i].childNodes[j].nodeType == 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].nodeType + == Node.ELEMENT_NODE ) { + var nodeName = + targetNodes[i].childNodes[j].nodeName; + 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); + } } - __myself.bytargetCounter++; - var delay = __myself.bytargetTime + __myself.bytargetCounter * __myself.dumpFactor; - if ( __myself.activeClients > 0 ) - __myself.bytargetTimer = setTimeout("__myself.bytarget()", delay); - - __myself.bytargetCallback(bytarget); + context.bytargetCounter++; + var delay = context.bytargetTime + + context.bytargetCounter * context.dumpFactor; + if ( context.activeClients > 0 ) + context.bytargetTimer = + setTimeout( + function () { + context.bytarget(); + }, + delay + ); + + context.bytargetCallback(bytarget, context.windowid); } else - // if it gets here the http return code was 200 (pz2 errors are 417) - // but the response was invalid, it should never occur - __myself.bytargetTimer = setTimeout("__myself.bytarget()", __myself.bytargetTime / 4); + context.throwError('Bytarget failed. Malformed WS resonse.', + 117); } ); }, @@ -573,57 +745,82 @@ pz2.prototype = showNext: function(page) { var step = page || 1; - __myself.show( ( step * __myself.currentNum ) + __myself.currentStart ); + this.show( ( step * this.currentNum ) + this.currentStart ); }, showPrev: function(page) { - if (__myself.currentStart == 0 ) + if (this.currentStart == 0 ) return false; var step = page || 1; - var newStart = __myself.currentStart - (step * __myself.currentNum ); - __myself.show( newStart > 0 ? newStart : 0 ); + var newStart = this.currentStart - (step * this.currentNum ); + this.show( newStart > 0 ? newStart : 0 ); }, showPage: function(pageNum) { //var page = pageNum || 1; - __myself.show(pageNum * __myself.currentNum); + this.show(pageNum * this.currentNum); } }; /* -********************************************************************************* -** AJAX HELPER CLASS ************************************************************ -********************************************************************************* +******************************************************************************** +** 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 () @@ -635,45 +832,153 @@ 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 + '=' + escape(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 ) { - var 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"); - - var err = new Error(errMsg + ': ' + errAddInfo); + // 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 (errNode.childNodes.length) + errAddInfo = ': ' + errNode.childNodes[0].nodeValue; + + var err = new Error(errMsg + errAddInfo); err.code = errCode; if (this.errorHandler) { @@ -682,14 +987,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); } @@ -702,9 +1040,9 @@ pzHttpRequest.prototype = }; /* -********************************************************************************* -** XML HELPER CLASS ************************************************************ -********************************************************************************* +******************************************************************************** +** XML HELPER FUNCTIONS ******************************************************** +******************************************************************************** */ // DOMDocument @@ -749,6 +1087,19 @@ DOMDoc.parseXmlFromString = function ( xmlString ) return doc; } +DOMDoc.transformToDoc = function (xmlDoc, xslDoc) +{ + if ( window.XSLTProcessor ) { + var proc = new XSLTProcessor(); + proc.importStylesheet( xslDoc ); + return proc.transformToDocument(xmlDoc); + } else if ( window.ActiveXObject ) { + return document.parseXmlFromString(xmlDoc.transformNode(xslDoc)); + } else { + alert( 'Unable to perform XSLT transformation in this browser' ); + } +} + // DOMElement Element_removeFromDoc = function (DOM_Element) @@ -811,190 +1162,50 @@ Element_getTextContent = function (DOM_Element) } } -/* -********************************************************************************* -** QUERY CLASS ****************************************************************** -********************************************************************************* -*/ - -var pzFilter = function() +Element_parseChildNodes = function (node) { - this.filterHash = new Array(); - this.filterNums = 0; -}; - -pzFilter.prototype = -{ - addFilter: function(name, value) - { - var filter = {"name": name, "id": value }; - this.filterHash[this.filterHash.length] = filter; - this.filterNums++ - return this.filterHash.length - 1; - }, - - setFilter: function(name, value) - { - this.filterHash = new Array(); - this.filterNums = 0; - this.addFilter(name, value); - }, - - getFilter: function(index) - { - return this.filterHash[index].id; - }, - - getFilterName: function(index) - { - return this.filterHash[index].name; - }, - - removeFilter: function(index) - { - delete this.filterHash[index]; - this.filterNums--; - }, - - clearFilter: function() - { - this.filterHash = new Array(); - this.filterNums = 0; - }, - - getFilterString: function() - { - if( this.filterNums <= 0 ) { - return undefined; - } - - var filter = 'pz:id='; - for(var i = 0; i < this.filterHash.length; i++) - { - if (this.filterHash[i] == undefined) continue; - if (filter > 'pz:id=') filter = filter + '|'; - filter += this.filterHash[i].id; + 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; + } } - return filter; } -}; -var mkState = function() -{ - this.sort = 'relevance'; - this.perPage = 20; - this.page = 0; - this.simpleQuery = ''; - this.singleFilter = null; - this.advTerms = new Array(); - this.numTerms = 0; - this.action = ''; -}; + 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; + } -mkState.prototype = -{ - reset: function() - { - this.simpleQuery = ''; - this.advTerms = new Array(); - this.simpleFilter = null; - this.numTerms = 0; - }, - - clearSimpleQuery: function() - { - this.simpleQuery = ''; - }, - - addTerm: function(field, value) - { - var term = {"field": field, "value": value}; - this.advTerms[this.numTerms] = term; - this.numTerms++; - }, - - getTermValueByIdx: function(index) - { - return this.advTerms[index].value; - }, - - getTermFieldByIdx: function(index) - { - return this.advTerms[index].field; - }, - - /* semicolon separated list of terms for given field*/ - getTermsByField: function(field) - { - var terms = ''; - for(var i = 0; i < this.advTerms.length; i++) - { - if( this.advTerms[i].field == field ) - terms = terms + this.queryHas[i].value + ';'; - } - return terms; - }, - - addTermsFromList: function(inputString, field) - { - var inputArr = inputString.split(';'); - for(var i=0; i < inputArr.length; i++) - { - if(inputArr[i].length < 3) continue; - this.advTerms[this.numTerms] - = {"field": field, "value": inputArr[i] }; - this.numTerms++; - } - }, - - removeTermByIdx: function(index) - { - this.advTerms.splice(index, 1); - this.numTerms--; - }, - - toCCL: function() - { - var ccl = ''; - if( this.simpleQuery != '') - ccl = this.simpleQuery; - for(var i = 0; i < this.advTerms.length; i++) - { - if (ccl != '') ccl = ccl + ' and '; - ccl = ccl + this.advTerms[i].field - +'="'+this.advTerms[i].value+'"'; - } - return ccl; - }, - - totalLength: function() - { - var simpleLength = this.simpleQuery != '' ? 1 : 0; - return this.advTerms.length + simpleLength; - }, - - clearSingleFilter: function() - { - this.singleFilter = null; - }, - - setSingleFilter: function(name, value) - { - this.singleFilter = {"name": name, "id": value }; - }, + // if no nested elements/attrs set value to text + if (hasChildElems) + parsed['#text'] = textContent; + else + parsed = textContent; - getSingleFilterName: function() - { - return this.singleFilter.name; - }, + return parsed; +} - getSingleFilterString: function() - { - if( this.singleFilter != null ) { - return 'pz:id='+this.singleFilter.id; - } else { - return undefined; - } - } -}; +/* do not remove trailing bracket */ }