Update of /cvsroot/monetdb/pathfinder/runtime/xrpc/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5111/admin
Modified Files:
Tag: XQuery_0-24
admin.js xrpcwebclient.js
Log Message:
Don't statically add the callback URI "/xrpc/admin" in the function
XRPC() that send the HTTP requests, since multiple callback URIs are in
use ("/xrpc", "/xrpc/admin" and "/xrpc/doc"). Let the calling function
add the desired callback URI instead.
Please propagate this change to the branch xrpcdemo a.s.a.p., thanks a
lot!
U admin.js
Index: admin.js
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc/admin/admin.js,v
retrieving revision 1.12
retrieving revision 1.12.8.1
diff -u -d -r1.12 -r1.12.8.1
--- admin.js 21 Sep 2007 16:52:54 -0000 1.12
+++ admin.js 28 May 2008 13:01:12 -0000 1.12.8.1
@@ -12,7 +12,7 @@
var modurl = posturl + "/admin/admin.xq";
function myXRPC(method,arity,call,callback) {
- XRPC(posturl,mod,modurl,method,arity,call,callback);
+ XRPC(posturl+"/xrpc/admin",mod,modurl,method,arity,call,callback);
}
/**********************************************************************
@@ -238,7 +238,7 @@
}
function doCollections() {
- XRPC(posturl, mod, modurl, 'collections', 0, XRPC_CALL(),
doCollectionsCallback);
+ XRPC(posturl+"/xrpc/admin", mod, modurl, 'collections', 0, XRPC_CALL(),
doCollectionsCallback);
}
/* methods expected to take 'long' (use popup window) */
U xrpcwebclient.js
Index: xrpcwebclient.js
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc/admin/xrpcwebclient.js,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- xrpcwebclient.js 14 May 2008 18:18:21 -0000 1.10
+++ xrpcwebclient.js 28 May 2008 13:01:13 -0000 1.10.2.1
@@ -7,7 +7,7 @@
call, /* one or more XRPC_CALL() parameter specs
(concatenated strings) */
callback) /* callback function to call with the XML response */
{
- clnt.sendReceive(posturl+"/xrpc/admin", method,
XRPC_REQUEST(module,moduleurl,method,arity,call), callback);
+ clnt.sendReceive(posturl, method,
XRPC_REQUEST(module,moduleurl,method,arity,call), callback);
}
/**********************************************************************
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
