Changeset 6695

Timestamp:

10/21/15 14:13:00 (9 years ago)

Author:

Twan Goosen

Message:

merged changes from 3.3 branch to trunk

Location:

vlo/trunk

Files:

• . (modified) (1 prop)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermScriptFactory.java (modified) (3 diffs)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermScriptFactory.java

@@ -18 +18 @@
 
 import com.google.common.collect.ImmutableSet;
+import java.io.Serializable;
 import java.util.Collection;
 
@@ -24 +25 @@
  * @author Twan Goosen <twan.goosen@mpi.nl>
  */
-public class HighlightSearchTermScriptFactory {
+public class HighlightSearchTermScriptFactory implements Serializable {
 
-    private static final String HIGHLIGHT_FUNCTION = "$('%s').highlight(%s, {className:'%s'})";
+    public static final String HIGHLIGHT_FUNCTION = "$('%s').highlight(%s, {className:'%s', wordsOnly: %s})";
 
-    private static final Collection<String> DEFAULT_EXCLUDE_WORDS = ImmutableSet.of("and", "or", "not", "to");
+    public static final Collection<String> DEFAULT_EXCLUDE_WORDS = ImmutableSet.of("and", "or", "not", "to");
+
+    public static final String DEFAULT_CSS_CLASS = "searchword";
 
     public String createScript(String componentSelector, final String words) {
+        return createScript(componentSelector, words, DEFAULT_CSS_CLASS);
+    }
+
+    public String createScript(String componentSelector, final String words, String cssClass) {
         return String.format(HIGHLIGHT_FUNCTION,
                 componentSelector,
                 makeWordListArray(words),
-                getSearchWordClass()
+                cssClass,
+                matchWordsOnly(words)
         );
+    }
+
+    protected boolean matchWordsOnly(String query) {
+        // string with asterixes or question marks should match by character
+        return !query.matches(".*[\\*\\?].*");
     }
 
@@ -77 +90 @@
                 //or boosting values
                 + "|['\"]?\\^.*"
-                + ")$",
+                + ")$"
+                //also remove wildcard characters
+                + "|[\\?\\*]",
                 //replace with empty string
                 "");
-    }
-
-    /**
-     *
-     * @return CSS class to mark matches with
-     */
-    protected String getSearchWordClass() {
-        return "searchword";
     }