Moved initial letter regular expression into filter configuration.

Author: litvinovg

api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchFilter.java

@@ -25,6 +25,7 @@
 
 public class SearchFilter {
 
+    private static final String DEFAULT_PATTERN = "$0";
     private static final String FILTER = "Filter";
     private static final String RANGE_FILTER = "RangeFilter";
     private static final Log log = LogFactory.getLog(SearchFilter.class);
@@ -57,6 +58,7 @@ private enum SortOption {
     private boolean input = false;
     private Map<String, FilterValue> values = new LinkedHashMap<>();
     private boolean inputRegex = false;
+    private String regexPattern = DEFAULT_PATTERN;
     private boolean facetsRequired;
     private Order valueSortDirection = Order.ASC;
     private String type = FILTER;
@@ -429,4 +431,12 @@ public void setSortOption(String uri) {
             }
         }
     }
+
+    public void setRegexPattern(String regexPattern) {
+        this.regexPattern = regexPattern;
+    }
+
+    public String getInputRegex() {
+        return regexPattern.replace(DEFAULT_PATTERN, inputText);
+    }
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchFiltering.java

@@ -56,7 +56,7 @@ public class SearchFiltering {
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n"
             + "SELECT ?filter_id ?filter_type ?filter_label ?value_label ?value_id  ?field_name ?public ?filter_rank "
-            + "?value_rank (STR(?isUriReq) as ?isUri ) ?multivalued ?input ?regex ?facet ?min ?max ?role "
+            + "?value_rank (STR(?isUriReq) as ?isUri ) ?multivalued ?input ?regex ?regexPattern ?facet ?min ?max ?role "
             + "?value_public ?more_limit ?multilingual ?isDescending\n"
             + "?filterDisplayLimitRole ?valueDisplayLimitRole ?sortingObjectType \n"
             + "WHERE {\n"
@@ -90,6 +90,7 @@ public class SearchFiltering {
             + "    OPTIONAL {?filter search:isUriValues ?isUriReq }\n"
             + "    OPTIONAL {?filter search:userInput ?input }\n"
             + "    OPTIONAL {?filter search:userInputRegex ?regex }\n"
+            + "    OPTIONAL {?filter search:regexPattern ?regexPattern }\n"
             + "    OPTIONAL {?filter search:facetResults ?facet }\n"
             + "    OPTIONAL {?filter search:reverseFacetOrder ?isDescendingDeprecated }\n"
             + "    OPTIONAL {"
@@ -527,6 +528,11 @@ private static SearchFilter createSearchFilter(Map<String, SearchFilter> filters
             filter.setSortOption(sortOption.asResource().getURI());
         }
 
+        RDFNode regexPattern = solution.get("regexPattern");
+        if (regexPattern != null && regexPattern.isLiteral()) {
+            filter.setRegexPattern(regexPattern.asLiteral().getLexicalForm());
+        }
+
         RDFNode moreLimit = solution.get("more_limit");
         if (moreLimit != null && moreLimit.isLiteral()) {
             filter.setMoreLimit(moreLimit.asLiteral().getInt());
@@ -547,11 +553,10 @@ private static void addInputFilter(SearchQuery query, SearchFilter searchFilter)
                 || PagedSearchController.PARAM_QUERY_TEXT.equals(searchFilter.getId())) {
             return;
         }
-        String searchText = searchFilter.getInputText();
         if (searchFilter.isInputRegex()) {
-            query.addFilterQuery(searchFilter.getField() + ":/" + searchText + "/");
+            query.addFilterQuery(searchFilter.getField() + ":/" + searchFilter.getInputRegex() + "/");
         } else {
-            query.addFilterQuery(searchFilter.getField() + ":\"" + searchText + "\"");
+            query.addFilterQuery(searchFilter.getField() + ":\"" + searchFilter.getInputText() + "\"");
         }
     }
 

home/src/main/resources/rdf/display/firsttime/search_individuals_vitro.n3

@@ -29,20 +29,22 @@
         a                           vitro-search:Filter ;
         rdfs:label                  "Label regular expression"@en-US ;
         vitro-search:facetResults   false ;
-        vitro-search:filterField    :field_name_raw ;
-        vitro-search:id             "raw_label_regex" ;
+        vitro-search:filterField    :field_name_lowercase_single_valued ;
+        vitro-search:id             "raw_initial" ;
         vitro-search:public         true ;
         vitro-search:userInput      true ;
+        vitro-search:regexPattern   "$0.*" ;
         vitro-search:userInputRegex true .
 
 :filter_label_regex
         a                           vitro-search:Filter ;
         rdfs:label                  "Label regular expression"@en-US ;
         vitro-search:facetResults   false ;
-        vitro-search:filterField    :field_label_display ;
-        vitro-search:id             "label_regex" ;
+        vitro-search:filterField    :field_label_sort ;
+        vitro-search:id             "initial" ;
         vitro-search:public         true ;
         vitro-search:userInput      true ;
+        vitro-search:regexPattern   "$0.*" ;
         vitro-search:userInputRegex true .
 
 
@@ -112,6 +114,12 @@
         a                          vitro-search:SearchField ;
         vitro-search:indexField    "nameRaw" .
 
+:field_name_lowercase_single_valued
+        a                          vitro-search:SearchField ;
+        vitro-search:indexField    "nameLowercaseSingleValued" .
+
+
+
 :field_category
         a                          vitro-search:SearchField ;
         vitro-search:indexField    "classgroup" .

home/src/main/resources/rdf/tbox/filegraph/search_ontology.n3

@@ -115,6 +115,11 @@ search:userInputRegex
         rdfs:domain                   search:Filter ;
         rdfs:range                    xsd:boolean .
 
+search:regexPattern
+        a                             owl:DatatypeProperty , owl:FunctionalProperty ;
+        rdfs:domain                   search:Filter ;
+        rdfs:range                    xsd:string .
+
 search:sortField  a                   owl:FunctionalProperty , owl:ObjectProperty ;
         rdfs:domain                   search:Sort ;
         rdfs:range                    search:SearchField .

webapp/src/main/webapp/templates/freemarker/body/menupage/browseSearchFilterValues.ftl

@@ -4,9 +4,9 @@
 <#-- <#assign additionalFilters = ["type"]> -->
 <#if filters[searchFilter]??>
     <#if languageAware >
-        <#assign indexFilterName = "label_regex">
+        <#assign indexFilterName = "initial">
     <#else>
-        <#assign indexFilterName = "raw_label_regex">
+        <#assign indexFilterName = "raw_initial">
     </#if>
     <script>
         let searchFormId = "filter-form";
@@ -112,12 +112,6 @@
             </#list>
         <#elseif filters[indexFilterName]?? && filters[indexFilterName].inputText?has_content>
             <#assign selectedLetter = filters[indexFilterName].inputText >
-            <#list i18n().browse_results_alphabetical_index?split(",") as c>
-                <#assign regexValue = "(" + c?lower_case?cap_first + "|" + c?lower_case + "|" + c?upper_case + ").*">
-                <#if filters[indexFilterName].inputText == regexValue >
-                    <#assign selectedLetter = c?upper_case >
-                </#if> 
-            </#list>
             <li>
                 <p class="no-individuals">${i18n().there_are_no_entries_starting_with} ${selectedLetter}</p>
                 <p class="no-individuals">${i18n().try_another_letter}</p>
@@ -190,10 +184,9 @@
             </li>
             <#assign idCounter = 1>
             <#list i18n().browse_results_alphabetical_index?split(",") as c>
-                <#assign regexValue = "(" + c?lower_case?cap_first + "|" + c?lower_case + "|" + c?upper_case + ").*">
                 <li>
-                    <a href="#" <#if indexFilter.inputText == regexValue > class="selected" </#if> >
-                        <@getAlphabetInput indexFilter regexValue sl.getValueID(indexFilter.id, idCounter) />
+                    <a href="#" <#if indexFilter.inputText == c > class="selected" </#if> >
+                        <@getAlphabetInput indexFilter c sl.getValueID(indexFilter.id, idCounter) />
                         <@getAlphabetLabel sl.getValueID(indexFilter.id, idCounter) c?upper_case />
                     </a>
                 </li>