Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31486
Modified Files:
nexi.c nexi_generate_mil.c pftijah.mx
Log Message:
* finish Hennings option handling changes.
Index: nexi_generate_mil.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/nexi_generate_mil.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- nexi_generate_mil.c 25 May 2007 12:34:23 -0000 1.31
+++ nexi_generate_mil.c 29 May 2007 15:09:02 -0000 1.32
@@ -241,7 +241,7 @@
p1_command = *p_com_array;
/* default region score setup */
- MILPRINTF(MILOUT, "var base := int(qenv.fetch(QENV_SCOREBASE));\n\n");
+ MILPRINTF(MILOUT, "var base := int(qenv.find(QENV_SCOREBASE));\n\n");
/* printf("%d\n",p_com_array); */
/* printf("%d\n",p1_command); */
Index: nexi.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/nexi.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- nexi.c 25 May 2007 12:34:23 -0000 1.61
+++ nexi.c 29 May 2007 15:09:02 -0000 1.62
@@ -260,6 +260,10 @@
MILPRINTF(MILOUT, "var trace := FALSE;\n" );
MILPRINTF(MILOUT, "var tracefile := \"\";\n" );
+
+ char* qenv_prox_val = NULL;
+ char* qenv_fb_val = NULL;
+
BUN p, q;
BATloop(optbat, p, q) {
str optName = (str)BUNhead(optbat,p);
@@ -459,6 +463,10 @@
} else if (strcmp(optName, "returnNumber") == 0) {
// ignore, is handled by milprint_summer
+ } else if (strcmp(optName, "term-proximity") == 0) {
+ qenv_prox_val = (char*)strdup(optVal);
+ } else if (strcmp(optName, "feedback-docs") == 0) {
+ qenv_fb_val = (char*)strdup(optVal);
} else {
stream_printf(GDKout,"TijahOptions: should handle:
%s=%s\n",optName,optVal);
}
@@ -493,13 +501,23 @@
// Prepend some variables to the MIL code.
- if ( 0 ) { MILPRINTF(MILOUT, "tj_setCollName(\"%s\");\n",
parserCtx->collection); /* DELETE */ /* DELETE */ }
MILPRINTF(MILOUT, "var qenv :=
create_qenv(\"%s\",\"%s\",\"0\");\n",parserCtx->collection,parserCtx->collection);
+ if ( qenv_prox_val ) {
+ MILPRINTF(MILOUT,
"modify_qenv(qenv,QENV_TERM_PROXIMITY,\"%s\");\n",qenv_prox_val);
+ free(qenv_prox_val);
+ qenv_prox_val = NULL;
+ }
+ if ( qenv_fb_val ) {
+ MILPRINTF(MILOUT,
"modify_qenv(qenv,QENV_FEEDBACK_DOCS,\"%s\");\n",qenv_fb_val);
+ free(qenv_fb_val);
+ qenv_fb_val = NULL;
+ }
+
#if 0
MILPRINTF(MILOUT, "retNum := %d;\n", retNum);
#endif
- MILPRINTF(MILOUT, "var stemmer := bat(\"tj_\"+ qenv.fetch(QENV_FTINAME)
+\"_param\").find(\"stemmer\");\n");
+ MILPRINTF(MILOUT, "var stemmer := bat(\"tj_\"+ qenv.find(QENV_FTINAME)
+\"_param\").find(\"stemmer\");\n");
if (strcmp(background_collection,""))
{ MILPRINTF(MILOUT, "qenv := tj_setBackgroundCollName(\"%s\",qenv);\n",
background_collection); }
Index: pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- pftijah.mx 29 May 2007 14:41:52 -0000 1.126
+++ pftijah.mx 29 May 2007 15:09:03 -0000 1.127
@@ -199,11 +199,11 @@
}
}
-const QENV_FTINAME := [EMAIL PROTECTED];
-const QENV_FTIBGNAME := [EMAIL PROTECTED];
-const QENV_SCOREBASE := [EMAIL PROTECTED];
-const QENV_PROX := [EMAIL PROTECTED];
-const QENV_FB_NUM := [EMAIL PROTECTED];
+const QENV_FTINAME := [EMAIL PROTECTED];
+const QENV_FTIBGNAME := [EMAIL PROTECTED];
+const QENV_SCOREBASE := [EMAIL PROTECTED];
+const QENV_TERM_PROXIMITY := [EMAIL PROTECTED];
+const QENV_FEEDBACK_DOCS := [EMAIL PROTECTED];
# create a query environment bat
PROC create_qenv(str fti_name, str bg_fti_name, str scb) : BAT[oid,str]
@@ -217,7 +217,7 @@
PROC modify_qenv(BAT[oid,str] qenv, oid key, str val) : void
{
- if (qenv.exists(key)) {
+ if (qenv.exist(key)) {
qenv.replace(key, val);
} else {
qenv.insert(key, val);
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
