[Monetdb-pf-checkins] pathfinder/modules/pftijah/tjc tjc_main.c, Aug2009, 1.19, 1.19.2.1 tjc_normalize_query.c, Aug2009, 1.1, 1.1.6.1

[Henning Rode]

Update of /cvsroot/monetdb/pathfinder/modules/pftijah/tjc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2790/tjc

Modified Files:
      Tag: Aug2009
        tjc_main.c tjc_normalize_query.c 
Log Message:


U tjc_normalize_query.c
Index: tjc_normalize_query.c
===================================================================
RCS file: 
/cvsroot/monetdb/pathfinder/modules/pftijah/tjc/tjc_normalize_query.c,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -d -r1.1 -r1.1.6.1
--- tjc_normalize_query.c       16 Apr 2009 10:29:37 -0000      1.1
+++ tjc_normalize_query.c       15 Sep 2009 13:28:38 -0000      1.1.6.1
@@ -58,6 +58,8 @@
     TJpnode_t *nl_del[TJPNODELIST_MAXSIZE];
     TJpnode_t *n_and_par, *n_and, *n_anc0, *n_anc1, *n_about0, *n_about1, 
*n_qand; 
 
+// in the OR case we cannot combine query parts when they contain phrases or 
mandatory terms/entities
+/*
     num_del = 0;
     num_and = find_all_par_tree (ptree, p_or, nl_and);
     for (c = 0; c < num_and; c++) {
@@ -107,7 +109,7 @@
        }
     }
     mark_deleted_nodes(nl_del, num_del);
-
+*/
     // now do the same for "AND" nodes
     num_del = 0;
     num_and = find_all_par_tree (ptree, p_and, nl_and);

U tjc_main.c
Index: tjc_main.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/tjc/tjc_main.c,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -d -r1.19 -r1.19.2.1
--- tjc_main.c  18 May 2009 15:20:16 -0000      1.19
+++ tjc_main.c  15 Sep 2009 13:28:38 -0000      1.19.2.1
@@ -256,7 +256,7 @@
            save2file(tjc_c->parseDotFile, tjc_c->dotBUFF);
        }
        // optional parse tree dot output
-       if (tjc_c->parseDotFile) { 
+       if (tjc_c->algDotFile) { 
            tjc_c->dotBUFF[0] = '\0';
            printTJatree (tjc_c, atree); 
            save2file(tjc_c->algDotFile, tjc_c->dotBUFF);


------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; 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&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Monetdb-pf-checkins mailing list
Monetdb-pf-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins