Merge pull request #11 from mpsonntag/fixType

[1.1] Replace 'binary' type with 'text'

v1.0/questionnaire/questionnaire.xml

@@ -31,7 +31,7 @@
     <property>
       <name>Question</name>
       <value>
-        <type>question</type>
+        <type>text</type>
       </value>
       <definition>Question of the questionnaire.</definition>
     </property>
@@ -40,7 +40,7 @@
     <property>
       <name>File</name>
       <value>
-        <type>File</type>
+        <type>text</type>
       </value>
       <definition>The binary file with questionnaire.</definition>
     </property>

v1.1/analysis/analysis.xml

@@ -50,18 +50,8 @@
 
     <property>
       <name>CodeFile</name>
-      <type>binary</type>
-      <definition>
-        The program code to analyse the data can be transferred using this property.
-        Using it will blow up the the size of the metadatafile and we recommend to rather define the URL of underlying
-        code file.
-      </definition>
-    </property>
-
-    <property>
-      <name>CodeFileURL</name>
       <type>URL</type>
-      <definition>The URL of the applied piece of program code to actually do the analysis.</definition>
+      <definition>The URL to the applied piece of program code performing the analysis.</definition>
     </property>
 
     <property>
@@ -74,59 +64,26 @@
 
     <property>
       <name>ConfigFile</name>
-      <type>binary</type>
-      <definition>
-        The configurations used to analyse the data can be transferred using this property.
-        Using it will blow up the the size of the metadatafile and we recommend to rather define the URL of underlying
-        configuration file.
-      </definition>
-    </property>
-
-    <property>
-      <name>ConfigFileURL</name>
       <type>URL</type>
-      <definition>The URL of the used configuration file used to run the analysis.</definition>
+      <definition>The URL to the configuration file used to run the analysis.</definition>
     </property>
 
     <property>
       <name>DatasetFile</name>
-      <type>binary</type>
-      <definition>
-        The data analysed ion the described way can be transferred using this property.
-        Using it will blow up the the size of the metadatafile and we recommend to rather define the URL of underlying
-        dataset file.
-      </definition>
-    </property>
-
-    <property>
-      <name>DatasetFileURL</name>
       <type>URL</type>
-      <definition>The URL of a analysed datasetFile.</definition>
+      <definition>The URL to the dataset file the analysis is applied on.</definition>
     </property>
 
     <property>
       <name>ResultFile</name>
-      <type>binary</type>
-      <definition>
-        The results of this analysis can be transferred using this property.
-        Using it will blow up the the size of the metadatafile and we recommend to rather define the URL of the results
-        file.
-      </definition>
-    </property>
-
-    <property>
-      <name>ResultFileURL</name>
       <type>URL</type>
-      <definition>The URL of a results file.</definition>
+      <definition>The URL to the results file the analysis was applied on.</definition>
     </property>
 
     <property>
       <name>ResultFigure</name>
-      <type>binary</type>
-      <definition>
-        A figure showing the results. This property is meant to store the real figure content.
-        This will blow up the the size of the metadatafile and we recommend to rather define the URL of the figure.
-      </definition>
+      <type>URL</type>
+      <definition>The URL to a figure file showing the results of the analysis.</definition>
     </property>
 
     <property>

v1.1/analysis/power_spectrum.xml

@@ -69,11 +69,8 @@
 
     <property>
       <name>Code</name>
-      <type>binary</type>
-      <definition>The program code to analyse the data can be transferred using this property.
-        Using it will blow up the the size of the metadatafile and we recommend to rather define the URL of underlying
-        code file.
-      </definition>
+      <type>URL</type>
+      <definition>The URL to the program code file used to perform the data analysis.</definition>
     </property>
 
     <property>
@@ -92,31 +89,20 @@
 
     <property>
       <name>DatasetFile</name>
-      <type>binary</type>
-      <definition>
-        The data analysed ion the described way can be transferred using this property.
-        Using it will blow up the the size of the metadatafile and we recommend to rather define the URL of underlying
-        dataset file.
-      </definition>
+      <type>URL</type>
+      <definition>The URL to the dataset file the analysis is applied on.</definition>
     </property>
 
     <property>
       <name>ResultFile</name>
-      <type>binary</type>
-      <definition>
-        A file containing the results of this analysis. The results of this analysis can be transferred using this
-        property. Using it will blow up the the size of the metadatafile and we recommend to rather define the URL of
-        the results file.
-      </definition>
+      <type>URL</type>
+      <definition>The URL to the results file the analysis was applied on.</definition>
     </property>
 
     <property>
       <name>ResultFigure</name>
-      <type>binary</type>
-      <definition>
-        This property is meant to store the real figure content. This will blow up the the size
-        of the metadatafile and we recommend to rather define the URL of the figure.
-      </definition>
+      <type>URL</type>
+      <definition>The URL to a figure file showing the results of the analysis.</definition>
     </property>
 
     <property>

v1.1/analysis/psth.xml

@@ -62,15 +62,6 @@
 
     <property>
       <name>CodeFile</name>
-      <type>binary</type>
-      <definition>The program code to analyse the data can be transferred using this property.
-        Using it will blow up the the size of the metadatafile and we recommend to rather define the URL of underlying
-        code file.
-      </definition>
-    </property>
-
-    <property>
-      <name>CodeFileURL</name>
       <type>URL</type>
       <definition>The URL of the applied piece of program code to actually do the analysis.</definition>
     </property>
@@ -85,55 +76,26 @@
 
     <property>
       <name>ConfigFile</name>
-      <type>binary</type>
-      <definition>The configurations used to analyse the data can be transferred using this property.
-        Using it will blow up the the size of the metadatafile and we recommend to rather define the URL of underlying
-        configuration file.
-      </definition>
-    </property>
-
-    <property>
-      <name>ConfigFileURL</name>
       <type>URL</type>
-      <definition>The URL of the used configuration file used to run the analysis.</definition>
+      <definition>The URL to the configuration file used to run the analysis.</definition>
     </property>
 
     <property>
       <name>DatasetFile</name>
-      <type>binary</type>
-      <definition>The data analysed ion the described way can be transferred using this property.
-        Using it will blow up the the size of the metadatafile and we recommend to rather define the URL of underlying
-        dataset file.
-      </definition>
-    </property>
-
-    <property>
-      <name>DatasetFileURL</name>
       <type>URL</type>
-      <definition>The URL of a analysed datasetFile.</definition>
+      <definition>The URL to the dataset file the analysis is applied on.</definition>
     </property>
 
     <property>
       <name>ResultFile</name>
-      <type>binary</type>
-      <definition>The results of this analysis can be transferred using this property.
-        Using it will blow up the the size of the metadatafile and we recommend to rather define the URL of the results
-        file.
-      </definition>
-    </property>
-
-    <property>
-      <name>ResultFileURL</name>
       <type>URL</type>
-      <definition>The URL of a results file.</definition>
+      <definition>The URL to the results file the analysis was applied on.</definition>
     </property>
 
     <property>
       <name>ResultFigure</name>
-      <definition>A figure showing the results. This property is meant to store the real figure content.
-        This will blow up the the size of the metadatafile and we recommend to rather define the URL of the figure.
-      </definition>
-      <type>binary</type>
+      <type>URL</type>
+      <definition>The URL to a figure file showing the results of the analysis.</definition>
     </property>
 
     <property>

v1.1/dataset/dataset.xml

@@ -61,11 +61,8 @@
 
     <property>
       <name>File</name>
-      <type>binary</type>
-      <definition>Data of this dataset. Be aware that including the actual content of a data file by this property
-        will blow up the the size of the metadatafile. We rather recommend to simply refer to the URL of a dataset
-        file using the FileURL property.
-      </definition>
+      <type>URL</type>
+      <definition>The URL to the file containing the data of this dataset.</definition>
     </property>
 
     <property>

v1.1/protocol/protocol.xml

@@ -32,12 +32,6 @@
 
     <property>
       <name>ProtocolFile</name>
-      <definition>Protocol File</definition>
-      <type>binary</type>
-    </property>
-
-    <property>
-      <name>ProtocolFileURL</name>
       <definition>URL for protocol file</definition>
       <type>URL</type>
     </property>

v1.1/questionnaire/questionnaire.xml

@@ -27,13 +27,13 @@
     <property>
       <name>Question</name>
       <definition>Question of the questionnaire.</definition>
-      <type>question</type>
+      <type>text</type>
     </property>
 
     <property>
       <name>File</name>
       <definition>The binary file with questionnaire.</definition>
-      <type>File</type>
+      <type>text</type>
     </property>
 
     <property>

v1.1/response/response.xml

@@ -82,17 +82,7 @@
 
     <property>
       <name>ResponseFile</name>
-      <definition>The response file received. Using it will blow up the the size of the metadatafile and we recommend to
-        rather define the URL of underlying response file.
-      </definition>
-      <type>binary</type>
-    </property>
-
-    <property>
-      <name>ResponseFileURL</name>
-      <definition>The URL of a an received response file. This is the recommended alternative to explicitly including
-        the actual response via ResponseFile.
-      </definition>
+      <definition>The URL to a received response file.</definition>
       <type>URL</type>
     </property>
 

v1.1/stimulus/stimulus.xml

@@ -84,17 +84,7 @@
 
     <property>
       <name>StimulusFile</name>
-      <definition>The stimulus file used. Using it will blow up the the size of the metadatafile and we recommend to
-        rather define the URL of underlying stimulus file.
-      </definition>
-      <type>binary</type>
-    </property>
-
-    <property>
-      <name>StimulusFileURL</name>
-      <definition>The URL of a an applied stimulus file. This is the recommended alternative to explicitely including
-        the actual stimulus via StimulusFile.
-      </definition>
+      <definition>The URL to an applied stimulus file.</definition>
       <type>URL</type>
     </property>