Update of /cvsroot/monetdb/MonetDB5/src/modules/atoms
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24625/src/modules/atoms
Modified Files:
xml.mx
Log Message:
introduce correct atom TYPE_xml's
Index: xml.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/atoms/xml.mx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- xml.mx 31 Aug 2007 16:57:12 -0000 1.9
+++ xml.mx 31 Aug 2007 17:57:51 -0000 1.10
@@ -59,7 +59,7 @@
address XMLattribute
comment "Construct an attribute value pair";
-command element(name:str, ns:str, attr:str, s:xml) :xml
+command element(name:str, ns:str, attr:xml, s:xml) :xml
address XMLelement
comment "The basic building block for XML elements are namespaces, attributes
and a sequence of xml elements. The name space and the attributes may be left
unspecified(=nil:bat).";
@@ -79,6 +79,11 @@
address XMLisdocument
comment "Validate the string as a document";
+command prelude() :void
+address XMLprelude;
+
+xml.prelude();
+
module calc;
command xml(src:str):xml address XMLstr2xml;
@@ -108,6 +113,8 @@
#define xml_export extern
#endif
+xml_export int TYPE_xml;
+
xml_export str XMLxml2str(str *s, xml *x);
xml_export str XMLstr2xml(xml *x, str *s);
xml_export str XMLdocument(xml *x, str *s);
@@ -123,6 +130,8 @@
xml_export str XMLconcat(xml *ret, xml *left, xml *right);
xml_export str XMLforest(MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+xml_export str XMLprelude(void);
+
#endif /* XML_H */
@c
#include "xml.h"
@@ -298,6 +307,17 @@
return MAL_SUCCEED;
}
+int TYPE_xml;
+
+str
+XMLprelude()
+{
+ TYPE_xml = ATOMindex("xml");
+ return MAL_SUCCEED;
+}
+
+
+
@sql
CREATE TYPE xml EXTERNAL NAME xml;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
