projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Addinfo element added
[pazpar2-moved-to-github.git]
/
js
/
pz2.js
diff --git
a/js/pz2.js
b/js/pz2.js
index
ca0d28c
..
7edf35d
100644
(file)
--- a/
js/pz2.js
+++ b/
js/pz2.js
@@
-79,6
+79,7
@@
var pz2 = function ( paramArray )
// where are we?
this.currentStart = 0;
// where are we?
this.currentStart = 0;
+ // currentNum can be overwritten in show
this.currentNum = 20;
// last full record retrieved
this.currentNum = 20;
// last full record retrieved
@@
-360,7
+361,7
@@
pz2.prototype =
}
);
},
}
);
},
- show: function(start, num, sort)
+ show: function(start, num, sort, query_state)
{
if( !this.searchStatusOK && this.useSessions )
throw new Error(
{
if( !this.searchStatusOK && this.useSessions )
throw new Error(
@@
-379,7
+380,7
@@
pz2.prototype =
var context = this;
var request = new pzHttpRequest(this.pz2String, this.errorHandler);
var context = this;
var request = new pzHttpRequest(this.pz2String, this.errorHandler);
- request.safeGet(
+ var requestParameters =
{
"command": "show",
"session": this.sessionID,
{
"command": "show",
"session": this.sessionID,
@@
-389,7
+390,11
@@
pz2.prototype =
"block": 1,
"type": this.showResponseType,
"windowid" : window.name
"block": 1,
"type": this.showResponseType,
"windowid" : window.name
- },
+ };
+ if (query_state)
+ requestParameters["query-state"] = query_state;
+ request.safeGet(
+ requestParameters,
function(data, type) {
var show = null;
var activeClients = 0;
function(data, type) {
var show = null;
var activeClients = 0;
@@
-647,10
+652,17
@@
pz2.prototype =
== Node.ELEMENT_NODE ) {
var nodeName =
targetNodes[i].childNodes[j].nodeName;
== 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") {
}
}
if (bytarget[i]["state"]=="Client_Disconnected") {