Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7950/modules/pftijah
Modified Files:
Tag: M5XQ
pftijah.mx
Log Message:
propagated changes of Wednesday Oct 21 2009
from the development trunk to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/21 - jflokstra: modules/pftijah/pftijah.mx,1.242
- fix for ftiName MIL variable usage when pftijah mil functions are not called
from pftijah generated MIL scripts but from Pathfinder generated scripts.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v
retrieving revision 1.226.2.14
retrieving revision 1.226.2.15
diff -u -d -r1.226.2.14 -r1.226.2.15
--- pftijah.mx 15 Oct 2009 14:02:53 -0000 1.226.2.14
+++ pftijah.mx 21 Oct 2009 10:38:03 -0000 1.226.2.15
@@ -2734,6 +2734,13 @@
if ( verbose ) printf(HASH +" ALG_tj_ftfun_handler: START.\n");
+ # The next assigment is done to make pftijah work like it is used
+ # by the tijah compiler. A variable ftiName is expected to exist
+ # in the caller env. To make this work for direct calls without the
+ # compiler we generate an unused ftiName var in the generated pathfinder
+ # mil script and assign it with this assigment.
+ ftiName := dflt_ft_index;
+
result_item_s := new(oid,dbl);
var has_sn := (pfop_sn.count_wrd() > wrd(0));
@@ -2769,8 +2776,8 @@
iter_tjPre :=
pf2tijah_node(true,xdoc_name,xdoc_firstpre,xpfpre,sn_item,[int](sn_kind),doc_loaded);
# now tokenize the term string and add a default weight
- var Q := tijah_tokenize2bat(ftc_term).reverse().project(dbl(1.0));
- Q := tj_term2tid(Q);
+ var T := tijah_tokenize2bat(ftc_term).reverse().project(dbl(1.0));
+ var Q := tj_prepare_query(T);
# tj_init_termHash(ftiName);
# tj_init_tagHash(ftiName);
------------------------------------------------------------------------------
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
