Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv18207
Modified Files:
pathfinder.mx
Log Message:
- remove debug line
- added forgotten test whether etxt candidates are actually text nodes
Index: pathfinder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pathfinder.mx,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -d -r1.321 -r1.322
--- pathfinder.mx 6 Apr 2007 00:03:23 -0000 1.321
+++ pathfinder.mx 6 Apr 2007 08:56:07 -0000 1.322
@@ -2226,7 +2226,6 @@
iter_hsh := reverse(key_iter).leftfetchjoin(key_hsh);
# lookup uses the hash-index on vx_hsh_nid; provide isolation with
_ins/_del bats
-CATCH(ERROR("pp"));
lock_set(coll_shortlock);
var err := CATCH(iter_cand := iter_hsh.leftjoin(vx_hsh_nid));
lock_unset(coll_shortlock);
@@ -2259,6 +2258,13 @@
my_iter := tmp.hmark([EMAIL PROTECTED]).leftfetchjoin(my_iter);
# my_iter and my_pre synced
var my_pre := tmp.tmark([EMAIL PROTECTED]);
+ # check if the candidates are indeed text nodes
+ tmp :=
my_pre.leftfetchjoin(pre_kind).ord_uselect(TEXT).hmark([EMAIL PROTECTED]);
+ if (count(tmp) < count(my_pre)) {
+ my_pre := tmp.leftfetchjoin(my_pre);
+ my_iter := tmp.leftfetchjoin(my_iter);
+ }
+
{ # check whether string value actually matches something in 'iter_val'
var my_text :=
my_pre.leftfetchjoin(pre_prop).leftfetchjoin(prop_text);
var my_val := my_iter.leftfetchjoin(iter_val).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
