Changeset 6041

Timestamp:

02/24/15 13:07:22 (9 years ago)

Author:

Twan Goosen

Message:

Merged fixes to #553 from trunk

Location:

vlo/branches/vlo-3.1

Files:

• . (modified) (1 prop)
• CHANGES (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/FieldValuesFilter.java (modified) (2 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/CachingConverter.java (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProvider.java (modified) (17 diffs)

vlo/branches/vlo-3.1/CHANGES

@@ -4 +4 @@
 * Upgraded a number of dependencies including Solr, Wicket and Spring to a more recent version
         <https://trac.clarin.eu/ticket/541>
-* A facet containing the language code was added
-        <https://trac.clarin.eu/ticket/547>
-* Removed the obsolete 'imdiBrowserUrl' configuration option
+* More fields get indexed for the autocomplete/suggestion function in the search box 
+        <https://trac.clarin.eu/ticket/624>
+* Mapping improvements:
+        * Fallback to fields defined by pattern (path) if no value is found in a field with a matching concept link
+                <https://trac.clarin.eu/ticket/554>
+                <https://trac.clarin.eu/ticket/668>
+        * Automatic curation of values in the 'organisation' facet
+                <https://trac.clarin.eu/ticket/683>
+        * Better support for RFC1766 codes (such as 'en_US' and 'nl_NL')
+                <https://trac.clarin.eu/ticket/686>
+        * The 'language' facet is replaced by an (internal) representation based on language code if applicable
+                <https://trac.clarin.eu/ticket/547>
+        * Regular expressions for national project mapping 
+                <https://trac.clarin.eu/ticket/681>
+        * Content language is stored for descriptions
+                <https://trac.clarin.eu/ticket/667>
+
 
 VLO 3.0.1 (June 2014)

vlo/branches/vlo-3.1/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/FieldValuesFilter.java

@@ -21 +21 @@
 import java.util.regex.Pattern;
 import org.apache.solr.client.solrj.response.FacetField.Count;
+import org.apache.wicket.util.convert.IConverter;
 
 /**
@@ -62 +63 @@
      *
      * @param count count (name + count) to check
+     * @param converter optional converter to apply to value before comparison
      * @return true IFF the {@link Count#getCount() } is more than {@link #getMinimalOccurence()
      * } {@link Count#getName() } contains {@link #getName() } (case
      * insensitive)
      */
-    public boolean matches(Count count) {
-        return count.getCount() >= minimalOccurence
-                && (namePattern == null || namePattern.matcher(count.getName()).find());
+    public boolean matches(Count count, IConverter<String> converter) {
+        if (count.getCount() >= minimalOccurence) {
+            if (namePattern == null) {
+                // no pattern to compare to, always matches
+                return true;
+            } else {
+                // convert value if converter is provided
+                final String value;
+                if (converter == null) {
+                    value = count.getName();
+                } else {
+                    value = converter.convertToString(count.getName(), null);
+                }
+                return namePattern.matcher(value).find();
+            }
+        } else {
+            // too few occurences, no match
+            return false;
+        }
     }
 

vlo/branches/vlo-3.1/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/CachingConverter.java

@@ -67 +67 @@
     public CachingConverter(IConverter<C> converter) {
         this.inner = converter;
+    }
+
+    /**
+     * Convenience factory method for wrapping a converter
+     *
+     * @param <C> The object to convert from and to String
+     * @param inner converter to wrap, can be null
+     * @return a new {@link CachingConverter} instance wrapping the inner
+     * converter, or null if inner is null
+     */
+    public static <C> IConverter<C> wrap(IConverter<C> inner) {
+        if (inner == null) {
+            return null;
+        } else {
+            return new CachingConverter(inner);
+        }
     }
 

vlo/branches/vlo-3.1/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProvider.java

@@ -51 +51 @@
  */
 public class FacetFieldValuesProvider extends SortableDataProvider<FacetField.Count, FieldValuesOrder> implements ListProvider<FacetField.Count> {
-    
+
     private final static Logger logger = LoggerFactory.getLogger(FacetFieldValuesProvider.class);
     private final IModel<FacetField> model;
@@ -90 +90 @@
         this(model, max, lowPriorityValues, new SortParam<FieldValuesOrder>(FieldValuesOrder.COUNT, false), fieldValueConverterProvider);
     }
-    
+
     public FacetFieldValuesProvider(IModel<FacetField> model, int max, SortParam<FieldValuesOrder> sort, FieldValueConverterProvider fieldValueConverterProvider) {
         this(model, max, null, sort, fieldValueConverterProvider);
@@ -120 +120 @@
         return null;
     }
-    
+
     @Override
     public Iterator<? extends FacetField.Count> iterator(long first, long count) {
@@ -126 +126 @@
         return getList().listIterator((int) first);
     }
-    
+
     @Override
     public List<? extends FacetField.Count> getList() {
@@ -139 +139 @@
         }
     }
-    
+
     @Override
     public long size() {
@@ -147 +147 @@
         return size;
     }
-    
+
     @Override
     public IModel<FacetField.Count> model(FacetField.Count object) {
@@ -158 +158 @@
     private Iterable<FacetField.Count> filter(List<FacetField.Count> list) {
         if (hasFilter()) {
+            final IConverter<String> converter = fieldValueConverterProvider.getConverter(model.getObject().getName());
             return Iterables.filter(list, new Predicate<FacetField.Count>() {
                 @Override
                 public boolean apply(Count input) {
-                    return getFilterModel().getObject().matches(input);
+                    return getFilterModel().getObject().matches(input, converter);
                 }
             });
@@ -168 +169 @@
         }
     }
-    
+
     private Iterable<Count> getFilteredValues() {
         if (filtered == null) {
@@ -177 +178 @@
         return filtered;
     }
-    
+
     private long getSize() {
         if (hasFilter()) {
@@ -189 +190 @@
         }
     }
-    
+
     private boolean hasFilter() {
         return getFilterModel() != null && getFilterModel().getObject() != null && !getFilterModel().getObject().isEmpty();
@@ -207 +208 @@
         }
     }
-    
+
     private Ordering getBaseOrdering() {
         final Ordering ordering;
@@ -217 +218 @@
             ordering = Ordering.natural();
         }
-        
+
         if (getSort().isAscending()) {
             return ordering;
@@ -224 +225 @@
         }
     }
-    
+
     protected Locale getLocale() {
         try {
@@ -236 +237 @@
         return Locale.getDefault();
     }
-    
+
     private final static class CountOrdering extends Ordering<FacetField.Count> {
-        
+
         @Override
         public int compare(Count arg0, Count arg1) {
@@ -244 +245 @@
         }
     };
-    
+
     private final static class NameOrdering extends Ordering<FacetField.Count> implements Serializable {
-        
+
         private final Collator collator;
         private final IConverter converter;
         private final Locale locale;
-        
+
         public NameOrdering(Locale locale, IConverter<String> converter) {
             collator = Collator.getInstance(locale);
             collator.setStrength(Collator.PRIMARY);
-            this.converter = new CachingConverter(converter);
+            this.converter = CachingConverter.wrap(converter);
             this.locale = locale;
         }
-        
+
         @Override
         public int compare(Count arg0, Count arg1) {
@@ -275 +276 @@
      */
     private static class PriorityOrdering extends Ordering<FacetField.Count> {
-        
+
         private final Collection<String> lowPriorityValues;
-        
+
         public PriorityOrdering(Collection<String> lowPriorityValues) {
             this.lowPriorityValues = lowPriorityValues;
         }
-        
+
         @Override
         public int compare(Count arg0, Count arg1) {
-            
+
             if (lowPriorityValues.contains(arg0.getName())) {
                 if (!lowPriorityValues.contains(arg1.getName())) {
@@ -298 +299 @@
             return 0;
         }
-        
+
     };
-    
+
     @Override
     public void detach() {