this.keepAlive = paramArray.keepAlive;
this.sessionID = null;
+ this.serviceId = paramArray.serviceId || null;
this.initStatusOK = false;
this.pingStatusOK = false;
this.searchStatusOK = false;
}
// else, auto init session or wait for a user init?
if (this.useSessions && paramArray.autoInit !== false) {
- this.init();
+ this.init(this.sessionId, this.serviceId);
}
};
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();
} 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" ) {
var context = this;
var request = new pzHttpRequest(this.pz2String, this.errorHandler);
request.safeGet(
- { "command": "ping", "session": this.sessionID },
+ { "command": "ping", "session": this.sessionID, "windowId" : self.window.name },
function(data) {
if ( data.getElementsByTagName("status")[0]
.childNodes[0].nodeValue == "OK" ) {
else
var start = 0;
- var searchParams = {
- "command": "search",
- "query": this.currQuery,
- "session": this.sessionID
+ var searchParams = {
+ "command": "search",
+ "query": this.currQuery,
+ "session": this.sessionID,
+ "windowId" : self.window.name
};
if (filter !== undefined)
- searchParams["filter"] = filter;
+ searchParams["filter"] = filter;
// copy additional parmeters, do not overwrite
if (addParamsArr != undefined) {
var context = this;
var request = new pzHttpRequest(this.pz2String, this.errorHandler);
request.safeGet(
- { "command": "stat", "session": this.sessionID },
+ { "command": "stat", "session": this.sessionID, "windowId" : self.window.name },
function(data) {
if ( data.getElementsByTagName("stat") ) {
var activeClients =
"num": this.currentNum,
"sort": this.currentSort,
"block": 1,
- "type": this.showResponseType
+ "type": this.showResponseType,
+ "windowId" : self.window.name
},
function(data, type) {
var show = null;
var recordParams = {
"command": "record",
"session": this.sessionID,
- "id": this.currRecID
+ "id": this.currRecID,
+ "windowId" : self.window.name
};
this.currRecOffset = null;
{
"command": "termlist",
"session": this.sessionID,
- "name": this.termKeys
+ "name": this.termKeys,
+ "windowId" : self.window.name
},
function(data) {
if ( data.getElementsByTagName("termlist") ) {
var context = this;
var request = new pzHttpRequest(this.pz2String, this.errorHandler);
request.safeGet(
- { "command": "bytarget", "session": this.sessionID },
+ { "command": "bytarget", "session": this.sessionID, "windowId" : self.window.name},
function(data) {
if ( data.getElementsByTagName("status")[0]
.childNodes[0].nodeValue == "OK" ) {
bytarget[i][nodeName] = nodeText;
}
}
+ 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";
+ }
}
context.bytargetCounter++;
}
};
+
pzHttpRequest.prototype =
{
safeGet: function ( params, callback )
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);