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
This commit is contained in:
parent
0a7ba37651
commit
127fe4acc5
|
@ -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>
|
||||||
|
-->
|
|
@ -18,7 +18,9 @@ import javax.xml.bind.annotation.XmlType;
|
||||||
public enum DataType {
|
public enum DataType {
|
||||||
|
|
||||||
String,
|
String,
|
||||||
Date,
|
Time,
|
||||||
|
Time_Interval,
|
||||||
|
Times_ListOf,
|
||||||
Text,
|
Text,
|
||||||
Boolean,
|
Boolean,
|
||||||
Number;
|
Number;
|
||||||
|
|
|
@ -44,7 +44,7 @@ public class TestJaxbMetadataMarshUnmarsh {
|
||||||
ckanMetadata.setFieldName("Name");
|
ckanMetadata.setFieldName("Name");
|
||||||
ckanMetadata.setMandatory(true);
|
ckanMetadata.setMandatory(true);
|
||||||
ckanMetadata.setDefaulValue("default value");
|
ckanMetadata.setDefaulValue("default value");
|
||||||
ckanMetadata.setDataType(DataType.Date);
|
ckanMetadata.setDataType(DataType.Time);
|
||||||
List<String> vocabulary = new ArrayList<String>();
|
List<String> vocabulary = new ArrayList<String>();
|
||||||
vocabulary.add("field1");
|
vocabulary.add("field1");
|
||||||
vocabulary.add("field2");
|
vocabulary.add("field2");
|
||||||
|
|
Loading…
Reference in New Issue