Changeset 4385

Timestamp:

01/29/14 13:25:46 (11 years ago)

Author:

twagoo

Message:

merged fix in autocompletedao from 2.18 branch

Location:

vlo/trunk

Files:

• . (modified) (1 prop)
• UPGRADE (modified) (1 prop)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/dao/AutoCompleteDao.java (modified) (1 diff)
• vlo_web_app/src/main/webapp/META-INF/context.xml (modified) (1 diff)

vlo/trunk/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/dao/AutoCompleteDao.java

@@ -11 +11 @@
 /**
  * DAO that delivers suggestions for incomplete terms (autocomplete function)
- * 
+ *
  * @author Thomas Eckart
  *
  */
 public class AutoCompleteDao extends SolrDao {
-        
-        /**
-         * Returns list of suggestions for incomplete input (used for autocomplete function)
-         * @param input user input
-         * @return list of suggestions
-         */
-        public List<String> getChoices(String input) {
-                List<String> choices = new ArrayList<String>();
-                
-                SolrQuery query = new SolrQuery();
-                query.setQuery(input.toLowerCase());
-                query.setQueryType("/suggest");
-                QueryResponse response = fireQuery(query);
-                if(response.getSpellCheckResponse() != null) {
-                        List<Suggestion> suggestions = response.getSpellCheckResponse().getSuggestions();
-                        if(suggestions.size() > 0) {
-                                Iterator<String> iter = suggestions.get(0).getAlternatives().iterator();
-                                while(iter.hasNext()) {
-                                        choices.add(iter.next());
-                                }
-                        }
-                }
-                
-                return choices;
-        }
+
+    /**
+     * Returns list of suggestions for incomplete input (used for autocomplete
+     * function)
+     *
+     * @param input user input
+     * @return list of suggestions
+     */
+    public List<String> getChoices(String input) {
+        List<String> choices = new ArrayList<String>();
+
+        if (input != null) {
+            SolrQuery query = new SolrQuery();
+            query.setQuery(input.toLowerCase());
+            query.setQueryType("/suggest");
+            QueryResponse response = fireQuery(query);
+            if (response.getSpellCheckResponse() != null) {
+                List<Suggestion> suggestions = response.getSpellCheckResponse().getSuggestions();
+                if (suggestions.size() > 0) {
+                    Iterator<String> iter = suggestions.get(0).getAlternatives().iterator();
+                    while (iter.hasNext()) {
+                        choices.add(iter.next());
+                    }
+                }
+            }
+        }
+
+        return choices;
+    }
 }

vlo/trunk/vlo_web_app/src/main/webapp/META-INF/context.xml

@@ -22 +22 @@
 -->
 <Context antiJARLocking="true" path="/vlo">
-  <Parameter name="externalConfig" value="/Users/twagoo/vlo/VloConfig.xml"/>
+  <!--<Parameter name="externalConfig" value="/Users/twagoo/vlo/VloConfig.xml"/>-->
   <!--Parameter name="solrUrl" value="http://localhost:8084/vlo_solr/"/-->
 </Context>