Update of /cvsroot/monetdb/pathfinder/compiler/xmlimport
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1296/compiler/xmlimport
Modified Files:
Tag: xquery-decomposition
xml2lalg.c xml2lalg_converters.c
Log Message:
propagated changes up to Thursday Jan 17 2008
from the development trunk to the xquery-decomposition branch
Index: xml2lalg.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/xmlimport/xml2lalg.c,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- xml2lalg.c 11 Jan 2008 12:48:13 -0000 1.10
+++ xml2lalg.c 17 Jan 2008 08:36:44 -0000 1.10.2.1
@@ -733,13 +733,13 @@
{
/*
<content>
- (<column name="COLNAME" new="true"/>)*
+ (<column name="COLNAME" type="DATATYPE" new="true"/>)*
</content>
*/
- newAlgNode = PFla_empty_tbl
+ newAlgNode = PFla_empty_tbl_
(
- PFLA_ATT_LST("/content/[EMAIL PROTECTED]'true']")
+ PFLA_SCHEMA("/content/[EMAIL PROTECTED]'true']")
);
}
break;
Index: xml2lalg_converters.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/xmlimport/xml2lalg_converters.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- xml2lalg_converters.c 11 Jan 2008 10:47:18 -0000 1.6
+++ xml2lalg_converters.c 17 Jan 2008 08:36:44 -0000 1.6.2.1
@@ -118,7 +118,21 @@
bool
PFxml2la_conv_2PFLA_atomValue_bln(char* s)
{
- return atoi(s);
+
+ if(strcmp(s, "true") == 0)
+ {
+ return true;
+ }
+ else if(strcmp(s, "false") == 0)
+ {
+ return false;
+ }
+ else
+ {
+ PFoops (OOPS_FATAL, "don't know what to do with (%s)", s);
+ /* pacify picky compilers */
+ return -1;
+ }
}
@@ -790,7 +804,6 @@
case aat_bln:
{
return lit_bln(PFxml2la_conv_2PFLA_atomValue_bln(valueString));
-
}
case aat_uA:
{
-------------------------------------------------------------------------
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
