projects
/
pazpar2-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
52793fb
)
Stylesheet fetched in async mode.
author
Jakub Skoczen
<jakub@indexdata.dk>
Mon, 2 Jul 2007 10:16:46 +0000
(10:16 +0000)
committer
Jakub Skoczen
<jakub@indexdata.dk>
Mon, 2 Jul 2007 10:16:46 +0000
(10:16 +0000)
js/pz2.js
patch
|
blob
|
history
diff --git
a/js/pz2.js
b/js/pz2.js
index
0f2a906
..
4cd86ef
100644
(file)
--- a/
js/pz2.js
+++ b/
js/pz2.js
@@
-1,5
+1,5
@@
/*
/*
-** $Id: pz2.js,v 1.40 2007-06-25 07:23:56 adam Exp $
+** $Id: pz2.js,v 1.41 2007-07-02 10:16:46 jakub Exp $
** pz2.js - pazpar2's javascript client library.
*/
** pz2.js - pazpar2's javascript client library.
*/
@@
-40,6
+40,7
@@
var pz2 = function(paramArray) {
//load stylesheet if required in async mode
if( __myself.stylesheet ) {
var request = new pzHttpRequest( __myself.stylesheet );
//load stylesheet if required in async mode
if( __myself.stylesheet ) {
var request = new pzHttpRequest( __myself.stylesheet );
+ request.async = false;
request.get(
[],
function ( doc ) {
request.get(
[],
function ( doc ) {
@@
-146,7
+147,7
@@
pz2.prototype =
} else if (__myself.useSessions) {
var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
request.get(
} else if (__myself.useSessions) {
var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
request.get(
- [ { "command": "init" } ],
+ { "command": "init" },
function(data) {
if ( data.getElementsByTagName("status")[0].childNodes[0].nodeValue == "OK" ) {
if ( data.getElementsByTagName("protocol")[0].childNodes[0].nodeValue != __myself.suppProtoVer )
function(data) {
if ( data.getElementsByTagName("status")[0].childNodes[0].nodeValue == "OK" ) {
if ( data.getElementsByTagName("protocol")[0].childNodes[0].nodeValue != __myself.suppProtoVer )
@@
-173,7
+174,7
@@
pz2.prototype =
// session is not initialized code here
var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
request.get(
// session is not initialized code here
var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
request.get(
- [ { "command": "ping", "session": __myself.sessionID } ],
+ { "command": "ping", "session": __myself.sessionID },
function(data) {
if ( data.getElementsByTagName("status")[0].childNodes[0].nodeValue == "OK" ) {
__myself.pingStatusOK = true;
function(data) {
if ( data.getElementsByTagName("status")[0].childNodes[0].nodeValue == "OK" ) {
__myself.pingStatusOK = true;
@@
-243,7
+244,7
@@
pz2.prototype =
clearTimeout(__myself.statTimer);
var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
request.get(
clearTimeout(__myself.statTimer);
var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
request.get(
- [ { "command": "stat", "session": __myself.sessionID } ],
+ { "command": "stat", "session": __myself.sessionID },
function(data) {
if ( data.getElementsByTagName("stat") ) {
var activeClients = Number( data.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue );
function(data) {
if ( data.getElementsByTagName("stat") ) {
var activeClients = Number( data.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue );
@@
-291,8
+292,8
@@
pz2.prototype =
var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
var context = this;
request.get(
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 } ],
+ { "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
function(data) {
if ( data.getElementsByTagName("status")[0].childNodes[0].nodeValue == "OK" ) {
// first parse the status data send along with records
@@
-359,7
+360,7
@@
pz2.prototype =
__myself.currRecID = id;
var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
request.get(
__myself.currRecID = id;
var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
request.get(
- [ { "command": "record", "session": __myself.sessionID, "id": __myself.currRecID } ],
+ { "command": "record", "session": __myself.sessionID, "id": __myself.currRecID },
function(data) {
var recordNode;
var record = new Array();
function(data) {
var recordNode;
var record = new Array();
@@
-416,7
+417,7
@@
pz2.prototype =
clearTimeout(__myself.termTimer);
var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
request.get(
clearTimeout(__myself.termTimer);
var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
request.get(
- [ { "command": "termlist", "session": __myself.sessionID, "name": __myself.termKeys } ],
+ { "command": "termlist", "session": __myself.sessionID, "name": __myself.termKeys },
function(data) {
if ( data.getElementsByTagName("termlist") ) {
var activeClients = Number( data.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue );
function(data) {
if ( data.getElementsByTagName("termlist") ) {
var activeClients = Number( data.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue );
@@
-468,7
+469,7
@@
pz2.prototype =
clearTimeout(__myself.bytargetTimer);
var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
request.get(
clearTimeout(__myself.bytargetTimer);
var request = new pzHttpRequest(__myself.pz2String, __myself.errorHandler);
request.get(
- [ { "command": "bytarget", "session": __myself.sessionID } ],
+ { "command": "bytarget", "session": __myself.sessionID },
function(data) {
if ( data.getElementsByTagName("status")[0].childNodes[0].nodeValue == "OK" ) {
var targetNodes = data.getElementsByTagName("target");
function(data) {
if ( data.getElementsByTagName("status")[0].childNodes[0].nodeValue == "OK" ) {
var targetNodes = data.getElementsByTagName("target");
@@
-570,15
+571,13
@@
pzHttpRequest.prototype =
var getUrl = this.url;
var sep = '?';
var getUrl = this.url;
var sep = '?';
- for (var i = 0; i < params.length; i++) {
- var el = params[i];
- for (var key in el) {
- if (el[key] != null) {
- getUrl += sep + key + '=' + encodeURI(el[key]);
- sep = '&';
- }
- }
- }
+ var el = params;
+ for (var key in el) {
+ if (el[key] != null) {
+ getUrl += sep + key + '=' + encodeURI(el[key]);
+ sep = '&';
+ }
+ }
return getUrl;
},
return getUrl;
},