[Monetdb-pf-checkins] pathfinder/modules/pftijah/tjc tjc_normalize_query.c, M5XQ, 1.1, 1.1.2.1

[Sjoerd Mullender]

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

Modified Files:
      Tag: M5XQ
        tjc_normalize_query.c 
Log Message:
propagated changes of Thursday Sep 17 2009
from the development trunk to the M5XQ branch

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/09/17 - sjoerd: modules/pftijah/tjc/tjc_normalize_query.c,1.2
propagated changes of Tuesday Sep 15 2009 - Thursday Sep 17 2009
from the Aug2009 branch to the development trunk

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/09/15 - hrode: modules/pftijah/tjc/tjc_normalize_query.c,1.1.6.1
*** empty log message ***
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


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.2.1
diff -u -d -r1.1 -r1.1.2.1
--- tjc_normalize_query.c       16 Apr 2009 10:29:37 -0000      1.1
+++ tjc_normalize_query.c       17 Sep 2009 11:14:22 -0000      1.1.2.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);


------------------------------------------------------------------------------
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