Metadata resources

core/src/main/java/org/fao/geonet/kernel/setting/SettingManager.java

@@ -355,17 +355,27 @@ public void setSiteUuid(String siteUuid) {
      */
     public @Nonnull String getSiteURL(String language) {
         LanguageRepository languageRepository = ApplicationContextHolder.get().getBean(LanguageRepository.class);
-        NodeInfo nodeInfo = ApplicationContextHolder.get().getBean(NodeInfo.class);
-
         if(language == null) {
             language = languageRepository.findOneByDefaultLanguage().getId();
         }
 
+        return getNodeURL() + language + "/";
+    }
+
+    /**
+     * Return complete node URL
+     * eg. http://localhost:8080/geonetwork/srv/
+     *
+     * @return
+     */
+    public @Nonnull String getNodeURL() {
+        NodeInfo nodeInfo = ApplicationContextHolder.get().getBean(NodeInfo.class);
+
         String baseURL = pathFinder.getBaseUrl();
         String protocol = getValue(Geonet.Settings.SERVER_PROTOCOL);
         String host    = getValue(Geonet.Settings.SERVER_HOST);
         String port    = getValue(Geonet.Settings.SERVER_PORT);
-        String locServ = baseURL +"/"+ nodeInfo.getId() +"/" + language + "/";
+        String locServ = baseURL +"/"+ nodeInfo.getId() +"/";
 
         return protocol + "://" + host + (port.equals("80") ? "" : ":" + port) + locServ;
     }

core/src/test/java/org/fao/geonet/AbstractCoreIntegrationTest.java

@@ -135,7 +135,6 @@ protected ServiceContext createServiceContext() throws Exception {
         final Constructor<?> constructor = GeonetContext.class.getDeclaredConstructors()[0];
         constructor.setAccessible(true);
         GeonetContext gc = new GeonetContext(_applicationContext, false, null);
-
         contexts.put(Geonet.CONTEXT_NAME, gc);
         final ServiceContext context = new ServiceContext("mockService", _applicationContext, contexts, _entityManager);
         context.setAsThreadLocal();

domain/src/main/java/org/fao/geonet/domain/MetadataResource.java

@@ -0,0 +1,43 @@
+/*
+ * =============================================================================
+ * ===	Copyright (C) 2001-2016 Food and Agriculture Organization of the
+ * ===	United Nations (FAO-UN), United Nations World Food Programme (WFP)
+ * ===	and United Nations Environment Programme (UNEP)
+ * ===
+ * ===	This program is free software; you can redistribute it and/or modify
+ * ===	it under the terms of the GNU General Public License as published by
+ * ===	the Free Software Foundation; either version 2 of the License, or (at
+ * ===	your option) any later version.
+ * ===
+ * ===	This program is distributed in the hope that it will be useful, but
+ * ===	WITHOUT ANY WARRANTY; without even the implied warranty of
+ * ===	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * ===	General Public License for more details.
+ * ===
+ * ===	You should have received a copy of the GNU General Public License
+ * ===	along with this program; if not, write to the Free Software
+ * ===	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ * ===
+ * ===	Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+ * ===	Rome - Italy. email: geonetwork@osgeo.org
+ * ==============================================================================
+ */
+
+package org.fao.geonet.domain;
+
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Created by francois on 31/12/15.
+ */
+@XmlRootElement(name = "resource")
+@XmlAccessorType(XmlAccessType.FIELD)
+public interface MetadataResource {
+    String getId();
+    String getUrl();
+    String getType();
+    double getSize();
+}

domain/src/main/java/org/fao/geonet/domain/MetadataResourceVisibility.java

@@ -0,0 +1,71 @@
+/*
+ * =============================================================================
+ * ===	Copyright (C) 2001-2016 Food and Agriculture Organization of the
+ * ===	United Nations (FAO-UN), United Nations World Food Programme (WFP)
+ * ===	and United Nations Environment Programme (UNEP)
+ * ===
+ * ===	This program is free software; you can redistribute it and/or modify
+ * ===	it under the terms of the GNU General Public License as published by
+ * ===	the Free Software Foundation; either version 2 of the License, or (at
+ * ===	your option) any later version.
+ * ===
+ * ===	This program is distributed in the hope that it will be useful, but
+ * ===	WITHOUT ANY WARRANTY; without even the implied warranty of
+ * ===	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * ===	General Public License for more details.
+ * ===
+ * ===	You should have received a copy of the GNU General Public License
+ * ===	along with this program; if not, write to the Free Software
+ * ===	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ * ===
+ * ===	Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+ * ===	Rome - Italy. email: geonetwork@osgeo.org
+ * ==============================================================================
+ */
+
+package org.fao.geonet.domain;
+
+import javax.persistence.Convert;
+import java.util.Comparator;
+
+/**
+ * Metadata resource visibility.
+ */
+@Convert(converter = MetadataResourceVisibilityConverter.class)
+public enum MetadataResourceVisibility {
+    /**
+     * Accessible by all
+     */
+    PUBLIC("public"),
+    /**
+     * Accessible to user with download privilege
+     */
+    PRIVATE("private");
+
+    String value;
+
+    MetadataResourceVisibility(String value) {
+        this.value = value;
+    }
+
+    public static MetadataResourceVisibility parse(String value) {
+      for (MetadataResourceVisibility metadataResourceVisibility : MetadataResourceVisibility.values()) {
+          if (metadataResourceVisibility.toString().equals(value)) {
+              return metadataResourceVisibility;
+          }
+      }
+      return null;
+    }
+
+    public String toString() {
+        return this.value;
+    }
+
+    public static final Comparator<MetadataResource> sortByFileName =
+            new Comparator<MetadataResource>() {
+                public int compare(MetadataResource o1, MetadataResource o2) {
+                    return o1.getId().compareTo(
+                            o2.getId());
+                }
+            };
+}

domain/src/main/java/org/fao/geonet/domain/MetadataResourceVisibilityConverter.java

@@ -0,0 +1,79 @@
+/*
+ * =============================================================================
+ * ===	Copyright (C) 2001-2016 Food and Agriculture Organization of the
+ * ===	United Nations (FAO-UN), United Nations World Food Programme (WFP)
+ * ===	and United Nations Environment Programme (UNEP)
+ * ===
+ * ===	This program is free software; you can redistribute it and/or modify
+ * ===	it under the terms of the GNU General Public License as published by
+ * ===	the Free Software Foundation; either version 2 of the License, or (at
+ * ===	your option) any later version.
+ * ===
+ * ===	This program is distributed in the hope that it will be useful, but
+ * ===	WITHOUT ANY WARRANTY; without even the implied warranty of
+ * ===	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * ===	General Public License for more details.
+ * ===
+ * ===	You should have received a copy of the GNU General Public License
+ * ===	along with this program; if not, write to the Free Software
+ * ===	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ * ===
+ * ===	Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+ * ===	Rome - Italy. email: geonetwork@osgeo.org
+ * ==============================================================================
+ */
+
+package org.fao.geonet.domain;
+
+import javax.persistence.AttributeConverter;
+import java.beans.PropertyEditorSupport;
+
+/**
+ * Created by francois on 31/12/15.
+ */
+public class MetadataResourceVisibilityConverter
+        extends PropertyEditorSupport
+        implements AttributeConverter<MetadataResourceVisibility, String> {
+    @Override
+    public void setAsText(final String visibility) throws IllegalArgumentException {
+        MetadataResourceVisibility value = MetadataResourceVisibility.parse(visibility.trim());
+        if (value != null) {
+            setValue(value);
+        } else {
+            throw new IllegalArgumentException(
+                    String.format("Unsupported value '%s'. Values are %s.",
+                            visibility,
+                            MetadataResourceVisibility.values().toString()));
+        }
+    }
+
+    @Override
+    public String convertToDatabaseColumn(MetadataResourceVisibility visibility) {
+        switch (visibility) {
+            case PRIVATE:
+                return "P";
+            case PUBLIC:
+                return "A";
+            default:
+                throw new IllegalArgumentException(
+                        String.format("Unsupported value '%s'. Values are %s.",
+                                visibility,
+                                MetadataResourceVisibility.values().toString()));
+        }
+    }
+
+    @Override
+    public MetadataResourceVisibility convertToEntityAttribute(String s) {
+        switch (s) {
+            case "P":
+                return MetadataResourceVisibility.PRIVATE;
+            case "A":
+                return MetadataResourceVisibility.PUBLIC;
+            default:
+                throw new IllegalArgumentException(
+                        String.format("Unsupported value '%s'. Values are %s.",
+                                s,
+                                MetadataResourceVisibility.values().toString()));
+        }
+    }
+}

schemas-test/src/test/java/iso19139/UpdateFixedInfoTest.java

@@ -5,6 +5,7 @@
 import org.fao.geonet.AbstractCoreIntegrationTest;
 import org.fao.geonet.kernel.DataManager;
 import org.fao.geonet.kernel.UpdateDatestamp;
+import org.fao.geonet.services.AbstractServiceIntegrationTest;
 import org.fao.geonet.utils.Xml;
 import org.jdom.Element;
 import org.jdom.Namespace;
@@ -23,7 +24,7 @@
 /**
  * @author Jesse on 3/2/2015.
  */
-public class UpdateFixedInfoTest extends AbstractCoreIntegrationTest {
+public class UpdateFixedInfoTest extends AbstractServiceIntegrationTest {
     private static final List<Namespace> NAMESPACES = Arrays.asList(SRV, GCO, GMD);
     @Autowired
     private DataManager dataManager;

schemas/dublin-core/src/main/plugin/dublin-core/index-fields/default.xsl

@@ -93,19 +93,23 @@
       </xsl:for-each>
 
 
-      <xsl:for-each select="/simpledc/descendant::*
-                        [name(.) = 'dct:references' or
-                              name(.) = 'dc:relation']
-                        [starts-with(., 'http') or
-                              contains(. , 'resources.get') or
-                              contains(., 'file.disclaimer')]">
+      <xsl:for-each select="/simpledc/(dct:references|dc:relation)[normalize-space(.) != '']">
         <xsl:variable name="name" select="tokenize(., '/')[last()]"/>
         <!-- Index link where last token after the last / is the link name. -->
         <Field name="link"
-               string="{concat($name, '|', $name, '|', ., '|WWW-LINK|WWW:LINK|0')}"
+               string="{concat($name, '||', ., '|WWW-LINK|WWW:LINK|0')}"
                store="true"
                index="false"/>
       </xsl:for-each>
+      <xsl:for-each select="/simpledc/(dct:references|dc:relation)[normalize-space(.) != ''
+                              and matches(., '.*(.gif|.png.|.jpeg|.jpg)$', 'i')]">
+        <xsl:variable name="thumbnailType"
+                      select="if (position() = 1) then 'thumbnail' else 'overview'"/>
+        <!-- First thumbnail is flagged as thumbnail and could be considered the main one -->
+        <Field  name="image"
+                string="{concat($thumbnailType, '|', ., '|')}"
+                store="true" index="false"/>
+      </xsl:for-each>
 
 
       <!-- This index for "coverage" requires significant expansion to

schemas/dublin-core/src/main/plugin/dublin-core/process/onlinesrc-add.xsl

@@ -16,17 +16,11 @@ Stylesheet used to update metadata adding a reference to a parent record.
       <xsl:copy-of
           select="dc:*|dct:*"/>
 
-      <dct:references>
-        <xsl:choose>
-          <xsl:when test="not(starts-with($url, 'http'))">
-            upload@<xsl:value-of select="$name"/>
-          </xsl:when>
-          <xsl:otherwise>
+      <xsl:if test="not(dct:references[text() = $url])">
+        <dct:references>
             <xsl:value-of select="$url"/>
-          </xsl:otherwise>
-        </xsl:choose>
-
-      </dct:references>
+        </dct:references>
+      </xsl:if>
     </xsl:copy>
   </xsl:template>
 </xsl:stylesheet>

schemas/dublin-core/src/main/plugin/dublin-core/process/parent-add.xsl

@@ -17,9 +17,11 @@ Stylesheet used to update metadata adding a reference to a parent record.
       <xsl:copy-of
           select="dc:*|dct:*"/>
 
-      <dct:isPartOf>
-        <xsl:value-of select="$parentUuid"/>
-      </dct:isPartOf>
+      <xsl:if test="not(dct:isPartOf[text() = $parentUuid])">
+        <dct:isPartOf>
+          <xsl:value-of select="$parentUuid"/>
+        </dct:isPartOf>
+      </xsl:if>
     </xsl:copy>
   </xsl:template>
 

schemas/dublin-core/src/main/plugin/dublin-core/templates/metadata.xml

@@ -6,7 +6,6 @@
   <dc:subject/>
   <dc:subject/>
   <dc:description/>
-  <dc:relation>http://...</dc:relation>
   <dct:created/>
   <dct:dateSubmitted/>
   <dc:rights/>

schemas/dublin-core/src/main/plugin/dublin-core/templates/metadata_relatedresource.xml

@@ -6,7 +6,6 @@
   <dc:subject/>
   <dc:subject/>
   <dc:description/>
-  <dc:relation>http://...</dc:relation>
   <dct:created/>
   <dct:dateSubmitted/>
   <dc:rights/>

schemas/dublin-core/src/main/plugin/dublin-core/update-fixed-info.xsl

@@ -38,39 +38,4 @@
       </dc:identifier>
     </simpledc>
   </xsl:template>
-
-  <!-- ================================================================= -->
-
-  <xsl:template match="dct:references">
-    <xsl:copy>
-      <xsl:variable name="value" select="normalize-space(.)"/>
-
-      <xsl:choose>
-        <!-- convention: use upload@ prefix in dct:references to identify an uploaded file from metadata editor
-                         dct:refereces stores then the URL to download the uploaded file.
-        -->
-        <xsl:when test="starts-with($value, 'upload@')">
-          <xsl:variable name="valueFixed" select="replace($value,'upload@', '')"/>
-          <xsl:choose>
-            <xsl:when test="/root/env/system/downloadservice/simple='true'">
-              <xsl:value-of select="concat(/root/env/siteURL,'resources.get?uuid=',/root/env/uuid,'&amp;fname=',$valueFixed,'&amp;access=private')"/>
-            </xsl:when>
-            <xsl:when test="/root/env/system/downloadservice/withdisclaimer='true'">
-              <xsl:value-of select="concat(/root/env/siteURL,'file.disclaimer?uuid=',/root/env/uuid,'&amp;fname=',$valueFixed,'&amp;access=private')"/>
-            </xsl:when>
-            <xsl:otherwise> <!-- /root/env/config/downloadservice/leave='true' -->
-              <xsl:value-of select="."/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <!-- if not an uploaded file, keep the value -->
-        <xsl:otherwise> <!-- /root/env/config/downloadservice/leave='true' -->
-          <xsl:value-of select="."/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:copy>
-  </xsl:template>
-
-  <!-- ================================================================= -->
-
 </xsl:stylesheet>