X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=js%2Fpz2.js;h=58cf4a3505960fdfc37aaa6059f1c98f2a6958a0;hb=33c32a8d851124919232f87dbce1796805737a3f;hp=09dbf32a0d4ffd58f4a324a48130f80f33334879;hpb=004ba7a58c8abaebefa2bc9fe225fa17380d2924;p=pazpar2-moved-to-github.git diff --git a/js/pz2.js b/js/pz2.js index 09dbf32..58cf4a3 100644 --- a/js/pz2.js +++ b/js/pz2.js @@ -1,5 +1,5 @@ /* -** $Id: pz2.js,v 1.70 2008-03-12 11:36:57 jakub Exp $ + * Mine ** pz2.js - pazpar2's javascript client library. */ @@ -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,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; @@ -98,6 +100,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; @@ -105,6 +109,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 @@ -117,7 +122,7 @@ 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); } }; @@ -161,12 +166,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(); @@ -174,8 +179,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" ) { @@ -248,6 +255,7 @@ pz2.prototype = this.termCounter = 0; this.bytargetCounter = 0; this.statCounter = 0; + this.activeClients = 1; // no proxy mode if( !this.initStatusOK ) @@ -290,11 +298,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 @@ -321,37 +329,9 @@ pz2.prototype = 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 ), - "unconnected": - Number( data.getElementsByTagName("unconnected")[0] - .childNodes[0].nodeValue ), - "connecting": - Number( data.getElementsByTagName("connecting")[0] - .childNodes[0].nodeValue ), - "working": - Number( data.getElementsByTagName("working")[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; @@ -392,61 +372,71 @@ pz2.prototype = var context = this; var request = new pzHttpRequest(this.pz2String, this.errorHandler); request.safeGet( - { - "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 tags - var hits = data.getElementsByTagName("hit"); - for (i = 0; i < hits.length; i++) - show.hits[i] = Element_parseChildNodes(hits[i]); - - 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); - global_show = show; - context.showCallback(show); - } - else - context.throwError('Show failed. Malformed WS resonse.', - 114); + { + "command": "show", + "session": this.sessionID, + "start": this.currentStart, + "num": this.currentNum, + "sort": this.currentSort, + "block": 1, + "type": this.showResponseType + }, + 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); } + 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, syntax, handler) @@ -490,7 +480,7 @@ pz2.prototype = recordParams, function(data) { var recordNode; - var record; + var record; //raw record if (context.currRecOffset !== null) { record = new Array(); @@ -511,7 +501,21 @@ pz2.prototype = //parse record } else { 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 @@ -761,7 +765,7 @@ pzHttpRequest.prototype = for (var key in this.requestHeaders) this.request.setRequestHeader(key, this.requestHeaders[key]); this.request.onreadystatechange = function () { - context._handleResponse(); + context._handleResponse(url); /// url used ONLY for error reporting } this.request.send(data); }, @@ -774,28 +778,20 @@ pzHttpRequest.prototype = return this.url; }, - _handleResponse: function () + _handleResponse: function (savedUrlForErrorReporting) { 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; + 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; @@ -805,14 +801,29 @@ 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 = eval("(" + this.request.responseText + ")"); + this.callback(json, "json"); + } else { + var err = new Error("XML response is empty but no error " + + "for " + savedUrlForErrorReporting); + err.code = -1; + if (this.errorHandler) { + this.errorHandler(err); + } else { + throw err; + } + } + } else if (this.request.status == 200) { + 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); } @@ -976,7 +987,7 @@ Element_parseChildNodes = function (node) // if no nested elements, get text content if (node.hasChildNodes() && !hasChildElems) { if (node.attributes.length) - parsed['textContent'] = node.firstChild.nodeValue; + parsed['#text'] = node.firstChild.nodeValue; else parsed = node.firstChild.nodeValue; }