Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv449/modules/pftijah
Modified Files:
pftijah.mx
Log Message:
- 2 more fixes to make ftcontains work
1) fix self inflicted pathfinder variable name problem
2) fix usage of ftindex (:= ftiName + "0")
Index: pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -d -r1.242 -r1.243
--- pftijah.mx 21 Oct 2009 10:04:15 -0000 1.242
+++ pftijah.mx 21 Oct 2009 13:28:45 -0000 1.243
@@ -2712,6 +2712,9 @@
return res;
}
+#
+var ftindex;
+
# temporary algebra query handler
PROC ALG_tj_ftfun_handler(
bit par_storeScore,
@@ -2740,6 +2743,7 @@
# compiler we generate an unused ftiName var in the generated pathfinder
# mil script and assign it with this assigment.
ftiName := dflt_ft_index;
+ ftindex := ftiName + "0";
result_item_s := new(oid,dbl);
@@ -2754,6 +2758,7 @@
if ( has_ign )
GDKerror("ALG_tj_ftfun_handler: ignores not implemented yet");
+ if ( verbose ) printf(HASH +" tjq: phase 01.\n");
par_l...@batloop() {
var iter_tjPre;
var ftc_term := pfop_query.fetch(1...@0).fetch(int($h));
@@ -2794,6 +2799,7 @@
var tjPre_score :=
tj_containing_query_nest_pre_term_NLLR(iter_tjPre.reverse(), Q);
var iter_score := iter_tjPre.leftjoin(tjPre_score);
+
result_item_s.append(iter_score);
});
lock_unset(tijah_lock);
@@ -2802,6 +2808,11 @@
var result_item_b;
result_iter := pfop_sn.fetch(0...@0);
result_item_b := [>](result_item_s,dbl(0.0));
+ if ( verbose ) {
+ result_iter.print();
+ result_item_b.print();
+ result_item_s.print();
+ }
result_ipik := result_item_b;
result_kind := pfop_sn.fetch(2...@0).set_kind(BOOL);
var result_pos:= pfop_sn.fetch(3...@0);
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
