Merge branch '3.2.x' of github.com:geonetwork/core-geonetwork into 3.4.x

Delawen · Delawen · commit 3f28516dc27a · 2017-12-15T16:05:59.000+01:00
diff --git a/core/src/main/java/org/fao/geonet/kernel/search/UserQueryInput.java b/core/src/main/java/org/fao/geonet/kernel/search/UserQueryInput.java
@@ -23,20 +23,19 @@
 
 package org.fao.geonet.kernel.search;
 
+import org.apache.commons.lang.StringUtils;
+import org.fao.geonet.constants.Geonet;
+import org.jdom.Element;
+
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
-import org.fao.geonet.constants.Geonet;
-import org.jdom.Element;
-
 /**
  * Search parameters that can be provided by a search client.
  *
@@ -278,7 +277,13 @@ private void addValues(Map<String, Set<String>> hash, String nodeName, String no
         try {
             if (currentValues == null) {
                 Set<String> values = new LinkedHashSet<String>();
-                values.add(URLDecoder.decode(nodeValue, "UTF-8"));
+                String val = nodeValue;
+                try {
+                    val = URLDecoder.decode(nodeValue, "UTF-8");
+                } catch (IllegalArgumentException iea) {
+                    // keep val as the original nodeValue
+                }
+                values.add(val);
                 hash.put(nodeName, values);
             } else {
                 currentValues.add(URLDecoder.decode(nodeValue, "UTF-8"));
diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/config-editor.xml b/schemas/iso19139/src/main/plugin/iso19139/layout/config-editor.xml
@@ -318,6 +318,7 @@
       <name>srv:serviceTypeVersion</name>
       <name>srv:operationName</name>
       <name>srv:identifier</name>
+      <name>srv:serviceType</name>
     </exclude>
   </multilingualFields>
 
diff --git a/services/src/main/java/org/fao/geonet/api/records/formatters/ConfigFile.java b/services/src/main/java/org/fao/geonet/api/records/formatters/ConfigFile.java
@@ -23,24 +23,22 @@
 
 package org.fao.geonet.api.records.formatters;
 
-import com.google.common.collect.Lists;
-
 import org.fao.geonet.Constants;
 import org.fao.geonet.utils.IO;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.Reader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 public class ConfigFile {
     private static final String CONFIG_PROPERTIES_FILENAME = "config.properties";
     private static final String FIXED_LANG_CONFIG_PROP = "fixedLang";
@@ -52,29 +50,42 @@ public class ConfigFile {
 
     private Properties config;
 
+    /**
+     * Create a new Config file reading the config.properties file from the specific formatter dir, general formatter
+     * dir and schema dir. Properties are override if the same property is found in more than one file. The more general
+     * property is the one in the schema folder and the most specific one is the one from the actual formatter folder.
+     *
+     * @param bundleDir       formatter folder.
+     * @param searchParentDir {@code true} if config.properties in the parent folders must be included.
+     * @param schemaDir       the schema root folder.
+     * @throws IOException thrown if there are problems reading the config files.
+     *
+     * @see ConfigFile#CONFIG_PROPERTIES_FILENAME
+     */
     public ConfigFile(Path bundleDir, boolean searchParentDir, Path schemaDir) throws IOException {
         this.config = new Properties();
-        Path[] properties;
+        List<Path> properties = new ArrayList<>();
         if (searchParentDir) {
             if (schemaDir == null) {
-                properties = new Path[]{
-                    bundleDir.getParent().resolve(CONFIG_PROPERTIES_FILENAME),
-                    bundleDir.resolve(CONFIG_PROPERTIES_FILENAME)};
+                properties.add(bundleDir.getParent().resolve(CONFIG_PROPERTIES_FILENAME));
+                properties.add(bundleDir.resolve(CONFIG_PROPERTIES_FILENAME));
 
             } else {
-                List<Path> tmp = Lists.newArrayList();
                 Path current = bundleDir;
                 while (current.getParent() != null && !schemaDir.equals(current) && Files.exists(current.getParent())) {
-                    tmp.add(current.resolve(CONFIG_PROPERTIES_FILENAME));
+                    properties.add(current.resolve(CONFIG_PROPERTIES_FILENAME));
                     current = current.getParent();
                 }
-                tmp.add(schemaDir.resolve(CONFIG_PROPERTIES_FILENAME));
-                properties = tmp.toArray(new Path[tmp.size()]);
+                properties.add(schemaDir.resolve(CONFIG_PROPERTIES_FILENAME));
             }
         } else {
-            properties = new Path[]{bundleDir.resolve(CONFIG_PROPERTIES_FILENAME)};
+            properties.add(bundleDir.resolve(CONFIG_PROPERTIES_FILENAME));
         }
 
+        // Reverse to allow override (issue #1973):
+        // more general -> file in the schema root
+        // more specific -> file in the formatter dir
+        Collections.reverse(properties);
         for (Path file : properties) {
             if (Files.exists(file)) {
                 try (Reader reader = IO.newBufferedReader(file, Constants.CHARSET)) {
diff --git a/web-ui/src/main/resources/catalog/components/catalog/CatalogService.js b/web-ui/src/main/resources/catalog/components/catalog/CatalogService.js
@@ -533,9 +533,9 @@
         'securityConstraints', 'resourceConstraints', 'legalConstraints',
         'denominator', 'resolution', 'geoDesc', 'geoBox', 'inspirethemewithac',
         'status', 'status_text', 'crs', 'identifier', 'responsibleParty',
-        'mdLanguage', 'datasetLang', 'type', 'link', 'crsDetails'];
-      // See below; probably not necessary
-      var listOfJsonFields = ['keywordGroup', 'crsDetails'];
+        'mdLanguage', 'datasetLang', 'type', 'link', 'crsDetails',
+        'creationDate', 'publicationDate', 'revisionDate'];
+      var listOfJsonFields = ['keywordGroup', 'crsDetails'];    // See below; probably not necessary
       var record = this;
       this.linksCache = [];
       $.each(listOfArrayFields, function(idx) {
diff --git a/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormDirective.js b/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormDirective.js
@@ -194,7 +194,6 @@
       $scope.finalParams = finalParams;
       gnSearchManagerService.gnSearch(finalParams).then(
           function(data) {
-            $scope.searching--;
             $scope.searchResults.records = [];
             for (var i = 0; i < data.metadata.length; i++) {
               $scope.searchResults.records.push(new Metadata(data.metadata[i]));
@@ -225,7 +224,9 @@
                   );
               paging.from = (paging.currentPage - 1) * paging.hitsPerPage + 1;
             }
-          });
+          }).finally(function() {
+        $scope.searching--;
+      });
     };
 
 
diff --git a/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchManagerService.js b/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchManagerService.js
@@ -221,6 +221,8 @@
           } else {
             defer.reject('No records to index');
           }
+        }, function(reason) {
+          defer.reject("error: " + reason);
         });
         return defer.promise;
       };
diff --git a/web-ui/src/main/resources/catalog/views/default/templates/recordView.html b/web-ui/src/main/resources/catalog/views/default/templates/recordView.html
@@ -435,19 +435,22 @@ <h4>
           </h4>
 
           <p>
-          <dl data-ng-show="mdView.current.record.creationDate">
+          <dl data-ng-show="mdView.current.record.creationDate.length > 0">
             <dt data-translate>creationDate</dt>
-            <dd data-gn-humanize-time="{{mdView.current.record.creationDate}}"
+            <dd data-ng-repeat="creaDate in mdView.current.record.creationDate track by $index"
+                data-gn-humanize-time="{{creaDate}}"
                 data-format="YYYY-MM-DD"/>
           </dl>
-          <dl data-ng-show="mdView.current.record.publicationDate">
+          <dl data-ng-show="mdView.current.record.publicationDate.length > 0">
             <dt data-translate>publicationDate</dt>
-            <dd data-gn-humanize-time="{{mdView.current.record.publicationDate}}"
+            <dd data-ng-repeat="pubDate in mdView.current.record.publicationDate track by $index"
+                data-gn-humanize-time="{{pubDate}}"
                 data-format="YYYY-MM-DD"/>
           </dl>
-          <dl data-ng-show="mdView.current.record.revisionDate">
+          <dl data-ng-show="mdView.current.record.revisionDate.length > 0">
             <dt data-translate>revisionDate</dt>
-            <dd data-gn-humanize-time="{{mdView.current.record.revisionDate}}"
+            <dd data-ng-repeat="revDate in mdView.current.record.revisionDate track by $index"
+                data-gn-humanize-time="{{revDate}}"
                 data-format="YYYY-MM-DD"/>
           </dl>
           <dl data-ng-show="mdView.current.record.tempExtentBegin ||

Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,8 @@`
`221`	`221`	`} else {`
`222`	`222`	`defer.reject('No records to index');`
`223`	`223`	`}`
	`224`	`+ }, function(reason) {`
	`225`	`+ defer.reject("error: " + reason);`
`224`	`226`	`});`
`225`	`227`	`return defer.promise;`
`226`	`228`	`};`