Update of /cvsroot/monetdb/pathfinder/modules/pftijah/tjc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30811/modules/pftijah/tjc
Modified Files:
Tag: M5XQ
tjc_main.c
Log Message:
propagated changes of Friday Sep 25 2009 - Monday Sep 28 2009
from the development trunk to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/09/25 - hrode: modules/pftijah/tjc/tjc_main.c,1.21
- several fixes for the fragmented indexing
- tijah now automatically queries all fragments of the index
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: tjc_main.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/tjc/tjc_main.c,v
retrieving revision 1.17.2.3
retrieving revision 1.17.2.4
diff -u -d -r1.17.2.3 -r1.17.2.4
--- tjc_main.c 17 Sep 2009 11:14:18 -0000 1.17.2.3
+++ tjc_main.c 28 Sep 2009 07:56:29 -0000 1.17.2.4
@@ -55,10 +55,13 @@
tjc_c->algDotFile = NULL;
tjc_c->milFile = NULL;
tjc_c->milBUFF[0] = 0;
+ tjc_c->milfragBUFF[0] = 0;
tjc_c->dotBUFF[0] = 0;
tjc_c->debug = 0;
tjc_c->timing = 0;
tjc_c->ftindex = "DFLT_FT_INDEX";
+ tjc_c->topk = 0;
+ tjc_c->maxfrag = 0;
tjc_c->irmodel = "NLLR";
tjc_c->conceptirmodel = "LogSum";
tjc_c->orcomb = "sum";
@@ -95,6 +98,10 @@
tjc_c->parseDotFile = GDKstrdup(optVal);
} else if ( strcmp(optName,"algdotfile") == 0 ) {
tjc_c->algDotFile = GDKstrdup(optVal);
+ } else if ( strcmp(optName,"returnNumber") == 0 ) {
+ tjc_c->topk = atoi(optVal);
+ } else if ( strcmp(optName,"maxfrag") == 0 ) {
+ tjc_c->maxfrag = atoi(optVal);
} else if ( strcmp(optName,"ft-index") == 0 ) {
tjc_c->ftindex = GDKstrdup(optVal);
} else if ( strcmp(optName,"ir-model") == 0 ) {
@@ -173,6 +180,10 @@
tjc_c->semantics = 0;
else if ( strcasecmp(optVal,"vague") == 0 )
tjc_c->semantics = 1;
+ } else if (strcmp(optName, "inexout") == 0) {
+ if (strcasecmp(optVal, "TRUE") == 0) {
+ tjc_c->inexout = 1;
+ }
} else if (strcmp(optName, "prior") == 0) {
if (strcasecmp(optVal, "LENGTH_PRIOR") == 0) {
tjc_c->prior = "ls";
@@ -180,8 +191,6 @@
} else if (strcmp(optName, "rmoverlap") == 0) {
if (strcasecmp(optVal, "TRUE") == 0)
tjc_c->rmoverlap = 1;
- } else if (strcmp(optName, "returnNumber") == 0) {
- /* will be handled in after query execution in pftijah.mx */
} else {
stream_printf(GDKout,"TijahOptions: should handle:
%s=%s\n",optName,optVal);
}
------------------------------------------------------------------------------
Come build with us! The BlackBerry® 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/devconf
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
