Merge pull request #15 from mpsonntag/v1.1

Updating version 1.1 branch

LICENSE

@@ -0,0 +1,28 @@
+Copyright (c) 2018, German Neuroinformatics Node (G-Node)
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -0,0 +1,43 @@
+# odML - The open metadata markup language - 
+
+This repository collects and maintains odML terminologies. 
+odML Terminologies define terms that can be used for annotating Neuroscientific data 
+in general and electrophysiological data in particular.
+
+More information on odml can be found at the [main odML page](http://www.g-node.org/odml).
+
+Tools and libraries for metadata handling with odml can be found on Github at 
+[https://github.com/G-Node](https://github.com/G-Node)
+
+
+## A brief introduction to odML and metadata
+
+odML (open metadata Markup Language) is a framework, proposed by 
+[Grewe et al. (2011)](http://journal.frontiersin.org/article/10.3389/fninf.2011.00016/full),
+to organize and store experimental metadata in a human- and machine-readable,
+XML based format (odml). In this tutorial we will illustrate the conceptual
+design of the odML framework and show hands-on how you can generate your own
+odML metadata file collection. A well organized metadata management of your
+experiment is a key component to guarantee the reproducibility of your research
+and facilitate the provenance tracking of your analysis projects.
+
+### What are metadata and why are they needed?
+Metadata are data about data. They describe the conditions under which the
+actual raw-data of an experimental study were acquired. The organization of
+such metadata and their accessibility may sound like a trivial task, and
+most laboratories developed their home-made solutions to keep track of
+their metadata. Most of these solutions, however, break down if data and
+metadata need to be shared within a collaboration, because implicit
+knowledge of what is important and how it is organized is often
+underestimated.
+
+While maintaining the relation to the actual raw-data, odML can help to
+collect all metadata which are usually distributed over several files and
+formats, and to store them unitedly which facilitates sharing data and
+metadata.
+
+### Key features of odML
+- open, XML based language, to collect, store and share metadata
+- Machine- and human-readable
+- Python-odML library
+- Interactive odML-Editor

README.txt

@@ -1,13 +0,0 @@
-odml - The open metadata markup language - 
-
-
-This folder contains odml terminologies. 
-odml Terminologies define terms that can be used for annotating electrophysiological data.
-
-
-
-More information on odml can be found on
-www.g-node.org/odml
-
-Tools and libraries for metadata handling with odml can be found on Github:
-https://github.com/G-Node/

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/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

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/blackrock/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/carmenMini/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/cell/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/collection/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/datareference/datacite.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<odML version="1.1">
+    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
+    <version>1.0</version>
+    <date>2019-03-26</date>
+    <!-- *********************************************************        -->
+    <!--                      Data reference section                      -->
+    <!--  The minimal description of a data reference is a URI linking back
+          to the repository the odml file or the data the odml document describes
+          resides in.
+          Further details common to the different types of data reference sections
+          can be added via the reference description section              -->
+    <!-- *********************************************************        -->
+    <section>
+        <type>DataReference</type>
+        <name>DataCite</name>
+        <definition>A published dataset referenced by a DOI and registered with DataCite. The referenced dataset will contain either the odML file itself or the data the odML is annotating.
+        </definition>
+
+        <property>
+            <name>DataDOI</name>
+            <definition>A unique Digital object identifier of data. In the current context a URI linking to the published dataset.</definition>
+            <type>url</type>
+        </property>
+
+        <property>
+            <name>ResourceType</name>
+            <definition>A description of the resource. The format is open, but the preferred format is a single term of some detail so that a pair can be formed with the sub-property.Text formats can be free-text OR terms from the CASRAI Publications resource type list. In the odML context the value will mostly be 'Dataset'.</definition>
+            <type>string</type>
+        </property>
+
+        <section>
+            <type>DataReference</type>
+            <name>DataCiteReference</name>
+            <definition>A publication the published dataset is referencing.</definition>
+            <property>
+                <name>DOI</name>
+                <definition>DOI to the referenced publication</definition>
+                <type>string</type>
+            </property>
+            <property>
+                <name>RefType</name>
+                <definition>refType might be: IsCitedBy, IsSupplementTo, IsReferencedBy, IsPartOf for further valid types see https://schema.datacite.org/meta/kernel-4</definition>
+                <type>string</type>
+            </property>
+            <property>
+                <name>PublicationCitation</name>
+                <definition>Full citation of the reference publication</definition>
+                <type>string</type>
+            </property>
+        </section>
+
+        <section>
+            <type>DataReference</type>
+            <name>DataCiteAuthor</name>
+            <definition>Information about an author as required by DataCite.</definition>
+            <property>
+                <name>FirstName</name>
+                <definition>The authors first Name (John).</definition>
+                <type>string</type>
+            </property>
+
+            <property>
+                <name>LastName</name>
+                <definition>The authors last name (Doe).</definition>
+                <type>string</type>
+            </property>
+            <property>
+                <name>Affiliation</name>
+                <definition>Affiliation of the author [Institute, City, Country]</definition>
+                <type>string</type>
+            </property>
+            <property>
+                <name>Id</name>
+                <definition>Any Id that is capable of identifying the author e.g. ORCID</definition>
+                <type>string</type>
+            </property>
+        </section>
+
+    </section>
+
+</odML>

v1.1/datareference/datadoi.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<odML version="1.1">
+    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
+    <version>1.0</version>
+    <date>2019-03-26</date>
+    <!-- *********************************************************        -->
+    <!--                      Data reference section                      -->
+    <!--  The minimal description of a data reference is a URI linking back
+          to the repository the odml file or the data the odml document describes
+          resides in.
+          Further details common to the different types of data reference sections
+          can be added via the reference description section              -->
+    <!-- *********************************************************        -->
+    <section>
+        <type>DataReference</type>
+        <name>DataDOI</name>
+        <definition>A published dataset referenced by a DOI. The referenced dataset will contain either the odML file itself or the data the odML is annotating.
+        </definition>
+
+        <property>
+            <name>DataDOI</name>
+            <definition>A unique Digital object identifier of data. In the current context a URI linking to the published dataset.</definition>
+            <type>url</type>
+        </property>
+    </section>
+
+</odML>

v1.1/datareference/datauri.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<odML version="1.1">
+    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
+    <version>1.0</version>
+    <date>2019-03-26</date>
+    <!-- *********************************************************        -->
+    <!--                      Data reference section                      -->
+    <!--  The minimal description of a data reference is a URI linking back
+          to the repository the odml file or the data the odml document describes
+          resides in.
+          Further details common to the different types of data reference sections
+          can be added via the reference description section              -->
+    <!-- *********************************************************        -->
+    <section>
+        <type>DataReference</type>
+        <name>DataURI</name>
+        <definition>A published dataset referenced by a URI. The referenced dataset will contain either the odML file itself or the data the odML is annotating.
+        </definition>
+
+        <property>
+            <name>DataURI</name>
+            <definition>A URI linking to the published dataset.</definition>
+            <type>string</type>
+        </property>
+    </section>
+</odML>

v1.1/datareference/dataurl.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
+<odML version="1.1">
+    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
+    <version>1.0</version>
+    <date>2019-03-26</date>
+    <!-- *********************************************************        -->
+    <!--                      Data reference section                      -->
+    <!--  The minimal description of a data reference is a URI linking back
+          to the repository the odml file or the data the odml document describes
+          resides in.
+          Further details common to the different types of data reference sections
+          can be added via the reference description section              -->
+    <!-- *********************************************************        -->
+    <section>
+        <type>DataReference</type>
+        <name>DataURL</name>
+        <definition>A published dataset referenced by a URL. The referenced dataset will contain either the odML file itself or the data the odML is annotating.
+        </definition>
+
+        <property>
+            <name>DataURL</name>
+            <definition>A URL linking to the published dataset.</definition>
+            <type>url</type>
+        </property>
+    </section>
+</odML>

v1.1/datareference/odmlTerms.xsl

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
+
+  <!-- This stylesheet is for viewing odml-terminologies in a web browser -->
+  <!-- Please note: only those elements will be displayed terminology related -->
+  <!-- e.g. uncertainty, id, and valueComments will not be shown -->
+  <!-- For viewing real metadata files use the odml.xsl stylesheet -->
+  <!-- ************************************************  -->
+  <!--                   root template                   -->
+  <xsl:template match="odML">
+    <!-- if there is a base url definition read it and later pass it to the sections template -->
+    <xsl:variable name="repository" select="repository"/>
+    <html>
+      <link href="../../../images/odMLIcon.ico" rel="shortcut icon"
+            csoptsettings="AQAAAD142mNgYNBomeIwObe4IIeBgYEvyTDuaAoPw3IFiwOcndS8HR1NjO0NDPTNdIzzEzOByni+A8EQNoAAPMPEQ4="
+            livesrc="../../../images/odMLIcon.png" />
+      <style type="text/css">
+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
+
+        #navigationContainer { left:20px; width:80%;}
+
+        #contentContainer { left:20px; width:80%;}
+      </style>
+
+      <body>
+        <a name="top" style="color:#336699"><h1>odML - Metadata</h1></a>
+        <div id="navigationContainer">
+          <p>
+            <hr style="color:yellow; background-color:#336699; height:4px; margin-right:0; text-align:right; border:1px dashed black;"/>
+            <h2>Document info</h2>
+            <b>Author: </b><xsl:if test="author"><xsl:value-of select="author"/></xsl:if><br/>
+            <b>Date: </b><xsl:if test="date"><xsl:value-of select="date"/></xsl:if><br/>
+            <b>Version: </b><xsl:if test="version"><xsl:value-of select="version"/></xsl:if><br/>
+            <b>Repository: </b><xsl:if test="repository"><xsl:value-of select="repository"/></xsl:if><br/>
+          </p>
+
+          <hr style="color:yellow; background-color:#336699; height:4px; margin-right:0; text-align:right; border:1px dashed black;"/>
+
+          <h2>Structure</h2>
+          <font size ="-1" >
+            <xsl:if test="section">
+              <xsl:for-each select="section">
+                <li>
+                  <xsl:call-template name="sectionTemplate">
+                    <xsl:with-param name="navigation">1</xsl:with-param>
+                    <xsl:with-param name="anchorBase">Sec</xsl:with-param>
+                    <xsl:with-param name="url" select="$repository"/>
+                  </xsl:call-template>
+                </li>
+              </xsl:for-each>
+            </xsl:if>
+          </font>
+        </div>
+
+        <div id="contentContainer">
+          <hr style="color:yellow; background-color:#336699; height:4px; margin-right:0; text-align:right; border:1px dashed black;"/>
+          <h2>Content</h2>
+          <!-- apply the section template  -->
+          <xsl:if test="section">
+            <xsl:for-each select="section">
+              <xsl:call-template name="sectionTemplate">
+                <xsl:with-param name="navigation">0</xsl:with-param>
+                <xsl:with-param name="anchorBase">Sec</xsl:with-param>
+                <xsl:with-param name="url" select="$repository"/>
+              </xsl:call-template>
+            </xsl:for-each>
+          </xsl:if>
+        </div>
+      </body>
+    </html>
+  </xsl:template>
+
+  <!-- ************************************************  -->
+  <!--              section template.                    -->
+  <xsl:template name="sectionTemplate" match="section">
+    <xsl:param name="navigation"/>
+    <xsl:param name="anchorBase"/>
+    <xsl:param name="url"/>
+    <xsl:variable name="anchorName" select="concat($anchorBase,position())"/>
+    <!-- set new repository if specified within this section otherwise use the old one -->
+    <xsl:variable name="repository">
+      <xsl:choose>
+        <xsl:when test="repository">
+          <xsl:value-of select ="repository"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select ="$url"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <!-- print out the content -->
+    <xsl:choose>
+      <!--  fill the navigation container if this is the task (navigation param = 1) -->
+      <xsl:when test="$navigation = 1">
+        <!-- create a link to the anchor in the content container  -->
+        <ol style="compact">
+          <font size="normal"><a href="#{$anchorName}">
+            <xsl:value-of select="name"/> (type: <xsl:value-of select="type"/>)
+          </a></font>
+          <!--  recursive call if there are subsections  -->
+          <xsl:if test="section">
+            <xsl:for-each select="section">
+              <xsl:call-template name="sectionTemplate">
+                <xsl:with-param name="navigation" select="$navigation"/>
+                <xsl:with-param name="anchorBase" select="concat($anchorName,'SubSec')"/>
+                <xsl:with-param name="url" select="$repository"/>
+              </xsl:call-template>
+            </xsl:for-each>
+          </xsl:if>
+        </ol>
+      </xsl:when>
+      <!--  otherwise use template to display the content (navigation !=1) -->
+      <xsl:otherwise>
+        <a name="{$anchorName}"><h3> <xsl:value-of select="name"/> Section</h3></a>
+        <p>
+          <b>Type: </b><xsl:value-of select="type"/><br/>
+          <xsl:choose>
+            <xsl:when test ="repository">
+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
+            </xsl:when>
+            <xsl:otherwise>
+              <b>Repository: </b><xsl:value-of select="$repository"/><br/>
+            </xsl:otherwise>
+          </xsl:choose>
+          <b>Link: </b><xsl:if test="link"><xsl:value-of select="link"/></xsl:if><br/>
+          <b>Include:</b> <xsl:if test="include"><font color="red"><xsl:value-of select="include"/></font></xsl:if><br/>
+          <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
+        </p>
+
+        <!--  Check if there are any properties  -->
+        <xsl:if test="property">
+          <table border="1" rules="rows" width="100%"><font size="-1">
+            <tr bgcolor="#336699" align="left" valign="middle">
+              <th><font size="+1" color="white"><b>Name</b></font></th>
+              <th><font size="+1" color="white"><b>Value</b></font></th>
+              <th><font size="+1" color="white"><b>Unit</b></font></th>
+              <th><font size="+1" color="white"><b>Type</b></font></th>
+              <th><font size="+1" color="white"><b>Definition</b></font></th>
+              <th><font size="+1" color="white"><b>Dependency</b></font></th>
+              <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
+            </tr>
+            <xsl:for-each select="property">
+              <xsl:variable name="anchor">
+                <xsl:value-of select ="name"/>
+              </xsl:variable>
+              <tr>
+                <td width="15%"><a name="{$anchor}"/>
+                  <p><xsl:value-of select="name"/></p>
+                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
+                <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
+                <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
+                <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
+              </tr>
+            </xsl:for-each></font>
+          </table>
+        </xsl:if>
+        <a href="#top"><tiny>top</tiny></a>
+        <hr style="background-color:#336699; height:1px; margin-right:0; text-align:right;"/>
+        <!--  recursive call if there are subsections  -->
+        <xsl:if test="section">
+          <xsl:for-each select="section">
+            <xsl:call-template name="sectionTemplate">
+              <xsl:with-param name="navigation" select="$navigation"/>
+              <xsl:with-param name="anchorBase" select="concat($anchorName,'SubSec')"/>
+              <xsl:with-param name="url" select="$repository"/>
+            </xsl:call-template>
+          </xsl:for-each>
+        </xsl:if>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+</xsl:stylesheet>

v1.1/datareference/referencedescription.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl"  xmlns:odml="http://www.g-node.org/odml"?>
+<odML version="1.1">
+    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
+    <version>1.0</version>
+    <date>2019-03-26</date>
+    <!-- ********************************************************* -->
+    <!--         Data reference description  section               -->
+    <!-- ********************************************************* -->
+    <section>
+        <type>DataReference</type>
+        <name>DataReferenceDescription</name>
+        <definition>Description of a data reference. This Section is defined to be used as a subsection of the 'DataReference' type sections.</definition>
+
+        <property>
+            <name>Title</name>
+            <definition>Title of the published dataset.</definition>
+            <type>string</type>
+        </property>
+
+        <property>
+            <name>Description</name>
+            <definition>Abstract of the published dataset.</definition>
+            <type>string</type>
+        </property>
+
+        <property>
+            <name>License</name>
+            <definition>License the dataset is published under.</definition>
+            <type>string</type>
+        </property>
+
+        <property>
+            <name>References</name>
+            <definition>List of publications the published dataset is referencing.</definition>
+            <type>string</type>
+        </property>
+
+        <property>
+            <name>Funding</name>
+            <definition>List of grants the published dataset was funded by.</definition>
+            <type>string</type>
+        </property>
+
+        <property>
+            <name>Keywords</name>
+            <definition>List of keywords describing the published dataset.</definition>
+            <type>string</type>
+        </property>
+
+    </section>
+</odML>

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/dataset/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/electrode/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/environment/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/event/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/experiment/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/hardware/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/license/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/model/odmlTerms.xsl

@@ -128,18 +128,15 @@
                <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
             </p>
 
-            <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
             <!--  Check if there are any properties  -->
             <xsl:if test="property">
                <table border="1" rules="rows" width="100%"><font size="-1">
-                  <tr bgcolor="#336699">
+                  <tr bgcolor="#336699" align="left" valign="middle">
                      <th><font size="+1" color="white"><b>Name</b></font></th>
                      <th><font size="+1" color="white"><b>Value</b></font></th>
                      <th><font size="+1" color="white"><b>Unit</b></font></th>
                      <th><font size="+1" color="white"><b>Type</b></font></th>
                      <th><font size="+1" color="white"><b>Definition</b></font></th>
-                     <th><font size="+1" color="white"><b>Mapping</b></font></th>
                      <th><font size="+1" color="white"><b>Dependency</b></font></th>
                      <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
                   </tr>
@@ -151,30 +148,10 @@
                         <td width="15%"><a name="{$anchor}"/>
                            <p><xsl:value-of select="name"/></p>
                         </td>
-                        <td width="10%">
-                           <xsl:for-each select="value">
-                              <p><xsl:value-of select="text()"/><br/></p>
-                           </xsl:for-each>
-                        </td>
-                        <td width="5%">
-                           <xsl:for-each select="value">
-                              <p><xsl:value-of select="unit"/><br/></p>
-                           </xsl:for-each>
-                        </td>
-                        <td width="5%">
-                           <xsl:for-each select="value">
-                              <p><xsl:value-of select="type"/><br/></p>
-                           </xsl:for-each>
-                        </td>
+                        <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                        <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                        <td width="5%"><p><xsl:value-of select="type"/></p></td>
                         <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                        <td width="10%">
-                           <p>
-                              <xsl:for-each select="mapping">
-                                 <xsl:variable name="mapping" select="."/>
-                                 <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                              </xsl:for-each>
-                           </p>
-                        </td>
                         <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                         <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
                      </tr>

v1.1/odML.xsd

@@ -5,31 +5,19 @@
   <!-- THE PROPERTY TYPE IS THE BUILDING BLOCK OF ALL odML METADATA. -->
   <!-- PROPERTIES BASICALLY CONSIST OF name/value PAIRS. -->
   <!-- -->
-  <!-- A: Value Subtype -->
-  <xs:element name ="value" type="xs:string">
-    <xs:complexType>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="uncertainty" type="xs:string" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="unit" type="xs:string" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="reference" type="xs:string" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="definition" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="filename" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="encoder" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="checksum" minOccurs="0" maxOccurs="1"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <!-- B: Property -->
   <xs:element name ="property">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
         <!-- if there is a NAME there must also be a VALUE -->
         <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
-        <xs:element ref="value" minOccurs="1" maxOccurs="unbounded"/>
+        <xs:element name="value" minOccurs="1" maxOccurs="unbounded"/>
         <!-- all other elements are optional -->
+        <xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="uncertainty" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="unit" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="reference" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="value_origin" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element name="definition" type="xs:string" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="mapping" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element name="dependency" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element name="dependencyValue" type="xs:string" minOccurs="0" maxOccurs="1"/>
       </xs:choice>
@@ -48,7 +36,6 @@
         <xs:element name="link" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element name="include" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element name="repository" type="xs:string" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="mapping" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element ref="property" minOccurs="0" maxOccurs="unbounded"/>
         <xs:element ref="section" minOccurs="0" maxOccurs="unbounded"/>
       </xs:choice>

v1.1/odml.xsl

@@ -117,25 +117,24 @@
                <b>Link: </b><xsl:if test="link"><xsl:value-of select="link"/></xsl:if><br/>
                <b>Include:</b> <xsl:if test="include"><font color="red"><xsl:value-of select="include"/></font></xsl:if><br/>
                <b>Definition:</b> <xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
-               <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
             </p>
 
             <!--  Check if there are any properties  -->
             <xsl:if test="property">
                <table border="1" rules="rows" width="100%"><font size ="-1">
-                  <tr bgcolor="#336699">
+                  <tr bgcolor="#336699" valign="middle" align="left">
                      <th><font size="+1" color="white"><b>Name</b></font></th>
                      <th><font size="+1" color="white"><b>Value</b></font></th>
                      <th><font size="+1" color="white"><b>Uncertainty</b></font></th>
                      <th><font size="+1" color="white"><b>Unit</b></font></th>
-                     <th><font size="+1" color="white"><b>value reference</b></font></th>
                      <th><font size="+1" color="white"><b>Type</b></font></th>
-                     <th><font size="+1" color="white"><b>Comment</b></font></th>
+                     <th><font size="+1" color="white"><b>Reference</b></font></th>
+                     <th><font size="+1" color="white"><b>Definition</b></font></th>
+                     <th><font size="+1" color="white"><b>Value origin</b></font></th>
                      <!--
                        <th><font size="+1" color="white"><b>Dependency</b></font></th>
                        <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
                      -->
-                     <th><font size="+1" color="white"><b>Definition</b></font></th>
                   </tr>
                   <xsl:for-each select="property">
                      <xsl:variable name="anchor">
@@ -145,41 +144,17 @@
                         <td width="15%"><a name="{$anchor}"/>
                            <p><xsl:value-of select="name"/></p>
                         </td>
-                        <td width="10%">
-                           <xsl:for-each select="value">
-                              <p><xsl:value-of select="text()"/><br/></p>
-                           </xsl:for-each>
-                        </td>
-                        <td width="5%">
-                           <xsl:for-each select="value">
-                              <p><xsl:value-of select="uncertainty"/><br/></p>
-                           </xsl:for-each>
-                        </td>
-                        <td width="5%">
-                           <xsl:for-each select="value">
-                              <p><xsl:value-of select="unit"/><br/></p>
-                           </xsl:for-each>
-                        </td>
-                        <td width="5%">
-                           <xsl:for-each select="value">
-                              <p><xsl:value-of select="reference"/><br/></p>
-                           </xsl:for-each>
-                        </td>
-                        <td width="5%">
-                           <xsl:for-each select="value">
-                              <p><xsl:value-of select="type"/><br/></p>
-                           </xsl:for-each>
-                        </td>
-                        <td width="22.5%">
-                           <xsl:for-each select="value">
-                              <p><xsl:value-of select="comment"/><br/></p>
-                           </xsl:for-each>
-                        </td>
+                        <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                        <td width="5%"><p><xsl:value-of select="uncertainty"/></p></td>
+                        <td width="5%"><p><xsl:value-of select="unit"/></p></td>
+                        <td width="5%"><p><xsl:value-of select="type"/></p></td>
+                        <td width="5%"><p><xsl:value-of select="reference"/></p></td>
+                        <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
+                        <td width="7.5%%"><p><xsl:value-of select="value_origin"/></p></td>
                         <!--
                           <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                           <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
                         -->
-                        <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
                      </tr>
                   </xsl:for-each></font>
                </table>

v1.1/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/person/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/preparation/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/project/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/protocol/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

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/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

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/recording/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/response/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

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/setup/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/software/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/software/software.xml

@@ -74,7 +74,7 @@
     </property>
 
     <property>
-      <name>Decsription</name>
+      <name>Description</name>
       <definition>The description of the software.</definition>
       <type>string</type>
     </property>

v1.1/stimulus/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

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>
 

v1.1/subject/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/terminologies.xml

@@ -1,6 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="odmlRepository.xsl" xmlns:odml="http://www.g-node.org/odml"?>
 <odML version="1.1">
+
+  <section>
+    <type>DataReference</type>
+    <name>DataCite</name>
+    <definition>A published dataset referenced by a DOI and registered with DataCite. The referenced dataset will contain either the odML file itself or the data the odML is annotating.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.1/datareference/datacite.xml</include>
+  </section>
+
+  <section>
+    <type>DataReference</type>
+    <name>DataDOI</name>
+    <definition>A published dataset referenced by a DOI. The referenced dataset will contain either the odML file itself or the data the odML is annotating.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.1/datareference/datadoi.xml</include>
+  </section>
+
+  <section>
+    <type>DataReference</type>
+    <name>DataURI</name>
+    <definition>A published dataset referenced by a URI. The referenced dataset will contain either the odML file itself or the data the odML is annotating.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.1/datareference/datauri.xml</include>
+  </section>
+
+  <section>
+    <type>DataReference</type>
+    <name>DataURL</name>
+    <definition>A published dataset referenced by a URL. The referenced dataset will contain either the odML file itself or the data the odML is annotating.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.1/datareference/dataurl.xml</include>
+  </section>
+
+  <section>
+    <type>DataReference</type>
+    <name>DataReferenceDescription</name>
+    <definition>Description of a data reference. This Section is defined to be used as a subsection of the 'DataReference' type sections.</definition>
+    <include>http://portal.g-node.org/odml/terminologies/v1.1/datareference/referencedescription.xml</include>
+  </section>
+
   <section>
     <type>analysis</type>
     <name>Analysis</name>