Changeset 8247

Timestamp:

02/24/10 18:05:35 (5 months ago)

Author:

ssterling

Message:

For Solr Search, now remove AND and OR from incoming search Strings. Put quotes around each author name to make search results more specific.

Files:

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

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

@@ -24 +24 @@
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrDocument;
@@ -70 +71 @@
    */
   public SearchResultSinglePage simpleSearch(String queryString, String eissn, int startPage, int pageSize) throws ApplicationException {
+    queryString = queryString.replaceAll("AND", "").replaceAll("OR", "");
     log.debug("Simple Search performed on the String: " + queryString
         + " startPage: " + startPage
@@ -83 +85 @@
 
   public SearchResultSinglePage advancedSearch(SearchParameters searchParameters) throws ApplicationException {
+    searchParameters = cleanStrings(searchParameters);
     log.debug("Advanced Search performed on the SearchParameters: " + searchParameters);
 
@@ -104 +107 @@
         String creatorName = searchParameters.getCreator()[i];
         if (StringUtils.isNotBlank(creatorName)) {
-          q.append(" author:").append(creatorName);
+          q.append(" author:\"").append(creatorName).append("\"");
         }
         if (i < searchParameters.getCreator().length - 1
@@ -253 +256 @@
     query.setFields("doi", "score", "title", "publication_date", "eissn", "journal", "article_type", "author");
     query.set("spellcheck", true); // Return a list of possible matches for misspelled words.
+    query.setFacet(true);
+    query.set("facet.method", "enum");
+    query.addFacetField("eissn");
+    query.addFacetField("subject_facet");
     return query;
   }
@@ -343 +350 @@
           + ", max_score:" + documentList.getMaxScore()
           + ", QTime:" + queryResponse.getQTime() + "ms");
-    }
+
+      // TODO: implement spell-checking in a meaningful manner.  This loop exists only to generate log output.
+      // TODO: Add "spellcheckAlternatives" or something like it to the SearchHits class so it can be displayed to the user like Google's "did you mean..."
+      // TODO: Turn off spellchecking for the "author" field.
+//      Map<String, List<String>> spellcheckAlternatives = new LinkedHashMap<String, List<String>>();
+//        spellcheckAlternatives.put(token, queryResponse.getSpellCheckResponse().getSuggestionMap().get(token).getAlternatives());
+      if (queryResponse != null && queryResponse.getSpellCheckResponse() != null
+          && queryResponse.getSpellCheckResponse().getSuggestionMap() != null
+          && queryResponse.getSpellCheckResponse().getSuggestionMap().keySet().size() > 0) {
+        StringBuilder sb = new StringBuilder("Spellcheck alternative suggestions:");
+        for (String token : queryResponse.getSpellCheckResponse().getSuggestionMap().keySet()) {
+          sb.append(" { ").append(token).append(" : ");
+          if (queryResponse.getSpellCheckResponse().getSuggestionMap().get(token).getAlternatives().size() < 1) {
+            sb.append("NO ALTERNATIVES");
+          } else {
+            for ( String alternative : queryResponse.getSpellCheckResponse().getSuggestionMap().get(token).getAlternatives()) {
+              sb.append(alternative).append(", ");
+            }
+            sb.replace(sb.length() - 2, sb.length(), ""); // Remove last comma and space.
+          }
+          sb.append(" } ,");
+        }
+        log.info(sb.replace(sb.length() - 2, sb.length(), "").toString()); // Remove last comma and space.
+      } else {
+        log.info("Solr thinks everything in the query is spelled correctly.");
+      }
+
+      // TODO: Implement faceting
+      // TODO: Turn on these facet debug statements and reformat them in a more condensed and readable format.
+//      if (queryResponse.getFacetFields().size() > 0) {
+//        for (FacetField facetField : queryResponse.getFacetFields()) {
+//          log.info(" ### facetField.getName() = " + facetField.getName() + " ::: facetField.getValueCount() = " + facetField.getValueCount());
+//          for (FacetField.Count count : facetField.getValues()) {
+//            log.info("   %%% count.getName() = " + count.getName() + " ::: count.getCount() = " + count.getCount()
+//                + " ::: count.getAsFilterQuery() = " + count.getAsFilterQuery());
+//          }
+//        }
+//      } else {
+//        log.info(" ### There is no facet information for this query.");
+//      }
+    } //  end if (log.isInfoEnabled()).
 
     Map<String, Map<String, List<String>>> highlightings = queryResponse.getHighlighting();
-
-    // TODO: implement spell-checking in a menaingful manner.  This loop exists only to generate log output.
-    // TODO: Add "spellcheckAlternatives" or something like it to the SearchHits class so it can be displayed to the user like Google's "did you mean..."
-    // TODO: Turn off spellchecking for the "author" field.
-//    Map<String, List<String>> spellcheckAlternatives = new LinkedHashMap<String, List<String>>();
-//      spellcheckAlternatives.put(token, queryResponse.getSpellCheckResponse().getSuggestionMap().get(token).getAlternatives());
-    if (log.isInfoEnabled() && queryResponse.getSpellCheckResponse().getSuggestionMap().keySet().size() > 0) {
-      StringBuilder sb = new StringBuilder("Spellcheck alternative suggestions:");
-      for (String token : queryResponse.getSpellCheckResponse().getSuggestionMap().keySet()) {
-        sb.append(" { ").append(token).append(" : ");
-        if (queryResponse.getSpellCheckResponse().getSuggestionMap().get(token).getAlternatives().size() < 1) {
-          sb.append("NO ALTERNATIVES");
-        } else {
-          for ( String alternative : queryResponse.getSpellCheckResponse().getSuggestionMap().get(token).getAlternatives()) {
-            sb.append(alternative).append(", ");
-          }
-          sb.replace(sb.length() - 2, sb.length(), ""); // Remove last comma and space.
-        }
-        sb.append(" } ,");
-      }
-      log.info(sb.replace(sb.length() - 2, sb.length(), "").toString()); // Remove last comma and space.
-    }
 
     List<SearchHit> searchResults = new ArrayList<SearchHit>();
@@ -392 +417 @@
           score, doi, title, highlights, authorList, publicationDate, eissn, journal, articleType);
 
-      log.debug(hit.toString());
+      if (log.isDebugEnabled())
+        log.debug(hit.toString());
 
       searchResults.add(hit);
@@ -457 +483 @@
     return hitHighlights;
   }
+
+  /**
+   * Remove dangerous and unwanted values from the Strings in selected fields in the SearchParameters parameter.
+   *
+   * @param sp A SearchParameters object the needs to have some of its fields "cleaned"
+   * @return The SearchParameters parameter with some of its fields "cleaned"
+   */
+  private SearchParameters cleanStrings(SearchParameters sp) {
+    sp.setQuery(sp.getQuery().replaceAll(" AND", "").replaceAll(" OR", "").replaceAll("AND ", "").replaceAll("OR ", ""));
+    sp.setTextSearchAll(sp.getTextSearchAll().replaceAll(" AND", "").replaceAll(" OR", "").replaceAll("AND ", "").replaceAll("OR ", ""));
+    sp.setTextSearchAtLeastOne(sp.getTextSearchAtLeastOne().replaceAll(" AND", "").replaceAll(" OR", "").replaceAll("AND ", "").replaceAll("OR ", ""));
+    sp.setTextSearchExactPhrase(sp.getTextSearchExactPhrase().replaceAll(" AND", "").replaceAll(" OR", "").replaceAll("AND ", "").replaceAll("OR ", ""));
+    sp.setTextSearchWithout(sp.getTextSearchWithout().replaceAll(" AND", "").replaceAll(" OR", "").replaceAll("AND ", "").replaceAll("OR ", ""));
+    return sp;
+  }
 }