From 127fe4acc54105c57f47a9fd75c870db6ea111f6 Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Mon, 12 Sep 2016 16:20:44 +0000
Subject: [PATCH] 4920: CKAN Metadata Profile advancements: provide vocabulary
 fields single selection or multi and tag field

Task-Url: https://support.d4science.org/issues/4920

Added datatype: time, time_interval, times_listOf instead of date

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/gcubedatacatalogue-metadata-discovery@131307 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 ...rofile.dtd => gCubeMetadataProfile_v1.dtd} |  0
 META-INF/gCubeMetadataProfile_v2.dtd          | 31 +++++++++++++++++++
 .../metadatadiscovery/bean/jaxb/DataType.java |  4 ++-
 .../TestJaxbMetadataMarshUnmarsh.java         |  2 +-
 4 files changed, 35 insertions(+), 2 deletions(-)
 rename META-INF/{gCubeMetadataProfile.dtd => gCubeMetadataProfile_v1.dtd} (100%)
 create mode 100644 META-INF/gCubeMetadataProfile_v2.dtd

diff --git a/META-INF/gCubeMetadataProfile.dtd b/META-INF/gCubeMetadataProfile_v1.dtd
similarity index 100%
rename from META-INF/gCubeMetadataProfile.dtd
rename to META-INF/gCubeMetadataProfile_v1.dtd
diff --git a/META-INF/gCubeMetadataProfile_v2.dtd b/META-INF/gCubeMetadataProfile_v2.dtd
new file mode 100644
index 0000000..607161d
--- /dev/null
+++ b/META-INF/gCubeMetadataProfile_v2.dtd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--<!ENTITY % Boolean "(true|false)">-->
+
+<!ELEMENT metadataformat (metadatafield+)>
+<!ELEMENT metadatafield (fieldName, mandatory, datatype?, defaulValue?, note?, vocabulary?, validator?)>
+<!ELEMENT fieldName (#PCDATA)>
+<!ELEMENT mandatory (#PCDATA)>
+<!ELEMENT datatype (#PCDATA)>  
+<!ELEMENT defaulValue (#PCDATA)> 
+<!ELEMENT note (#PCDATA)> 
+<!ELEMENT vocabulary (vocabularyField+)> 
+<!ATTLIST vocabulary isMultiSelection (true|false) "false">
+<!ELEMENT vocabularyField (#PCDATA)> 
+<!ELEMENT validator (regularExpression)> 
+<!ELEMENT regularExpression (#PCDATA)> 
+
+<!--
+where datatype element is the enum: {String, Date, Text, Boolean, Number}
+<xs:element name="datatype">
+  <xs:simpleType>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="String"/>
+      <xs:enumeration value="Date"/>
+      <xs:enumeration value="Text"/>
+      <xs:enumeration value="Boolean"/>
+      <xs:enumeration value="Number"/>
+    </xs:restriction>
+  </xs:simpleType>
+</xs:element> 
+-->
\ No newline at end of file
diff --git a/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/DataType.java b/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/DataType.java
index 5ac5e1b..13ffcf4 100644
--- a/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/DataType.java
+++ b/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/DataType.java
@@ -18,7 +18,9 @@ import javax.xml.bind.annotation.XmlType;
 public enum DataType {
 
 	String,
-	Date,
+	Time,
+	Time_Interval,
+	Times_ListOf,
 	Text,
 	Boolean,
 	Number;
diff --git a/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestJaxbMetadataMarshUnmarsh.java b/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestJaxbMetadataMarshUnmarsh.java
index 7d80b7e..67967fb 100644
--- a/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestJaxbMetadataMarshUnmarsh.java
+++ b/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestJaxbMetadataMarshUnmarsh.java
@@ -44,7 +44,7 @@ public class TestJaxbMetadataMarshUnmarsh {
 		ckanMetadata.setFieldName("Name");
 		ckanMetadata.setMandatory(true);
 		ckanMetadata.setDefaulValue("default value");
-		ckanMetadata.setDataType(DataType.Date);
+		ckanMetadata.setDataType(DataType.Time);
 		List<String> vocabulary = new ArrayList<String>();
 		vocabulary.add("field1");
 		vocabulary.add("field2");