Closes #2736 Import Geonames Data

Author: lbownik

conf/solr/7.3.1/Dockerfile

@@ -18,10 +18,18 @@ RUN cp -r server/solr/configsets/_default server/solr/rorSuggestions \
     && mv solrconfig.xml server/solr/rorSuggestions/conf/ \
     && echo "Configured rorSuggestions"
 
+ADD geonames/schema.xml ./
+ADD geonames/solrconfig.xml ./    
+RUN cp -r server/solr/configsets/_default server/solr/geonames \
+    && mv schema.xml server/solr/geonames/conf/ \
+    && mv solrconfig.xml server/solr/geonames/conf/ \
+    && echo "Configured geonames"  
+    
 USER solr
 
 RUN ./bin/solr start \
     && ./bin/solr create_core -c collection1 -d server/solr/collection1/conf \
     && ./bin/solr create_core -c rorSuggestions -d server/solr/rorSuggestions/conf \
+    && ./bin/solr create_core -c geonames -d server/solr/geonames/conf \
     && echo "Done creating collections"
 

conf/solr/7.3.1/geonames/schema.xml

@@ -6,7 +6,7 @@ export DATAVERSE_SOURCE_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P
 (
   cd "${DATAVERSE_SOURCE_DIR}"
 
-  export BUILD_VERSION="dv-1.0"
+  export BUILD_VERSION="dv-1.1"
   export DATAVERSE_CONFIG_FILES=(
     "conf/glassfish/dataverse.properties"
     "conf/glassfish/default.config"

conf/solr/7.3.1/geonames/solrconfig.xml

@@ -379,6 +379,14 @@ public boolean isGeospatial() {
         return this.datasetFieldType.isGeospatial();
     }
 
+    public boolean isGeoName() {
+        return this.datasetFieldType.isGeoName();
+    }
+    
+    public boolean isPeriodo() {
+        return this.datasetFieldType.isPeriodo();
+    }
+    
     public boolean isVisibleThroughAnonymizedUrl() {
         return this.datasetFieldType.isVisibleThroughAnonymizedUrl();
     }
@@ -484,12 +492,11 @@ private String getUnsanitizedDisplayValue() {
 
     private String getFieldDisplayValue(String value, DatasetFieldType fieldType) {
 
-        if (fieldType.getFieldType().equals(FieldType.PERIODO)) {
+        if (fieldType.isPeriodo()) {
             return  "<a href=\"" + this.fieldValue + "\" target=\"_blank\">" + this.fieldValue +
                     "</a><br>" + PeriodoDictionary.getByUrl(this.fieldValue).get()
                             .getDetails("<b>", "</b>", "<br>");
         }
-        
         String retVal = "";
         if (!StringUtils.isBlank(value) && !DatasetField.NA_VALUE.equals(value)) {
             String format = fieldType.getDisplayFormat();

dev

@@ -9,6 +9,7 @@
 import static javax.persistence.CascadeType.PERSIST;
 import static javax.persistence.CascadeType.REMOVE;
 import static javax.persistence.GenerationType.IDENTITY;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -42,6 +43,9 @@
 
 import org.apache.commons.lang3.StringUtils;
 
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
 import edu.harvard.iq.dataverse.common.BundleUtil;
 import edu.harvard.iq.dataverse.persistence.JpaEntity;
 import edu.harvard.iq.dataverse.persistence.config.JsonMapConverter;
@@ -332,6 +336,17 @@ public InputRendererType getInputRendererType() {
     public String getInputRendererOptions() {
         return inputRendererOptions;
     }
+    
+    public JsonObject getInputRendererOptionsAsJson() {
+        try {
+            return isNotBlank(this.inputRendererOptions)
+                    ? new JsonParser().parse(this.inputRendererOptions).getAsJsonObject()
+                    : new JsonObject();
+        } catch (final Exception e) {
+            throw new RuntimeException(
+                    "Unable to parse input renderer options for field " + this.fieldType, e);
+        }
+    }
 
     public String getValidation() {
         return validation;
@@ -454,6 +469,14 @@ public boolean isGeospatial() {
     public boolean isPeriodo() {
         return this.fieldType.isPeriodo();
     }
+    
+    public boolean isGeoBox() {
+        return this.fieldType.isGeoBox();
+    }
+    
+    public boolean isGeoName() {
+        return this.fieldType.isGeoName();
+    }
 
     @Override
     public int compareTo(DatasetFieldType o) {

fairchive-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/dataset/DatasetField.java

@@ -4,7 +4,7 @@
  * The set of possible metatypes of the field. Used for validation and layout.
  */
 public enum FieldType {
-    TEXT, TEXTBOX, DATE, EMAIL, URL, FLOAT, INT, CHECKBOX, NONE, GEOBOX, PERIODO;
+    TEXT, TEXTBOX, DATE, EMAIL, URL, FLOAT, INT, CHECKBOX, NONE, GEOBOX, PERIODO, GEONAME;
 
     public boolean sanitizeHtml() {
         return this.equals(URL) | this.equals(TEXTBOX);
@@ -34,4 +34,12 @@ public boolean isDate() {
     public boolean isPeriodo() {
         return this.equals(PERIODO);
     }
+    
+    public boolean isGeoBox() {
+        return this.equals(GEOBOX);
+    }
+    
+    public boolean isGeoName() {
+        return this.equals(GEONAME);
+    }
 }

fairchive-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/dataset/DatasetFieldType.java

@@ -51,5 +51,6 @@ public enum InputRendererType {
      * values defined in renderer options
      */
     HIDDEN_VOCABULARY,
-    PERIODO;
+    PERIODO,
+    GEONAME;
 }

fairchive-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/dataset/FieldType.java

@@ -3161,4 +3161,11 @@ periodo.location.desc=Area (description)
 periodo.watermark=Period identifier (eg. p05gbpkdc7d) or name.
 periodo.present=Present times
 periodo.from=From
-periodo.to=To
+periodo.to=To
+
+#geonames
+geoname.id=Identifier
+geoname.name=Name
+geoname.hierarchy=Hierarchy
+geoname.altnames=Alternative names
+geonames.featurecode=Feature code

fairchive-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/dataset/InputRendererType.java

@@ -3113,3 +3113,10 @@ periodo.watermark=Identyfikator okresu (eg. p05gbpkdc7d) lub nazwa.
 periodo.present=Czasy obecne
 periodo.from=Od
 periodo.to=Do
+
+#geonames
+geoname.id=Identyfikator
+geoname.name=Nazwa
+geoname.hierarchy=Hierarchia
+geoname.altnames=Nazwy alternatywne
+geonames.featurecode=Rodzaj