Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31086/modules/pftijah
Modified Files:
pftijah.mx serialize_pftijah.mx serialize_pftijah_options.mx
Log Message:
propagated changes of Sunday May 25 2008 - Thursday Jul 03 2008
from the xrpcdemo branch to the development trunk
or better:
applied differences between the current head of the XQuery_0-24 branch (tag
xrpcdemo_sync) and the current head of the xrpcdemo branch (tag
xrpcdemo_done) to the development trunk
Index: serialize_pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/serialize_pftijah.mx,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- serialize_pftijah.mx 16 May 2008 06:58:43 -0000 1.62
+++ serialize_pftijah.mx 3 Jul 2008 15:10:31 -0000 1.63
@@ -900,13 +900,11 @@
* Default driver initialization function
*/
static bool
-pftijah_init(XqueryCtx* ctx, char* args, char* restag, char* resprefix, char*
module, char* method) {
+pftijah_init(XqueryCtx* ctx, char* args, char* restag, char* resprefix) {
(void) ctx;
(void) args;
(void) restag;
(void) resprefix;
- (void) module;
- (void) method;
ctx->driverWs = GLOBAL_TJCTX;
#ifdef TJ_TRACE
Index: serialize_pftijah_options.mx
===================================================================
RCS file:
/cvsroot/monetdb/pathfinder/modules/pftijah/serialize_pftijah_options.mx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serialize_pftijah_options.mx 22 Mar 2007 15:42:27 -0000 1.15
+++ serialize_pftijah_options.mx 3 Jul 2008 15:10:31 -0000 1.16
@@ -64,12 +64,10 @@
* Definition of the structure containing the functions
*/
static bool
-pftijah_options_init(XqueryCtx* ctx, char* args, char *restag, char
*resprefix, char* module, char* method) {
+pftijah_options_init(XqueryCtx* ctx, char* args, char *restag, char
*resprefix) {
(void) args;
(void) restag;
(void) resprefix;
- (void) module;
- (void) method;
ctx->driverWs = GLOBAL_PTOS;
GLOBAL_PTOS->errorMessage = NULL;
@@ -209,8 +207,6 @@
#endif
int returnVal = xquery_print_result_DRIVER(
"",
- NULL, /* module */
- NULL, /* method */
&pftijah_optionsSerializeFun,
"",
ws,
@@ -221,7 +217,7 @@
kind,
intVAL,
dblVAL,
- strVAL);
+ strVAL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#ifdef DEBUG
stream_printf(GDKout,"CALLED xquery_print_result_DRIVER:
res=%d\n",returnVal);
BATprintf(GDKout,ptos.bat);
Index: pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- pftijah.mx 13 May 2008 14:37:27 -0000 1.171
+++ pftijah.mx 3 Jul 2008 15:10:30 -0000 1.172
@@ -176,7 +176,7 @@
# locks
var tj_adm_lock := lock_create(); # tijah top administration lock
var tj_dep_lock := lock_create(); # tijah top dependency adm lock
-var tj_coll_lockbat := new(str,lock); # locks for all active collections
+var tj_coll_lockbat := new(str,lock).rename("tj_coll_lockbat"); # locks for
all active collections
# Comparisons
# const GREATER := 10;
@@ -1881,7 +1881,7 @@
var equivalences := new(str,str);
PROC tj_initEquivalences() : void :=
{
- equivalences := new(str,str);
+ equivalences := new(str,str).rename("tj_equivalences");
}
# INCOMPLETE: henning, what should I do about this.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
