Changeset 7754 for TI01-discovery-API/trunk

Timestamp:

30/11/10 11:40:02 (9 years ago)

Author:

mnagni

Message:

Now the "exact phrase search" works exactly for the phrase and not for the AND chain of the words composing it

Location:

TI01-discovery-API/trunk/MEDINDiscoveryService

Files:

• . (modified) (1 prop)
• pom.xml (modified) (1 diff)
• src/main/java/ndg/common/TermParser.java (modified) (1 diff)
• src/main/java/ndg/services/discovery/model/CommonMethods.java (modified) (1 diff)
• src/main/java/ndg/services/discovery/model/SearchAgent.java (modified) (4 diffs)

TI01-discovery-API/trunk/MEDINDiscoveryService

@@ -1 +1 @@
 DummyForEclipse
+
+.metadata

@@ -1 +1 @@
 DummyForEclipse
+
+.metadata

TI01-discovery-API/trunk/MEDINDiscoveryService/pom.xml

@@ -4 +4 @@
         <groupId>ndg.services.discovery</groupId>
         <artifactId>MedinDiscoveryService</artifactId>
-        <version>1.2.5</version>
+        <version>1.2.6</version>
         <packaging>aar</packaging>
 

TI01-discovery-API/trunk/MEDINDiscoveryService/src/main/java/ndg/common/TermParser.java

@@ -159 +159 @@
         }
         
-        private String[] extractWordPhrase(String term) throws AssembleQueryException {
+        /**
+         * Returns an array containg the phrases into the term
+         * @param term the term to parse
+         * @return the phrases contained
+         **/
+        public String[] extractWordPhrase(String term) throws AssembleQueryException {
                 List<String> ret = new ArrayList<String>();
 

TI01-discovery-API/trunk/MEDINDiscoveryService/src/main/java/ndg/services/discovery/model/CommonMethods.java

@@ -132 +132 @@
                 StringBuffer orderSQL = new StringBuffer();
                 
-
+                whereSQL.append("transformed_document.original_document_id = original_document.original_document_id");          
+                
                 fromSQL.append(" FROM ");
                 fromSQL.append(DiscoveryDictionary.ORIGINAL_DOCUMENT_TABLE);
+                fromSQL.append(", " + DiscoveryDictionary.TRANSFORMED_DOCUMENT_TABLE);
 
                 assembleSearchQuery(selectSQL, fromSQL, whereSQL,criteria, retrieveType);

TI01-discovery-API/trunk/MEDINDiscoveryService/src/main/java/ndg/services/discovery/model/SearchAgent.java

@@ -177 +177 @@
                 boolean secondPass = false;
                 int queryIndex = 0;
+                TermParser parser = new TermParser();
+                String[] phrases = null;
                 for (TermSearchType termType : terms) {
+                        phrases = null;
                         String term = termType.getTerm();
 
@@ -183 +186 @@
                         if (term == null || term.length() == 0)
                                 continue;
-                        term = new TermParser().parseTerm(term);
+                        
+                        //DO NOT INVERT!!
+                        phrases = parser.extractWordPhrase(term);
+                        term = parser.parseTerm(term);                  
 
                         DiscoveryDictionary.TermTarget termTarget = DiscoveryDictionary.getTermType(termType.getTermTarget());
@@ -196 +202 @@
 
                         String operator = getOperator(termType.getOperator());
-
+                        
+                        checkWHERE_AND(whereSQL, secondPass);
+                        
                         if ((!secondPass && operator.equals(OPERATOR.NOT.name())) || (secondPass && queryIndex < terms.size())) {
                                 whereSQL.append(" ");
@@ -205 +213 @@
                         whereSQL.append(" query" + Integer.toString(queryIndex) + " @@ ");
                         whereSQL.append(composeVector(termTarget));
+                        
+                        if (phrases != null && phrases[0].trim().length() > 0) {
+                                for (String phrase : phrases) {
+                                        checkWHERE_AND(whereSQL, secondPass);
+                                        //the ILIKE (case insensitive) operator is POSTGRESQL a specific extension
+                                        whereSQL.append("transformed_document.transformed_document ilike '%" + phrase.replaceAll("'", "") + "%'");                                      
+                                }
+                        }
 
                         secondPass = true;

@@ -1 +1 @@
 DummyForEclipse
+
+.metadata