Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20977

Modified Files:
      Tag: XQuery_0-16
        pathfinder.mx 
Log Message:
- pf:documents() work again



Index: pathfinder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pathfinder.mx,v
retrieving revision 1.288.2.18
retrieving revision 1.288.2.19
diff -u -d -r1.288.2.18 -r1.288.2.19
--- pathfinder.mx       21 Feb 2007 23:43:46 -0000      1.288.2.18
+++ pathfinder.mx       22 Feb 2007 15:25:14 -0000      1.288.2.19
@@ -2741,14 +2741,14 @@
     var doc_nme, doc_col, doc_url, doc_upd; 
     if (consistent) pflock_meta(ws_id(ws)); # stop all concurrent 
shred_doc/del_doc activities
     lock_set(pf_short);
-    var err := CATCH( { var col_upd := 
collection_name.mirror().[lng]().[str]().[+]("_map_pid").[bat]().[int]().[ttype]().[=](oid).tmark([EMAIL
 PROTECTED]).[str]();
+    var err := CATCH( { var col_upd := 
collection_name.mirror().[lng]().[str]().[+]("_map_pid").[bat]().[int]().[ttype]().[=](oid).[str]();
                         doc_nme := 
doc_name.uselect(str_nil,str_nil).mirror().leftjoin(doc_collection);
                         doc_nme := 
coll_nme.leftjoin(reverse(collection_name)).leftjoin(reverse(doc_nme));
                         doc_url := doc_nme.leftjoin(doc_location).tmark([EMAIL 
PROTECTED]);
                         doc_col := 
doc_nme.leftjoin(doc_collection).tmark([EMAIL PROTECTED]);
                         doc_upd := doc_col.leftjoin(col_upd).tmark([EMAIL 
PROTECTED]); 
                         doc_col := 
doc_col.leftjoin(collection_name).tmark([EMAIL PROTECTED]); 
-                        doc_nme := doc_nme.leftjoin(doc_name); });
+                        doc_nme := doc_nme.leftjoin(doc_name).tmark([EMAIL 
PROTECTED]); });
     lock_unset(pf_short);
     if (not(isnil(err))) ERROR(err);
     return doc_nme.mark([EMAIL PROTECTED]).leftfetchjoin(xmltab4(ws, 
"document", doc_nme.tmark([EMAIL PROTECTED]), "collection", doc_col, "url", 
doc_url, "updatable", doc_upd));
@@ -2760,7 +2760,7 @@
     var doc_nme, doc_col, doc_url, doc_upd; 
     if (consistent) pflock_meta(ws_id(ws)); # stop all concurrent 
shred_doc/del_doc activities
     lock_set(pf_short);
-    var err := CATCH( { var col_upd := 
collection_name.mirror().[lng]().[str]().[+]("_map_pid").[bat]().[int]().[ttype]().[=](oid).tmark([EMAIL
 PROTECTED]).[str]();
+    var err := CATCH( { var col_upd := 
collection_name.mirror().[lng]().[str]().[+]("_map_pid").[bat]().[int]().[ttype]().[=](oid).[str]();
                         doc_nme := 
mirror(doc_name.[startsWith]("::").uselect(false));
                         doc_url := doc_nme.leftjoin(doc_location).tmark([EMAIL 
PROTECTED]);
                         doc_col := 
doc_nme.leftjoin(doc_collection).tmark([EMAIL PROTECTED]);


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to