Update of /cvsroot/monetdb/MonetDB5/src/modules/atoms/Tests
In directory 
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15018/src/modules/atoms/Tests

Modified Files:
      Tag: GDK-2
        xml100.mal 
Added Files:
      Tag: GDK-2
        xml100.stable.err xml100.stable.out 
Log Message:
propagated changes of Friday Aug 24 2007 - Tuesday Aug 28 2007
from the development trunk to the GDK-2 branch

There were inexplicable conflicts in src/modules/mal/batxml.mx and
src/modules/mal/Tests/inspect05.stable.out, neither of which had been
changed on the branch.  I just copied the HEAD version to the branch
to resolve the conflicts.


--- NEW FILE: xml100.stable.out ---
stdout of test 'xml100` in directory 'src/modules/atoms` itself:


# 20:59:49 >  
# 20:59:49 >  Mtimeout -timeout 60  mserver5 
"--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --set 
"monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin"
 --set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set 
"sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set 
"xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set 
mapi_open=true --set xrpc_open=true --set mapi_port=30810 --set xrpc_port=49438 
--set monet_prompt= --trace --dbname=mTests_src_modules_atoms  xml100.mal
# 20:59:49 >  

# MonetDB server v5.1.0, based on kernel v1.19.0
# Serving database 'mTests_src_modules_atoms'
# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
# Copyright (c) 1993-2007 CWI, all rights reserved
# Visit http://monetdb.cwi.nl/ for further information
# Listening for connection requests on mapi:monetdb://gio.ins.cwi.nl:30810/
#b:= "Mary Ann Walker";
#c:= "brown";
#
#n:= nil:xml;
#io.print(n);
#ns:= xml.str(n);
#io.print(ns);
#
#bx:= xml.xml(b);
#cx:= xml.xml(c);
#
#xp:= xml.element("person",bx);
#sp:= xml.str(xp); io.print(sp);
#xh:= xml.element("hair",nil:str,nil:str,cx);
#sp:= xml.str(xh); io.print(sp);
#
#xx:= xml.forest(xp,xh);
#xs:= xml.str(xx);
#io.print(xs);
#
function user.main():void;      # 0  (main:void)
    b := "Mary Ann Walker";     # 1  (b:str)<-(_2:str)
    c := "brown";       # 2  (c:str)<-(_4:str)
    n := nil:xml;       # 3  (n:xml)<-(_6:xml)
    io.print(n);        # 4 IOprint_val (_7:void)<-(n:xml)
    ns := xml.str(n);   # 5 XMLxml2str (ns:str)<-(n:xml)
    io.print(ns);       # 6 IOprint_val (_9:void)<-(ns:str)
    bx := xml.xml(b);   # 7 XMLstr2xml (bx:xml)<-(b:str)
    cx := xml.xml(c);   # 8 XMLstr2xml (cx:xml)<-(c:str)
    xp := xml.element("person",bx);     # 9 XMLelementSmall 
(xp:xml)<-(_13:str)(bx:xml)
    sp := xml.str(xp);  # 10 XMLxml2str (sp:str)<-(xp:xml)
    io.print(sp);       # 11 IOprint_val (_15:void)<-(sp:str)
    xh := xml.element("hair",nil:str,nil:str,cx);       # 12 XMLelement 
(xh:xml)<-(_17:str)(_18:str)(_18:str)(cx:xml)
    sp := xml.str(xh);  # 13 XMLxml2str (sp:str)<-(xh:xml)
    io.print(sp);       # 14 IOprint_val (_19:void)<-(sp:str)
    xx := xml.forest(xp,xh);    # 15 XMLforest (xx:xml)<-(xp:xml)(xh:xml)
    xs := xml.str(xx);  # 16 XMLxml2str (xs:str)<-(xx:xml)
    io.print(xs);       # 17 IOprint_val (_22:void)<-(xs:str)
end main;       # 18  
[ nil ]
[ nil ]
[ "<person>Mary Ann Walker</person>" ]
[ "<hair>brown</hair" ]
[ "<person>Mary Ann Walker</person><hair>brown</hair" ]

# 20:59:49 >  
# 20:59:49 >  Done.
# 20:59:49 >  


--- NEW FILE: xml100.stable.err ---
stderr of test 'xml100` in directory 'src/modules/atoms` itself:


# 20:59:49 >  
# 20:59:49 >  Mtimeout -timeout 60  mserver5 
"--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --set 
"monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin"
 --set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set 
"sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set 
"xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set 
mapi_open=true --set xrpc_open=true --set mapi_port=30810 --set xrpc_port=49438 
--set monet_prompt= --trace --dbname=mTests_src_modules_atoms  xml100.mal
# 20:59:49 >  

#warning: please don't forget to set your vault key!
#(see /ufs/mk/monet5/Linux/etc/monetdb5.conf)

# 20:59:49 >  
# 20:59:49 >  Done.
# 20:59:49 >  


Index: xml100.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/atoms/Tests/xml100.mal,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- xml100.mal  24 Aug 2007 09:01:26 -0000      1.1.2.3
+++ xml100.mal  28 Aug 2007 13:15:16 -0000      1.1.2.4
@@ -1,7 +1,11 @@
 b:= "Mary Ann Walker";
-
 c:= "brown";
 
+n:= nil:xml;
+io.print(n);
+ns:= xml.str(n);
+io.print(ns);
+
 bx:= xml.xml(b);
 cx:= xml.xml(c);
 


-------------------------------------------------------------------------
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

Reply via email to