Changeset 8218

Timestamp:

02/11/10 10:55:08 (6 months ago)

Author:

dragisak

Message:

Search2:

• Remove unused field
• Reduce code duplication
• Add fixme comment to use filters

Files:

• head/ambra/webapp/src/main/java/org/topazproject/ambra/search2/service/SolrSearchService.java (modified) (5 diffs)

head/ambra/webapp/src/main/java/org/topazproject/ambra/search2/service/SolrSearchService.java

@@ -29 +29 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Required;
 import org.topazproject.ambra.ApplicationException;
-import org.topazproject.ambra.journal.JournalService;
-import org.topazproject.ambra.models.Journal;
 import org.topazproject.ambra.search2.SearchHit;
 import org.topazproject.ambra.search2.SearchParameters;
@@ -52 +49 @@
   private static final Logger log = LoggerFactory.getLogger(SolrSearchService.class);
 
-  private JournalService journalService; // Injected by Spring.
   private SolrServerFactory serverFactory;
   private int queryTimeout;
@@ -142 +138 @@
     // Form field description: "for at least one of the words:"
     if (searchParameters.getTextSearchAtLeastOne().trim().length() > 0) {
-      q.append(" AND ").append(buildFieldAtLeastOneOfTheWords(
-          searchParameters.getTextSearchOption(), searchParameters.getTextSearchAtLeastOne().trim()));
+      q.append(" AND ").append(
+          addFields(" OR ", searchParameters.getTextSearchOption(), searchParameters.getTextSearchAtLeastOne().trim())
+      );
     }
 
     // Form field description: "for all the words:"
     if (searchParameters.getTextSearchAll().trim().length() > 0) {
-      q.append(" AND ").append(buildFieldAllTheWords(
-          searchParameters.getTextSearchOption(), searchParameters.getTextSearchAll().trim()));
+      q.append(" AND ").append(
+          addFields(" AND ", searchParameters.getTextSearchOption(), searchParameters.getTextSearchAll().trim())
+      );
     }
 
@@ -166 +164 @@
 
     // Form field description: "Journals"
-    if ("some".equals(searchParameters.getJournalOpt())) { // Option "all" does not modify the query.
-      q.append(" AND (");
-      for (String eissn : searchParameters.getLimitToJournal()) {
-        q.append(" eissn:").append(eissn).append(" OR");
-      }
-      q.replace(q.length() - 3, q.length(), " ) "); // Remove last "AND". Add closing parenthesis.
-    }
+    // FIXME: For performance, this should be done with filters not by concatenating "AND" clause.
+    addFilter(q, searchParameters.getJournalOpt(), searchParameters.getLimitToJournal(), " eissn:");
 
     // Form field description: "Subject Categories"
-    if ("some".equals(searchParameters.getSubjectCatOpt())) { // Option "all" does not modify the query.
-      q.append(" AND (");
-      for (String category : searchParameters.getLimitToCategory()) {
-        q.append(" subject:").append(category).append(" OR");
-      }
-      q.replace(q.length() - 3, q.length(), " ) "); // Remove last "AND". Add closing parenthesis.
-    }
+    // FIXME: For performance, this should be done with filters not by concatenating "AND" clause.
+    addFilter(q, searchParameters.getSubjectCatOpt(), searchParameters.getLimitToCategory(), " subject:");
 
     if (q.indexOf(" AND ") == 0)
@@ -189 +177 @@
   }
 
-  /**
-   * Form field description: "Where my words occur:"
-   * 
-   * @param textSearchOption
-   * @param searchString
-   * @return
-   */
-  private StringBuilder buildFieldAtLeastOneOfTheWords(String textSearchOption, String searchString) {
-    StringBuilder sb = new StringBuilder(" ( ");
+  private void addFilter(StringBuilder q, String option, String[] limits, String field) {
+    if ("some".equals(option) && limits.length > 0) { // Option "all" does not modify the query.
+      q.append(" AND (");
+      for (String limit : limits) {
+        q.append(field).append(limit).append(" OR");
+      }
+      q.replace(q.length() - 3, q.length(), " ) "); // Remove last "OR". Add closing parenthesis.
+    }
+  }
+
+  private StringBuilder addFields(String operation, String textSearchOption, String searchString) {
+    StringBuilder sb = new StringBuilder();
     for(String token : searchString.split(" ")) {
+
+      if(sb.length() == 0) {
+        sb.append(" ( ");
+      } else {
+        sb.append(operation);
+      }
+
       if ("abstract".equals(textSearchOption)) {
-        sb.append("abstract:").append(token).append(" OR ");
+        sb.append("abstract:").append(token);
       } else if ("refs".equals(textSearchOption)) {
-        sb.append("citation:").append(token).append(" OR ");
+        sb.append("citation:").append(token);
       } else if ("title".equals(textSearchOption)) {
-        sb.append("title:").append(token).append(" OR ");
+        sb.append("title:").append(token);
       } else {
-        sb.append(token).append(" OR ");
-      }
-    }
-    return sb.replace(sb.length() - 3, sb.length(), ") ");
-  }
-
-  private StringBuilder buildFieldAllTheWords(String textSearchOption, String searchString) {
-    StringBuilder sb = new StringBuilder(" ( ");
-    for(String token : searchString.split(" ")) {
-      if ("abstract".equals(textSearchOption)) {
-        sb.append("abstract:").append(token).append(" AND ");
-      } else if ("refs".equals(textSearchOption)) {
-        sb.append("citation:").append(token).append(" AND ");
-      } else if ("title".equals(textSearchOption)) {
-        sb.append("title:").append(token).append(" AND ");
-      } else {
-        sb.append(token).append(" AND ");
-      }
-    }
-    return sb.replace(sb.length() - 4, sb.length(), ") ");
-  }
-
-  private StringBuilder buildFieldFromTokens(String tokenString, String booleanFunction) {
-    StringBuilder sb = new StringBuilder();
-    for(String token : tokenString.split(" ")) {
-      sb.append(token).append(" ").append(booleanFunction).append(" ");
-    }
-    return sb.replace(sb.length() - booleanFunction.length() - 1, sb.length(), "");
+        sb.append(token);
+      }
+    }
+
+    if (sb.length() > 0) {
+      sb.append(") ");
+    }
+
+    return sb;
   }