Revize f9654b78

Re #8030: Checkbox pro spell checker BE
- na BE přidána podmínka, zda-li je spellcheck zapnutý či ne

be/fulltextsearch/src/main/java/cz/zcu/kiv/aswi/fulltextsearch/IndexController.java

@@ -24 +24 @@
         LOG.trace("Method index called");
         try {
             LOG.debug("Calling SolrService and its Query method");
-            return solrService.query(searchRequest.getExpression());
+            return solrService.query(searchRequest);
         } catch (Exception e) {
             LOG.error("Cannot get method Query from SolrService returning NULL");
             LOG.error(e.toString());

be/fulltextsearch/src/main/java/cz/zcu/kiv/aswi/fulltextsearch/SolrService.java

@@ -1 +1 @@
 package cz.zcu.kiv.aswi.fulltextsearch;
 
 import cz.zcu.kiv.aswi.fulltextsearch.document.*;
+import cz.zcu.kiv.aswi.fulltextsearch.model.SearchRequest;
 import cz.zcu.kiv.aswi.fulltextsearch.model.SearchResponse;
 import javaxt.io.Image;
 import org.apache.solr.client.solrj.SolrQuery;
@@ -269 +270 @@
         return (byte[]) result.getFieldValue(FIELD_IMG_CONTENT);
     }
 
-    public SearchResponse query(String query) throws IOException, SolrServerException  {
+    public SearchResponse query(SearchRequest searchRequest) throws IOException, SolrServerException  {
         LOG.trace("SolrService method query called");
         LOG.debug("Processing query - creating Solr query");
 
-        query = query.toLowerCase();
+        String query = searchRequest.getExpression().toLowerCase();
         SolrQuery solrQuery = new SolrQuery();
         solrQuery.set("q", FIELD_TEXT_REGION + ":" + query);
         solrQuery.setHighlight(true);
@@ -288 +289 @@
         Map<String, Map<String, List<String>>> highlight = response.getHighlighting();
 
         // if no documents found, try spell checking and call query again with first alternative
-        if (docList.size() < 1) {
+        if (searchRequest.isEnableSpellCheck() && docList.size() < 1) {
             LOG.info("No documents found, trying spell check...");
             SpellCheckResponse spellCheck = response.getSpellCheckResponse();
 
@@ -299 +300 @@
                 if (alternatives.size() > 0) {
                     String alternative = alternatives.get(0);
                     LOG.info("Spell check found alternative \"" + alternative + "\", calling query again with this alternative as parameter.");
-                    return query(alternative);
+                    return query(new SearchRequest(alternative, searchRequest.getTimestamp(), false));
                 }
             }
 

be/fulltextsearch/src/main/java/cz/zcu/kiv/aswi/fulltextsearch/model/SearchRequest.java

@@ -6 +6 @@
 
     private String expression;
     private Date timestamp;
+    private boolean enableSpellCheck;
 
-    public SearchRequest(String expression, Date timestamp) {
+    public SearchRequest(String expression, Date timestamp, boolean enableSpellCheck) {
         this.expression = expression;
         this.timestamp = timestamp;
+        this.enableSpellCheck = enableSpellCheck;
     }
 
     public String getExpression() {
@@ -24 +26 @@
         return timestamp;
     }
 
-    public void setTimestamp(Date timestamp) {
-        this.timestamp = timestamp;
+    public boolean isEnableSpellCheck() {
+        return enableSpellCheck;
     }
 }