Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21927/runtime
Modified Files:
Tag: XQuery_0-24
pathfinder.mx
Log Message:
analogously to Peter's fix for
[ 1995879 ] algebra kills admin GUI
http://sourceforge.net/tracker/index.php?func=detail&aid=1995879&group_id=56967&atid=482468
that falls back to MPS for XRPC and cachable queries,
even if ALG is default:
For StandOff extensions, we no proceed as follows:
In case
(1) Pathfinder is configured with --with-default-backend=algebra AND
(2) StandOff extensions are enabled at runtime via
`Mserver --set standoff=enabled` and/or `pf --enable-standoff` AND
(3) the Algebra back-end is NOT explicitly requested via
`Mserver --set xquery_backend=algebra`, `pf -A`, or `mclient -G`
then,
Pathfinder automatically falls back to MPS
to enable support for the StandOff extensions.
U pathfinder.mx
Index: pathfinder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pathfinder.mx,v
retrieving revision 1.416.2.9
retrieving revision 1.416.2.10
diff -u -d -r1.416.2.9 -r1.416.2.10
--- pathfinder.mx 17 Jun 2008 21:56:37 -0000 1.416.2.9
+++ pathfinder.mx 18 Jun 2008 15:30:14 -0000 1.416.2.10
@@ -6153,7 +6153,12 @@
#if MILPRINT_SUMMER_IS_DEFAULT
GDKsetenv("xquery_backend","milprint_summer");
#else /* ALGEBRA_IS_DEFAULT */
- GDKsetenv("xquery_backend","algebra");
+ if ((GDKgetenv("standoff") != NULL) &&
(strcmp(GDKgetenv("standoff"),"enabled") == 0)) {
+ /* Algebra back-end does not support StandOff extensions, yet */
+ GDKsetenv("xquery_backend","milprint_summer");
+ } else {
+ GDKsetenv("xquery_backend","algebra");
+ }
#endif
}
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
