X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=js%2Fpz2.js;h=3804d1ad27c7c6dc948463798099588998256917;hb=b2efe0bbbbe5aca31a268882795cd6f67c6c6012;hp=6bad626d8b03682f34e0227d6e353948ba763997;hpb=be895e49ab7887f5423529b6f11c377218f61c1a;p=pazpar2-moved-to-github.git diff --git a/js/pz2.js b/js/pz2.js index 6bad626..3804d1a 100644 --- a/js/pz2.js +++ b/js/pz2.js @@ -1,5 +1,4 @@ /* -** $Id: pz2.js,v 1.70 2008-03-12 11:36:57 jakub Exp $ ** pz2.js - pazpar2's javascript client library. */ @@ -98,6 +97,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 +106,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 @@ -237,7 +239,7 @@ pz2.prototype = } ); }, - search: function (query, num, sort, filter, showfrom) + search: function (query, num, sort, filter, showfrom, addParamsArr) { clearTimeout(this.statTimer); clearTimeout(this.showTimer); @@ -271,6 +273,14 @@ pz2.prototype = if (filter !== undefined) searchParams["filter"] = filter; + + // copy additional parmeters, do not overwrite + if (addParamsArr != undefined) { + for (var prop in addParamsArr) { + if (!searchParams.hasOwnProperty(prop)) + searchParams[prop] = addParamsArr[prop]; + } + } var context = this; var request = new pzHttpRequest(this.pz2String, this.errorHandler); @@ -313,37 +323,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 ), - "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 stat = Element_parseChildNodes(data.documentElement); + context.statCounter++; var delay = context.statTime + context.statCounter * context.dumpFactor; @@ -482,7 +464,7 @@ pz2.prototype = recordParams, function(data) { var recordNode; - var record; + var record; //raw record if (context.currRecOffset !== null) { record = new Array(); @@ -503,7 +485,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 @@ -753,7 +749,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); }, @@ -766,28 +762,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; @@ -797,13 +785,23 @@ 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) { + 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);