UFAL/Autocomplete enhancement

dspace-api/src/main/java/org/dspace/app/util/DCInput.java

@@ -164,6 +164,11 @@ public class DCInput {
      */
     private ComplexDefinition complexDefinition = null;
 
+    /**
+     * give suggestions from this specific autocomplete solr index/file
+     */
+    private String autocompleteCustom = null;
+
     /**
      * the dropdown input type could have defined a default value
      */
@@ -235,6 +240,9 @@ public DCInput(Map<String, String> fieldMap, Map<String, List<String>> listMap,
         if ("complex".equals(inputType)) {
             complexDefinition = complexDefinitions.getByName((fieldMap.get(DCInputsReader.COMPLEX_DEFINITION_REF)));
         }
+        if ("autocomplete".equals(inputType)) {
+            autocompleteCustom = fieldMap.get(DCInputsReader.AUTOCOMPLETE_CUSTOM);
+        }
         hint = fieldMap.get("hint");
         warning = fieldMap.get("required");
         required = warning != null && warning.length() > 0;
@@ -725,6 +733,14 @@ public boolean isMetadataField() {
         return isMetadataField;
     }
 
+    public String getAutocompleteCustom() {
+        return autocompleteCustom;
+    }
+
+    public void setAutocompleteCustom(String autocompleteCustom) {
+        this.autocompleteCustom = autocompleteCustom;
+    }
+
     /**
      * Class representing a Map of the ComplexDefinition object
      * Class is copied from UFAL/CLARIN-DSPACE (https://github.com/ufal/clarin-dspace) and modified by

dspace-api/src/main/java/org/dspace/app/util/DCInputsReader.java

@@ -76,6 +76,11 @@ public class DCInputsReader {
     static final String COMPLEX_DEFINITION_REF = "complex-definition-ref";
     public static final String TYPE_BIND_FIELD_ATTRIBUTE = "field";
 
+    /**
+     * Keyname for storing the name of the custom autocomplete input type
+     */
+    static final String AUTOCOMPLETE_CUSTOM = "autocomplete-custom";
+
 
     /**
      * Reference to the forms definitions map, computed from the forms
@@ -552,6 +557,11 @@ private void handleInputTypeTagName(String formName, Map<String, String> field,
             } else {
                 field.put(COMPLEX_DEFINITION_REF, definitionName);
             }
+        } else if (value.equals("autocomplete")) {
+            String definitionName = getAttribute(nd, AUTOCOMPLETE_CUSTOM);
+            if (definitionName != null) {
+                field.put(AUTOCOMPLETE_CUSTOM, definitionName);
+            }
         }
     }
 

dspace-api/src/main/java/org/dspace/discovery/indexobject/ItemIndexFactoryImpl.java

@@ -605,6 +605,28 @@ public void addDiscoveryFields(SolrInputDocument doc, Context context, Item item
         }
 
 
+
+        // process item metadata
+        // just add _comp to local*
+        List<MetadataValue> mds = itemService.getMetadata(item, "local", Item.ANY, Item.ANY, Item.ANY);
+        for (MetadataValue meta : mds) {
+            String field = "local" + "." + meta.getMetadataField().getElement();
+            String value = meta.getValue();
+            if (value == null) {
+                continue;
+            }
+            String qualifier = meta.getMetadataField().getQualifier();
+            if (qualifier != null && !qualifier.isEmpty()) {
+                field += "." + qualifier;
+            }
+            doc.addField(field + "_comp", value);
+        }
+
+        // create handle_title_ac field
+        String title = item.getName();
+        String handle = item.getHandle();
+        doc.addField("handle_title_ac", handle + ":" + title);
+
         log.debug("  Added Metadata");
 
         try {