пре 6 година · 2f838662d1
--- a/v1.0/analysis/odmlTerms.xsl
+++ b/v1.0/analysis/odmlTerms.xsl
@@ -1,5 +1,6 @@
 
				 <?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">
			
 
				+<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 -->
			
@@ -11,18 +12,20 @@
 
				     <!-- 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" />
			
 
				+      <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; }
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-  #navigationContainer { left:20px; width:80%;}
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-  #contentContainer { 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">     
			
 
				+        <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>
			
@@ -35,7 +38,7 @@
 
				           <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" >
			
 
				+          <font size ="-1" >
			
 
				             <xsl:if test="section">
			
 
				               <xsl:for-each select="section">
			
 
				                 <li>
			
@@ -65,13 +68,13 @@
 
				           </xsl:if>
			
 
				         </div>
			
 
				       </body>
			
 
				-    </html> 
			
 
				+    </html>
			
 
				   </xsl:template>
			
 
				 
			
 
				   <!-- ************************************************  -->
			
 
				   <!--              section template.                    -->
			
 
				   <xsl:template name="sectionTemplate" match="section">
			
 
				-    <xsl:param name="navigation"/>   
			
 
				+    <xsl:param name="navigation"/>
			
 
				     <xsl:param name="anchorBase"/>
			
 
				     <xsl:param name="url"/>
			
 
				     <xsl:variable name="anchorName" select="concat($anchorBase,position())"/>
			
@@ -102,9 +105,9 @@
 
				                 <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:call-template>
			
 
				             </xsl:for-each>
			
 
				-          </xsl:if> 
			
 
				+          </xsl:if>
			
 
				         </ol>
			
 
				       </xsl:when>
			
 
				       <!--  otherwise use template to display the content (navigation !=1) -->
			
@@ -151,17 +154,17 @@
 
				                 <td width="10%">
			
 
				                   <xsl:for-each select="value">
			
 
				                     <p><xsl:value-of select="text()"/><br/></p>
			
 
				-                  </xsl:for-each>      
			
 
				+                  </xsl:for-each>
			
 
				                 </td>
			
 
				                 <td width="5%">
			
 
				                   <xsl:for-each select="value">
			
 
				                     <p><xsl:value-of select="unit"/><br/></p>
			
 
				-                  </xsl:for-each>      
			
 
				+                  </xsl:for-each>
			
 
				                 </td>
			
 
				                 <td width="5%">
			
 
				                   <xsl:for-each select="value">
			
 
				                     <p><xsl:value-of select="type"/><br/></p>
			
 
				-                  </xsl:for-each>      
			
 
				+                  </xsl:for-each>
			
 
				                 </td>
			
 
				                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
			
 
				                 <td width="10%">
			
@@ -177,20 +180,20 @@
 
				               </tr>
			
 
				             </xsl:for-each></font>
			
 
				           </table>
			
 
				-        </xsl:if>  
			
 
				+        </xsl:if>
			
 
				         <a href="#top"><tiny>top</tiny></a>
			
 
				-        <hr style="background-color:#336699; height:1px; margin-right:0; text-align:right;"/>  
			
 
				+        <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="anchorBase" select="concat($anchorName,'SubSec')"/>
			
 
				               <xsl:with-param name="url" select="$repository"/>
			
 
				-            </xsl:call-template>      
			
 
				+            </xsl:call-template>
			
 
				           </xsl:for-each>
			
 
				-        </xsl:if> 
			
 
				+        </xsl:if>
			
 
				       </xsl:otherwise>
			
 
				-    </xsl:choose> 
			
 
				+    </xsl:choose>
			
 
				   </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.0/blackrock/odmlTerms.xsl
+++ b/v1.0/blackrock/odmlTerms.xsl
@@ -38,7 +38,7 @@
 
				           <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" >
			
 
				+          <font size ="-1" >
			
 
				             <xsl:if test="section">
			
 
				               <xsl:for-each select="section">
			
 
				                 <li>
			
@@ -49,7 +49,8 @@
 
				                   </xsl:call-template>
			
 
				                 </li>
			
 
				               </xsl:for-each>
			
 
				-            </xsl:if></font>
			
 
				+            </xsl:if>
			
 
				+          </font>
			
 
				         </div>
			
 
				 
			
 
				         <div id="contentContainer">
			
@@ -93,8 +94,10 @@
 
				       <!--  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>
			
 
				+        <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">
			
@@ -109,7 +112,6 @@
 
				       </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/>
			
--- a/v1.0/carmenMini/odmlTerms.xsl
+++ b/v1.0/carmenMini/odmlTerms.xsl
@@ -16,11 +16,11 @@
 
				             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; }
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-  #navigationContainer { left:20px; width:80%;}
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-  #contentContainer { left:20px; width:80%;}
			
 
				+        #contentContainer { left:20px; width:80%;}
			
 
				       </style>
			
 
				 
			
 
				       <body>
			
@@ -93,7 +93,7 @@
 
				     <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  -->
			
 
				+        <!-- 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"/>)
			
@@ -105,9 +105,9 @@
 
				                 <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:call-template>
			
 
				+            </xsl:for-each>
			
 
				+          </xsl:if>
			
 
				         </ol>
			
 
				       </xsl:when>
			
 
				       <!--  otherwise use template to display the content (navigation !=1) -->
			
@@ -149,7 +149,7 @@
 
				               </xsl:variable>
			
 
				               <tr>
			
 
				                 <td width="15%"><a name="{$anchor}"/>
			
 
				-                <p><xsl:value-of select="name"/></p>
			
 
				+                  <p><xsl:value-of select="name"/></p>
			
 
				                 </td>
			
 
				                 <td width="10%">
			
 
				                   <xsl:for-each select="value">
			
--- a/v1.0/odMLTerminologies.xsl
+++ b/v1.0/odMLTerminologies.xsl
@@ -19,7 +19,7 @@
 
				         <h1>odML - Terminologies</h1>
			
 
				         <h3>How to use:</h3>
			
 
				         <p>The terminologies (see below) generally define the names of properties. In some cases we also define
			
 
				-          "values". This is mainly the case if the occurence of a certain property value requires more properties
			
 
				+          "values". This is mainly the case if the occurrence of a certain property value requires more properties
			
 
				           for further specification. One example for this would be the switching frequency on an amplifier used
			
 
				           in an electrophysiological experiment. This property is only meaningful if the amplifier was used in
			
 
				           in a discontinuous operation mode.
			
@@ -33,7 +33,7 @@
 
				           </ul>
			
 
				         </p>
			
 
				         <h3>So far defined terminologies</h3>
			
 
				-        <p>The following Terminologies contain definitions according to the seciton name. If you specify e.g.
			
 
				+        <p>The following Terminologies contain definitions according to the section name. If you specify e.g.
			
 
				           the sample rate of an analog input device include it contained within the respective section into
			
 
				           your odML - file.</p>
			
 
				         <xsl:variable name="baseurl" select="baseURL"/>
			
--- a/v1.1/analysis/analysis.xml
+++ b/v1.1/analysis/analysis.xml
@@ -1,94 +1,146 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?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.1</version>

			
 
				-  <date>2017-03-03</date>

			
 
				-  <!-- ********************************************************* -->

			
 
				-  <!--                     Analysis section                       -->

			
 
				-  <!-- ********************************************************* -->

			
 
				-  <section>

			
 
				-    <type>analysis</type>

			
 
				-    <name>Analysis</name>

			
 
				-    <definition>Sections of the Analysis type can be used to describe analyses.</definition> 

			
 
				-  

			
 
				-    <property>

			
 
				-      <name>Author</name>

			
 
				-      <type>person</type>

			
 
				-      <definition>The name of the person who did the analysis, e.g. 'John Doe' or 'Doe, John'</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Date</name>

			
 
				-      <type>date</type>

			
 
				-      <definition>The date of analysis.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Description</name>

			
 
				-      <type>text</type>

			
 
				-      <definition>A general description of the analysis.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Method</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The name of a method used in this analysis. E.g. "power spectrum".</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>CommandlineCall</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The command used to execute the analysis including the command line parameter.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Comment</name>

			
 
				-      <type>text</type>

			
 
				-      <definition>Specific comments on this analysis.</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> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>CodeRevision</name>

			
 
				-      <type>string</type>

			
 
				-      <definition> If the analysis code is under version control the revision number can be specified using this property.</definition>

			
 
				-    </property> 

			
 
				-        

			
 
				-    <property>

			
 
				-      <name>ConfigFileURL</name>

			
 
				-      <type>URL</type>

			
 
				-      <definition>The URL of the used configuration file used to run the analysis.</definition>

			
 
				-    </property>  

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>DatasetFileURL</name>

			
 
				-      <type>URL</type>

			
 
				-      <definition>The URL of a analysed datasetFile.</definition>

			
 
				-    </property>

			
 
				-

			
 
				-    <property>

			
 
				-      <name>ResultFileURL</name>

			
 
				-      <type>URL</type>

			
 
				-      <definition>The URL of a results file.</definition>

			
 
				-    </property>  

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>PaperDOI</name>

			
 
				-      <type>text</type>

			
 
				-      <definition>If the results of this analysis have been published one can store the doi of the paper.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>PaperURL</name>

			
 
				-      <type>URL</type>

			
 
				-      <definition>If the results of this analysis have been published the URL of the document can be given here</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-  </section> 

			
 
				-</odML>

			
 
				+<?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>2011-01-21</date>
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <!--                     Analysis section                      -->
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <section>
			
 
				+    <type>analysis</type>
			
 
				+    <name>Analysis</name>
			
 
				+    <definition>Sections of the Analysis type can be used to describe analyses.</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Author</name>
			
 
				+      <type>person</type>
			
 
				+      <definition>The name of the person who did the analysis, e.g. 'John Doe' or 'Doe, John'</definition>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Date</name>
			
 
				+      <type>date</type>
			
 
				+      <definition>The date of analysis.</definition>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Description</name>
			
 
				+      <type>text</type>
			
 
				+      <definition>A general description of the analysis.</definition>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Method</name>
			
 
				+      <type>string</type>
			
 
				+      <definition>The name of a method used in this analysis. E.g. "power spectrum".</definition>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>CommandlineCall</name>
			
 
				+      <type>string</type>
			
 
				+      <definition>The command used to execute the analysis including the command line parameter.</definition>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Comment</name>
			
 
				+      <type>text</type>
			
 
				+      <definition>Specific comments on this analysis.</definition>
			
 
				+    </property>
			
 
				+
			
 
				+    <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>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>CodeRevision</name>
			
 
				+      <type>string</type>
			
 
				+      <definition>If the analysis code is under version control the revision number can be specified using this
			
 
				+        property.
			
 
				+      </definition>
			
 
				+    </property>
			
 
				+
			
 
				+    <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>
			
 
				+    </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>
			
 
				+    </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>
			
 
				+    </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>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>PaperDOI</name>
			
 
				+      <type>text</type>
			
 
				+      <definition>If the results of this analysis have been published one can store the doi of the paper.</definition>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>PaperURL</name>
			
 
				+      <type>URL</type>
			
 
				+      <definition>If the results of this analysis have been published the URL of the document can be given here
			
 
				+      </definition>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/analysis/odmlTerms.xsl
+++ b/v1.1/analysis/odmlTerms.xsl
@@ -1,201 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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/>
			
 
				-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
			
 
				-         <xsl:choose>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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/>
			
 
				-         
			
 
				-<!--
			
 
				--->
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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: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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/analysis/power_spectrum.xml
+++ b/v1.1/analysis/power_spectrum.xml
@@ -1,124 +1,136 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?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>2017-03-03</date>
			
 
				+  <date>2011-01-21</date>
			
 
				   <!-- ********************************************************* -->
			
 
				-  <!--                     Analysis section                       -->
			
 
				+  <!--                     Analysis section                      -->
			
 
				   <!-- ********************************************************* -->
			
 
				   <section>
			
 
				     <type>analysis/power_spectrum</type>
			
 
				     <name>Power spectrum</name>
			
 
				     <definition>Properties of this section define the way a power spectrum was calculated.</definition>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Author</name>
			
 
				       <type>person</type>
			
 
				       <definition>The name of the person who did the analysis, e.g. 'John Doe' or 'Doe, John'</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Date</name>
			
 
				-      	<type>date</type>
			
 
				+      <type>date</type>
			
 
				       <definition>The date of analysis.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Description</name>
			
 
				-      	<type>text</type>
			
 
				+      <type>text</type>
			
 
				       <definition>A general description of the analysis.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>SegmentLength</name>
			
 
				-      	<type>int</type>
			
 
				+      <type>int</type>
			
 
				       <definition>The length of the analysed data stretches. Given in samples.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>WindowFunction</name>
			
 
				-      	<type>string</type>
			
 
				+      <type>string</type>
			
 
				       <definition>The type of window used. E.g. Hamming, Hanning, etc.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Overlap</name>
			
 
				-      	<unit>%</unit>
			
 
				-	<definition>The overlap between consecutive data segments. Given in percent of the SegmentLength.</definition>
			
 
				+      <unit>%</unit>
			
 
				+      <type>float</type>
			
 
				+      <definition>The overlap between consecutive data segments. Given in percent of the SegmentLength.</definition>
			
 
				     </property>
			
 
				 
			
 
				-    <property>
			
 
				-      <name>N Overlap</name>
			
 
				-      <type>int</type>
			
 
				-      <definition>The overlap between consecutive data segments given in samples.</definition>
			
 
				-    </property>
			
 
				-        
			
 
				     <property>
			
 
				       <name>Method</name>
			
 
				-	<type>string</type>
			
 
				+      <type>string</type>
			
 
				       <definition>The name of a method used in this analysis. E.g. "power spectrum".</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>CommandlineCall</name>
			
 
				-	<type>string</type>
			
 
				+      <type>string</type>
			
 
				       <definition>The command used to execute the analysis including the command line parameter.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Comment</name>
			
 
				-	<type>text</type>
			
 
				+      <type>text</type>
			
 
				       <definition>Specific comments on this analysis.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Code</name>
			
 
				-      <type>URL</type>
			
 
				-      <definition>The URL of the applied piece of program code to actually do the analysis.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <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>CodeRevision</name>
			
 
				       <type>string</type>
			
 
				-      <definition> If the analysis code is under version control the revision number can be specified using this property.</definition>
			
 
				-    </property> 
			
 
				+      <definition>If the analysis code is under version control the revision number can be specified using this
			
 
				+        property.
			
 
				+      </definition>
			
 
				+    </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>ConfigFile</name>
			
 
				       <type>URL</type>
			
 
				       <definition>The URL of the used configuration file used to run the analysis.</definition>
			
 
				-     </property>  
			
 
				+    </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>DatasetFile</name>
			
 
				-      <type>URL</type>
			
 
				-      <definition>The URL of a analysed datasetFile.</definition>
			
 
				-    </property> 
			
 
				+      <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>ResultFile</name>
			
 
				-      <type>URL</type>
			
 
				-      <definition>The URL of a results file.</definition>
			
 
				-     </property> 
			
 
				-    
			
 
				+      <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>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>ResultFigure</name>
			
 
				-      <type>URL</type>
			
 
				-      <definition>The url of the results figure.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <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>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>PaperDOI</name>
			
 
				       <type>text</type>
			
 
				       <definition>If the results of this analysis have been published one can store the doi of the paper.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>PaperURL</name>
			
 
				-	<type>URL</type>
			
 
				-      <definition>If the results of this analysis have been published the URL of the document can be given here</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				-  </section> 
			
 
				+      <type>URL</type>
			
 
				+      <definition>If the results of this analysis have been published the URL of the document can be given here
			
 
				+      </definition>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				 </odML>
			
--- a/v1.1/analysis/psth.xml
+++ b/v1.1/analysis/psth.xml
@@ -1,108 +1,153 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl"?>
			
 
				 <odML version="1.1">
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				-  <version>1.1</version>
			
 
				-  <date>2017-03-03</date>
			
 
				+  <version>1.0</version>
			
 
				+  <date>2011-01-21</date>
			
 
				   <!-- ********************************************************* -->
			
 
				-  <!--                     PSTH section                       -->
			
 
				+  <!--                     PSTH section                          -->
			
 
				   <!-- ********************************************************* -->
			
 
				   <section>
			
 
				     <type>analysis/psth</type>
			
 
				     <name>PSTH</name>
			
 
				     <definition>An Analysis-type section to describe an PSTH.</definition>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Author</name>
			
 
				       <type>person</type>
			
 
				       <definition>The name of the person who did the analysis, e.g. 'John Doe' or 'Doe, John'</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Date</name>
			
 
				       <type>date</type>
			
 
				       <definition>The date of analysis.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Description</name>
			
 
				       <type>text</type>
			
 
				       <definition>A general description of the analysis.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Method</name>
			
 
				       <type>string</type>
			
 
				-      <value>[instantaneous spike rate, sliding window, discrete window, kernel density]</value>
			
 
				-      
			
 
				-      <definition>Estimation of the firing rate by using the
			
 
				-      inverse of the interspike interval, a sliding window, a
			
 
				-      window that was discretely displaced by the window width, or
			
 
				-      a convolution with a kernel.</definition>
			
 
				+      <value>[instantaneous spike rate, sliding window, discrete window]</value>
			
 
				+      <definition>The method used for creating the PSTH. instantaneous spike rate; Estimation of the firing rate by
			
 
				+        using the inverse of the interspike interval.; sliding window: The window function was slid over the data at
			
 
				+        recording resolution.; discrete window: Spikes were averaged within the window, window discretely displaced by
			
 
				+        the window width.
			
 
				+      </definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>WindowType</name>
			
 
				-      <value>[rectangular, gaussian, alpha, cosine]</value>
			
 
				       <type>string</type>
			
 
				-      <definition>The kind of windowing function used to cerate the firing rate.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <value>[rectangular, gaussian, alpha]</value>
			
 
				+      <definition>The kind of windowing function used to cerate the PSTH.</definition>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>CommandlineCall</name>
			
 
				       <type>string</type>
			
 
				       <definition>The command used to execute the analysis including the command line parameter.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Comment</name>
			
 
				       <type>text</type>
			
 
				       <definition>Specific comments on this analysis.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				+    <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> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>CodeRevision</name>
			
 
				       <type>string</type>
			
 
				-      <definition> If the analysis code is under version control
			
 
				-      the revision number can be specified using this
			
 
				-      property.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <definition>If the analysis code is under version control the revision number can be specified using this
			
 
				+        property.
			
 
				+      </definition>
			
 
				+    </property>
			
 
				+
			
 
				+    <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>
			
 
				-    </property>  
			
 
				-    
			
 
				+    </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>
			
 
				     </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>
			
 
				-    </property>  
			
 
				-    
			
 
				+    </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>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>PaperDOI</name>
			
 
				       <type>text</type>
			
 
				       <definition>If the results of this analysis have been published one can store the doi of the paper.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>PaperURL</name>
			
 
				       <type>URL</type>
			
 
				-      <definition>If the results of this analysis have been published the URL of the document can be given here</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				-  </section> 
			
 
				+      <definition>If the results of this analysis have been published the URL of the document can be given here
			
 
				+      </definition>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				 </odML>
			
--- a/v1.1/blackrock/blackrock.xml
+++ b/v1.1/blackrock/blackrock.xml
--- a/v1.1/blackrock/odmlTerms.xsl
+++ b/v1.1/blackrock/odmlTerms.xsl
@@ -1,199 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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>
			
 
				+          </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>
			
 
				 
			
 
				-         <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
			
 
				+        <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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> 
			
 
				+        <!--  Check if there are any properties  -->
			
 
				+        <xsl:if test="property">
			
 
				+          <table border="1" rules="rows" width="100%"><font size="-1">
			
 
				+            <tr bgcolor="#336699">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/carmenMini/carmen_mini.xml
+++ b/v1.1/carmenMini/carmen_mini.xml
@@ -1,401 +1,465 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				+<?xml version="1.0" encoding="UTF-8"?>

			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				 <!-- ********************************************************* -->

			
 
				-<!--                     Mini section                    				   -->

			
 
				-<!-- ********************************************************* -->  

			
 
				+<!--                     Mini section                          -->

			
 
				+<!-- ********************************************************* -->

			
 
				 <odML version="1.1">

			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				   <version>1.0</version>

			
 
				   <date>2011-01-21</date>

			
 
				-  

			
 
				+

			
 
				   <section>

			
 
				     <type>carmen_mini</type>

			
 
				     <name>Carmen Mini</name>

			
 
				-    <definition>This section that lists the terms of the CARMEN MINI

			
 
				-    (Gibson et al. Nature Precedings, 2009 Version 0.6).</definition>

			
 
				-    

			
 
				+    <definition>This is a convenience section that lists the terms of the CARMEN MINI (Gibson et al. Nature Precedings,

			
 
				+      2009 Version 0.6) and maps them to the odml "standard" terminologies.

			
 
				+    </definition>

			
 
				+

			
 
				     <section>

			
 
				       <type>carmen_mini/contact_and_context</type>

			
 
				       <name>ContactAndContext</name>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>DateAndTime</name>

			
 
				-	<type>datetime</type>

			
 
				-	<definition>The date and time of work initiation in YYYY-MM-DD hh:mm:ss format. (TODO ISO 8601 requires the T lib has to able to deal with it!) </definition>

			
 
				+        <definition>The date and time of work initiation in YYYY-MM-DD hh:mm:ss format. (TODO ISO 8601 requires the T

			
 
				+          lib has to able to deal with it!)

			
 
				+        </definition>

			
 
				+        <type>datetime</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>ResponsiblePerson</name>

			
 
				-	<type>person</type> 

			
 
				-        <definition>The (stable) primary contact person for this data set; this could

			
 
				-	be the experimenter, lab head, line manager etc. Where respon-

			
 
				-	sibility rests with an institutional role (e.g. one of a number of

			
 
				-	duty officers) rather than a person, give the official name of the

			
 
				-	role rather than any one person. In all cases give affliation and

			
 
				-	stable contact information, which consists of (i) Name, (ii) Postal address and (iii) Email address.</definition>

			
 
				+        <definition>The (stable) primary contact person for this data set; this could be the experimenter, lab head,

			
 
				+          line manager etc. Where responsibility rests with an institutional role (e.g. one of a number of duty

			
 
				+          officers) rather than a person, give the official name of the role rather than any one person. In all cases

			
 
				+          give affiliation and stable contact information, which consists of (i) Name, (ii) Postal address and (iii)

			
 
				+          Email address.

			
 
				+        </definition>

			
 
				+        <type>person</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>ExperimentalContext</name>

			
 
				-        <type>text</type> 

			
 
				-	<definition>The name of the project, study or wider investigation of which

			
 
				-	the 'experiment' is a part (if appropriate).</definition>

			
 
				-      </property> 

			
 
				-      

			
 
				+        <definition>The name of the project, study or wider investigation of which the 'experiment' is a part (if

			
 
				+          appropriate).

			
 
				+        </definition>

			
 
				+        <type>text</type>

			
 
				+      </property>

			
 
				+

			
 
				       <property>

			
 
				         <name>ElectrophysiologyType</name>

			
 
				+        <definition>The type of electrophysiology recording reported as 'extra cellular' or 'intra cellular'.

			
 
				+        </definition>

			
 
				         <type>string</type>

			
 
				-        <definition>The type of electrophysiology recording reported as 'extra cellular'

			
 
				-	or 'intra cellular'.</definition>

			
 
				       </property>

			
 
				     </section>

			
 
				-    

			
 
				+

			
 
				     <section>

			
 
				       <type>carmen_mini/study_subject</type>

			
 
				       <name>StudySubject</name>

			
 
				 

			
 
				       <property>

			
 
				         <name>Genus</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The genus classification of the study subject accoring to the NCBI taxonomy calssification.</definition>

			
 
				+        <definition>The genus classification of the study subject according to the NCBI taxonomy classification.

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Species</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The species classification of the study subject accoring to the NCBI taxonomy calssification.</definition>

			
 
				+        <definition>The species classification of the study subject according to the NCBI taxonomy classification.

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Strain</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The strain, genetic variation classification of the study subject, if appropriate. Note this is not the cell line.</definition>

			
 
				+        <definition>The strain, genetic variation classification of the study subject, if appropriate. Note this is not

			
 
				+          the cell line.

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>CellLine</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>The identifier for the immortalized cell line, if appropriate.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>GeneticCharacteristics</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The genotype of the study stubject. Genetics characteristics include polymorphisms, disease alleles and haplotypes.</definition>

			
 
				+        <definition>The genotype of the study stubject. Genetics characteristics include polymorphisms, disease alleles

			
 
				+          and haplotypes.

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>GeneticVariation</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>The genetic modification introduced in addition to strain, if appropriate.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>DeseaseState</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The name of the pathology diagnosed in the subject. The disease state is 'normal' if no disease state has been diagnosed.</definition>

			
 
				+        <definition>The name of the pathology diagnosed in the subject. The disease state is 'normal' if no disease

			
 
				+          state has been diagnosed.

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>ClinicalInformation</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>A link, summary or reference to additional clinical information, if appropriate.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Sex</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>The sex of the subject, in terms of either male, female or hermaphrodite.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Age</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The time period elapsed since an identifiable point in the life cycle of an organism. If a developmental stage is specified the indentifiable point would be the beginning of that stage. Otherwise the identifiable point must be specifies. For example, 2 hours post surgery.</definition>

			
 
				-      </property>   

			
 
				-      

			
 
				+        <definition>The time period elapsed since an identifiable point in the life cycle of an organism. If a

			
 
				+          developmental stage is specified the identifiable point would be the beginning of that stage. Otherwise the

			
 
				+          identifiable point must be specifies. For example, 2 hours post surgery.

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				+      </property>

			
 
				+

			
 
				       <property>

			
 
				         <name>DevelopmentalStage</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The developmental stage of the of the study subect's life cycle.</definition>

			
 
				+        <definition>The developmental stage of the of the study subject's life cycle.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>SubjectLabel</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>If the subject has been chemically labeled or stained; state the label name.</definition>

			
 
				-      </property> 

			
 
				-      

			
 
				+        <type>string</type>

			
 
				+      </property>

			
 
				+

			
 
				       <property>

			
 
				         <name>SubjectIdentifier</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>The type and value of the identifier assigned to the subject.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>SubjectIdentifierType</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The type and value of the identiÃ¯Â¬Âer assigned to the subject. For example, vendor or patient identifier. For patients, the identifier must be approved by an Institutional Review Board or appropriate body.</definition>

			
 
				-      </property>  

			
 
				-      

			
 
				+        <definition>The type and value of the identifier assigned to the subject. For example, vendor or patient

			
 
				+          identifier. For patients, the identifier must be approved by an Institutional Review Board or appropriate

			
 
				+          body.

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				+      </property>

			
 
				+

			
 
				       <property>

			
 
				         <name>SubjectIdentifierValue</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The unique string which corresponds to the identifier type. TODO! How does this relate to the Identifier ?</definition>

			
 
				-      </property>  

			
 
				+        <definition>The unique string which corresponds to the identifier type. TODO! How does this relate to the

			
 
				+          Identifier ?

			
 
				+        </definition>

			
 
				+        <mapping>http://portal.g-node.org/odml/terminologies/v1.1/subject/subject.xml#subject:Identifier</mapping>

			
 
				+        <type>string</type>

			
 
				+      </property>

			
 
				 

			
 
				       <property>

			
 
				         <name>AssociatedSubjectDetails</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The organisation (e.g vendor) or individual repsonsible for the subject.</definition>

			
 
				-      </property>  

			
 
				-      

			
 
				+        <definition>The organisation (e.g vendor) or individual responsible for the subject.</definition>

			
 
				+        <type>string</type>

			
 
				+      </property>

			
 
				+

			
 
				       <property>

			
 
				         <name>PreparationProtocol</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The surgical procedure or the preparation protocol implmented to obtain the specific sample for recording.</definition>

			
 
				-      </property> 

			
 
				+        <definition>The surgical procedure or the preparation protocol implemented to obtain the specific sample for

			
 
				+          recording.

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				+      </property>

			
 
				 

			
 
				       <property>

			
 
				         <name>PreparationDate</name>

			
 
				-        <type>date</type> 

			
 
				-        <definition>The date the surgical procedure or the preparation protocol was performed to obtain the specific sample for recording. Given in the ISO:8601 representation. YYYY-MM-DDThh:mm:ss</definition>

			
 
				+        <definition>The date the surgical procedure or the preparation protocol was performed to obtain the specific

			
 
				+          sample for recording. Given in the ISO:8601 representation. YYYY-MM-DDThh:mm:ss

			
 
				+        </definition>

			
 
				+        <type>date</type>

			
 
				       </property>

			
 
				     </section>

			
 
				-    

			
 
				+

			
 
				     <section>

			
 
				       <type>carmen_mini/recording_location</type>

			
 
				       <name>RecordingLocation</name>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>LocationStructure</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The anatomical part or structure of the subject under investigation or recorded from. For example brain or cell culture.</definition>

			
 
				-      </property>  

			
 
				-      

			
 
				+        <definition>The anatomical part or structure of the subject under investigation or recorded from. For example

			
 
				+          brain or cell culture.

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				+      </property>

			
 
				+

			
 
				       <property>

			
 
				         <name>BrainArea</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>If the anatomical structure under study from 3.(a) is the brain then state the location. If the anatomical structure under study is the mammalian brain then state the location using Neuronames. (http://braininfo.rprc.washington.edu/aboutfolder/aboutbi.html).</definition>

			
 
				+        <definition>If the anatomical structure under study from 3.(a) is the brain then state the location. If the

			
 
				+          anatomical structure under study is the mammalian brain then state the location using Neuronames.

			
 
				+          (http://braininfo.rprc.washington.edu/aboutfolder/aboutbi.html).

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>SliceThickness</name>

			
 
				-        <type>float</type> 

			
 
				+        <definition>The thickness of the recording slice in millimeters.</definition>

			
 
				+        <type>float</type>

			
 
				         <unit>mm</unit>

			
 
				-        <definition>The thickness of the recording slice in milimeters.</definition>

			
 
				       </property>

			
 
				 

			
 
				       <property>

			
 
				         <name>SliceOrientation</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>State the planes of the slice, in terms of either i) coronal (widthways), ii) saggital (lengthways parallel to midline) or iii) tangential (lengthways perpendicular to midline).</definition>

			
 
				+        <definition>State the planes of the slice, in terms of either i) coronal (widthways), ii) saggital (lengthways

			
 
				+          parallel to midline) or iii) tangential (lengthways perpendicular to midline).

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>CellType</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The cell type of the anatomical structure given in 3.(a) under investigation if non mixed. If mixed the target cell type should be provided.</definition>

			
 
				+        <definition>The cell type of the anatomical structure given in 3.(a) under investigation if non mixed. If mixed

			
 
				+          the target cell type should be provided.

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>TargetCellType</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The cell type of the anatomical structure given in 3.(a) under investigation if non mixed. If mixed the target cell type should be provided</definition>

			
 
				+        <definition>The cell type of the anatomical structure given in 3.(a) under investigation if non mixed. If mixed

			
 
				+          the target cell type should be provided

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>ConfirmedCellType</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The method of coordinate assignment given in 2.3.1. Reported as 'anatomy confirmation', 'estimation' or chemical label (this includes antibodies and staining). The label used should be reported in section 2.(l). Additional information such as recodings or image files which also confirm the location can be referenced here.</definition>

			
 
				+        <definition>The method of coordinate assignment given in 2.3.1. Reported as 'anatomy confirmation', 'estimation'

			
 
				+          or chemical label (this includes antibodies and staining). The label used should be reported in section 2.(l).

			
 
				+          Additional information such as recordings or image files which also confirm the location can be referenced

			
 
				+          here.

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				     </section>

			
 
				-    

			
 
				+

			
 
				     <section>

			
 
				       <type>carmen_mini/task</type>

			
 
				       <name>Task</name>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Protocol</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>A description of the task protocol undertaken by the subject.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>SensoryConditions</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>The sensory conditions during the task protocol.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Equipment</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>The Model Name, Model Number and Manufacturer for equipment used in the task protocol.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Recording</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>If the task is recorded state how and what data types are being recorded.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				     </section>

			
 
				-    

			
 
				+

			
 
				     <section>

			
 
				       <type>carmen_mini/stimulus</type>

			
 
				       <name>Stimulus</name>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Protocol</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>A description of the stimulus protocol undertaken by the subject.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>SensoryConditions</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>The sensory conditions during the stimulus protocol.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Solutions</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>Description of the solutions used in terms of name, components with concentrations,(if appropriate).</definition>

			
 
				+        <definition>Description of the solutions used in terms of name, components with concentrations,(if

			
 
				+          appropriate).

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Equipment</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The Model Name, Model Number and Manufacturer for specialised equipment used during the stimulus protocol. If electrode(s) are used then they should be described following the structure presented in ref x.x</definition>

			
 
				+        <definition>The Model Name, Model Number and Manufacturer for specialised equipment used during the stimulus

			
 
				+          protocol. If electrode(s) are used then they should be described following the structure presented in ref x.x

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Recording</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>If the stimulus is recorded state how and what data types are being recorded.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				     </section>

			
 
				-    

			
 
				+

			
 
				     <section>

			
 
				       <type>carmen_mini/behavioural_event</type>

			
 
				       <name>BehaviouralEvent</name>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Event</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>A description of the behavioural event observed.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Equipment</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The equipment use to record the behavioural event, if recorded in terms of The Model Name, Model Number and Manufacturer.</definition>

			
 
				+        <definition>The equipment use to record the behavioural event, if recorded in terms of The Model Name, Model

			
 
				+          Number and Manufacturer.

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>BehaviouralEventRecording</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The type of recording of the behavioural event, the file format and the format encoding.</definition>

			
 
				+        <definition>The type of recording of the behavioural event, the file format and the format encoding.

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				     </section>

			
 
				-    

			
 
				+

			
 
				     <section>

			
 
				       <type>carmen_mini/recording</type>

			
 
				       <name>Recording</name>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Protocol</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>A description of the recording protocol.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Conditions</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The subject conditions during the recording. Invivo or invitro preparation If invivo was it anethesitised or awake? If awake what was the stimulus condition.</definition>

			
 
				+        <definition>The subject conditions during the recording. Invivo or invitro preparation If invivo was it

			
 
				+          anesthetised or awake? If awake what was the stimulus condition.

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>ContainingDevice</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>Containing device temperature of the subject or sample (for example, a bath): Include temperature if appropriate.</definition>

			
 
				+        <definition>Containing device temperature of the subject or sample (for example, a bath): Include temperature if

			
 
				+          appropriate.

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Solutions</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>Description of the solutions used in terms of name, components with concentrations,(if appropriate).</definition>

			
 
				+        <definition>Description of the solutions used in terms of name, components with concentrations,(if

			
 
				+          appropriate).

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>SolutionFlowSpeed</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>The flow speed of the solution described in (ref x.x) in terms of ml/min.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Electrode</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The type of electrode and the Model Name, Model Number and Manufacturer for specialised equipment.</definition>

			
 
				+        <definition>The type of electrode and the Model Name, Model Number and Manufacturer for specialised equipment.

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>ElectrodeConfiguration</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The configuration or arrangement of the electrode. For example, a 2-dimensional array. Also state the distance between each electrode. If the study uses voltage clamp in a patch configuration, state the access resistance (the resistance of the cell membrane, which is in series with the electrode resistance).</definition>

			
 
				+        <definition>The configuration or arrangement of the electrode. For example, a 2-dimensional array. Also state

			
 
				+          the distance between each electrode. If the study uses voltage clamp in a patch configuration, state the

			
 
				+          access resistance (the resistance of the cell membrane, which is in series with the electrode resistance).

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>ElectrodeImpedance</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>The electrode range or impedance of the electrode.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Amplifier</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>The Model Name, Model Number and Manufacturer of the amplifier.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Filter</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>The Model Name, Model Number and Manufacturer of the filter.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>FilterSettings</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>The settings or the parameters of the filter.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>Recorder</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>The Model Name, Model Number and Manufacturer of the recorder.</definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				     </section>

			
 
				-    

			
 
				+

			
 
				     <section>

			
 
				       <type>carmen_mini/timeseries_data</type>

			
 
				       <name>TimeSeriesData</name>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>DataFormat</name>

			
 
				-        <type>string</type> 

			
 
				-        <definition>The name of the data format of the time series data and specific encoding. For example, ASCII or binary encoding.</definition>

			
 
				+        <definition>The name of the data format of the time series data and specific encoding. For example, ASCII or

			
 
				+          binary encoding.

			
 
				+        </definition>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				 

			
 
				       <property>

			
 
				         <name>SamplingRate</name>

			
 
				-        <type>string</type> 

			
 
				         <definition>The sampling rate of the recording.</definition>

			
 
				+        <mapping>http://portal.g-node.org/odml/terminologies/v1.1/hardware/daq.xml#hardware/daq:AISampleRate</mapping>

			
 
				+        <type>string</type>

			
 
				       </property>

			
 
				-      

			
 
				+

			
 
				       <property>

			
 
				         <name>FileLocation</name>

			
 
				-        <type>URL</type> 

			
 
				-        <definition>The time series file location should be made available when the experiment is published, for example, using a Uniform Resource Identifier (URI) or a Digital Object Identifier (DOI). (Note this will be achieved automatically via submission to the CARMEN system).</definition>

			
 
				+        <definition>The time series file location should be made available when the experiment is published, for

			
 
				+          example, using a Uniform Resource Identifier (URI) or a Digital Object Identifier (DOI). (Note this will be

			
 
				+          achieved automatically via submission to the CARMEN system).

			
 
				+        </definition>

			
 
				+        <type>URL</type>

			
 
				       </property>

			
 
				     </section>

			
 
				-  </section> 

			
 
				+

			
 
				+  </section>

			
 
				 </odML>

			
--- a/v1.1/carmenMini/odmlTerms.xsl
+++ b/v1.1/carmenMini/odmlTerms.xsl
@@ -1,201 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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/>
			
 
				-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
			
 
				-         <xsl:choose>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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/>
			
 
				-         
			
 
				-<!--
			
 
				--->
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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: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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/cell/cell.xml
+++ b/v1.1/cell/cell.xml
@@ -1,132 +1,125 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?> 
			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl"
			
 
				-xmlns:odml="http://www.g-node.org/odml"?> 
			
 
				-
			
 
				-<!-- ********************************************************* --> 
			
 
				-<!--                   Cell section                            --> 
			
 
				-<!-- ********************************************************* -->
			
 
				+<?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>2011-01-21</date> <!--
			
 
				-  <section> 
			
 
				-    <type>cell</type> 
			
 
				+  <date>2011-01-21</date>
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <!--                            Cell section                   -->
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <section>
			
 
				+    <type>cell</type>
			
 
				     <name>Cell</name>
			
 
				-    <definition>Specification of the recorded cell. A cell definition
			
 
				-    should be a subsection of the <a href="../subject/subject.xml">Subject</a> section.</definition>
			
 
				-    
			
 
				+    <definition>Specification of the recorded cell. A cell definition should be a subsection of the
			
 
				+      <a href="../subject/subject.xml">Subject</a>
			
 
				+      section.
			
 
				+    </definition>
			
 
				+
			
 
				     <property>
			
 
				       <name>Type</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The type of the recorded cell. E.g. pyramidal cell.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>BrainRegion</name>
			
 
				+      <definition>The region the cell is located in. For example Retina, Cortex, Cerebellum etc.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The region the cell is located in. For example
			
 
				-      Retina, Cortex, Cerebellum etc.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>BrainSubRegion</name>
			
 
				+      <definition>More detailed specification of the region the cell is located in. For example, if BrainRegion is
			
 
				+        "hippocampus", then the BrainSubRegion may be "CA1".
			
 
				+      </definition>
			
 
				       <type>string</type>
			
 
				-      <definition>More detailed specification of the region the
			
 
				-      cell is located in. For example, if BrainRegion is
			
 
				-      "hippocampus", then the BrainSubRegion may be "CA1".</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Layer</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The name of the layer. For example, layer 4 in CA1.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Ganglion</name>
			
 
				+      <definition>Like the pro-, meta- and mesothoracal ganglion in invertebrates.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>Like the pro-, meta- and mesothoracal ganglion
			
 
				-      in invertebrates.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Structure</name>
			
 
				+      <definition>The structure of the organism the cell is located in e.g. Eye, Spinal cord...</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The structure of the organism the cell is
			
 
				-      located in e.g. Eye, Spinal cord...</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>RecordingLocation</name>
			
 
				+      <definition>The recording location in the cell. E.g. axonal, dendritic, somatic, ...</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The recording location in the cell. E.g. axonal, dendritic,
			
 
				-      somatic, ...</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Identification</name>
			
 
				-      <type>string</type>
			
 
				       <definition>How was the cell identified?</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>RestingPotential</name>
			
 
				+      <definition>What is the cells resting potential of the cell. An indicator for the recording quality.</definition>
			
 
				       <type>float</type>
			
 
				       <unit>mV</unit>
			
 
				-      <definition>What is the cells resting potential of the
			
 
				-      cell. An indiator for the recording quality.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>BaselineRate</name>
			
 
				+      <definition>For spiking cells, the spontaneous activity which might be an indicator for the cell's health status
			
 
				+        and thus recording quality.
			
 
				+      </definition>
			
 
				       <type>float</type>
			
 
				       <unit>Hz</unit>
			
 
				-      <definition>For spiking cells, the spontaneous activity
			
 
				-      which might be an indicator for the cell's health status and
			
 
				-      thus recording quality.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>BaselineNoise</name>
			
 
				+      <definition>The standard deviation of the baseline membrane potential.</definition>
			
 
				       <type>float</type>
			
 
				-      <definition>The standard deviation of the baseline
			
 
				-      membrane potential.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Rheobase</name>
			
 
				+      <definition>The minimum current required to make the cell fire action potentials.</definition>
			
 
				       <type>float</type>
			
 
				       <unit>nA</unit>
			
 
				-      <definition>The minimum current required to make the cell
			
 
				-      fire action potentials.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>MembraneCapacity</name>
			
 
				+      <definition>The capacity of the cell.</definition>
			
 
				       <type>float</type>
			
 
				       <unit>pF</unit>
			
 
				-      <definition>The capacity of the cell.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>InputResistance</name>
			
 
				+      <definition>The input resistance of the recorded cell.</definition>
			
 
				       <type>float</type>
			
 
				       <unit>MOhm</unit>
			
 
				-      <definition>The input resistance of the recorded
			
 
				-      cell.</definition>
			
 
				-    </property>   
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>TimeConstant</name>
			
 
				+      <definition>The membrane time-constant.</definition>
			
 
				       <type>float</type>
			
 
				       <unit>ms</unit>
			
 
				-      <definition>The mebrane time-constant.</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Comment</name>
			
 
				-      <type>text</type>
			
 
				       <definition>A comment on the cell.</definition>
			
 
				+      <type>text</type>
			
 
				     </property>
			
 
				-  </section> 
			
 
				+
			
 
				+  </section>
			
 
				 </odML>
			
--- a/v1.1/cell/odmlTerms.xsl
+++ b/v1.1/cell/odmlTerms.xsl
@@ -1,201 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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/>
			
 
				-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
			
 
				-         <xsl:choose>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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/>
			
 
				-         
			
 
				-<!--
			
 
				--->
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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: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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/collection/event_list.xml
+++ b/v1.1/collection/event_list.xml
@@ -1,30 +1,29 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************************************* -->

			
 
				-<!--                   EventList Section                        -->

			
 
				-<!-- ********************************************************* -->

			
 
				-<odML version="1.1">

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date>

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  

			
 
				-  <section>

			
 
				-    <type>collection/event_list</type>

			
 
				-    <name>EventList</name>

			
 
				-    <definition>Section for grouping short annotations that are taken during

			
 
				-    an experiment, preparation etc..</definition>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Timestamp</name>

			
 
				-      <type>datetime</type> 

			
 
				-      <definition>The local datetime entry of the moment the event was

			
 
				-      taken (YYYY-MM-DD hh:mm:ss format).</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Description</name>

			
 
				-      <type>text</type> 

			
 
				-      <definition>A description of the event.</definition>

			
 
				-    </property> 

			
 
				-  </section> 

			
 
				-</odML>

			
 
				+<?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">
			
 
				+  <version>1.0</version>
			
 
				+  <date>2011-01-21</date>
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <!--                   EventList Section                       -->
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <section>
			
 
				+    <type>collection/event_list</type>
			
 
				+    <name>EventList</name>
			
 
				+    <definition>Section for grouping short annotations that are taken during an experiment, preparation etc..
			
 
				+    </definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Timestamp</name>
			
 
				+      <definition>The local datetime entry of the moment the event was taken (YYYY-MM-DD hh:mm:ss format).</definition>
			
 
				+      <type>datetime</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Description</name>
			
 
				+      <definition>A description of the event.</definition>
			
 
				+      <type>text</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/collection/hardware_properties.xml
+++ b/v1.1/collection/hardware_properties.xml
@@ -1,27 +1,28 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?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>2011-01-21</date>

			
 
				-<!-- ********************************************************* -->

			
 
				-<!--                       hardware properties                 -->

			
 
				-<!-- ********************************************************* -->

			
 
				-   <section>

			
 
				-	<type>collection/hardware_properties</type>

			
 
				-	<name>HardwareProperties</name>

			
 
				-      <definition>Fixed properties of hardware components used in the

			
 
				-      experimental setup. There are two sections for describing

			
 
				-      hardware components: the "HardwareProperties" and the

			
 
				-      "HardwareSettings" section. While the HardwareProperties

			
 
				-      describe the fixed properties of the hardware that can not be

			
 
				-      changed, the HardwareSettings section describes the actual,

			
 
				-      adjustable, parameters of the hardware that may change with each

			
 
				-      recording or dataset. For example, the sample rate of an

			
 
				-      data-acquisition board or the settings of a filter. In each of

			
 
				-      these two sections there are subsections for each device that

			
 
				-      correspond to the class of the device like data-acquisition,

			
 
				-      amplifier, etc. Some properties are common for any

			
 
				-      type. </definition>

			
 
				-     </section>

			
 
				-</odML>

			
 
				+<?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>2011-01-21</date>
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <!--                       hardware properties                 -->
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <section>
			
 
				+    <type>collection/hardware_properties</type>
			
 
				+    <name>HardwareProperties</name>
			
 
				+    <definition>Fixed properties of hardware components used in the
			
 
				+      experimental setup. There are two sections for describing
			
 
				+      hardware components: the "HardwareProperties" and the
			
 
				+      "HardwareSettings" section. While the HardwareProperties
			
 
				+      describe the fixed properties of the hardware that can not be
			
 
				+      changed, the HardwareSettings section describes the actual,
			
 
				+      adjustable, parameters of the hardware that may change with each
			
 
				+      recording or dataset. For example, the animal_keeping rate of an
			
 
				+      data-acquisition board or the settings of a filter. In each of
			
 
				+      these two sections there are subsections for each device that
			
 
				+      correspond to the class of the device like data-acquisition,
			
 
				+      amplifier, etc. Some properties are common for any
			
 
				+      type.
			
 
				+    </definition>
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/collection/hardware_settings.xml
+++ b/v1.1/collection/hardware_settings.xml
@@ -1,12 +1,12 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?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>2011-01-21</date>
			
 
				-<!-- ********************************************************* -->
			
 
				-<!--                       hardware settings                   -->
			
 
				-<!-- ********************************************************* -->
			
 
				+  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <version>1.0</version>
			
 
				+  <date>2011-01-21</date>
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <!--                       hardware settings                   -->
			
 
				+  <!-- ********************************************************* -->
			
 
				   <section>
			
 
				     <type>collection/hardware_settings</type>
			
 
				     <name>HardwareSettings</name>
			
@@ -17,10 +17,11 @@
 
				       properties of the hardware that can not be changed, the
			
 
				       HardwareSettings section describes the actual, adjustable,
			
 
				       parameters of the hardware that may change with each recording
			
 
				-      or dataset. For example, the sample rate of an data-acquisition
			
 
				+      or dataset. For example, the animal_keeping rate of an data-acquisition
			
 
				       board or the settings of a filter. In each of these two sections
			
 
				       there are subsections for each device that correspond to the
			
 
				       class of the device like data-acquisition, amplifier, etc. Some
			
 
				-      properties are common for any type. </definition>
			
 
				-  </section> 
			
 
				+      properties are common for any type.
			
 
				+    </definition>
			
 
				+  </section>
			
 
				 </odML>
			
--- a/v1.1/collection/odmlTerms.xsl
+++ b/v1.1/collection/odmlTerms.xsl
@@ -1,201 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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/>
			
 
				-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
			
 
				-         <xsl:choose>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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/>
			
 
				-         
			
 
				-<!--
			
 
				--->
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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: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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/dataset/dataset.xml
+++ b/v1.1/dataset/dataset.xml
@@ -1,9 +1,9 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?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.1</version>
			
 
				-  <date>2017-03-03</date>
			
 
				+  <version>1.0</version>
			
 
				+  <date>2011-01-21</date>
			
 
				   <!-- ********************************************************* -->
			
 
				   <!--                      Dataset section                      -->
			
 
				   <!-- ********************************************************* -->
			
@@ -11,78 +11,76 @@
 
				     <type>dataset</type>
			
 
				     <name>Dataset</name>
			
 
				     <definition>Names (URLs) and times of recorded data files.
			
 
				-    Datasets are obtained during a Recording and may belong to
			
 
				-    different Experiments. Related sections that can be used as
			
 
				-    subsections, parent sections, or siblings are Stimulus,
			
 
				-    HardwareSettings, and Experiment.</definition>
			
 
				+      Datasets are obtained during a Recording and may belong to
			
 
				+      different Experiments. Related sections that can be used as
			
 
				+      subsections, parent sections, or siblings are Stimulus,
			
 
				+      HardwareSettings, and Experiment.
			
 
				+    </definition>
			
 
				 
			
 
				     <property>
			
 
				       <name>Start</name>
			
 
				+      <definition>The point in time the recording of this dataset was started.</definition>
			
 
				       <type>datetime</type>
			
 
				-      <definition>The point in time the recording of this dataset was
			
 
				-      started.</definition>
			
 
				-    </property> 
			
 
				+    </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>End</name>
			
 
				+      <definition>The point in time the recording of this dataset was ended.</definition>
			
 
				       <type>datetime</type>
			
 
				-      <definition>The point in time the recording of this dataset was
			
 
				-      ended.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>StartDate</name>
			
 
				+      <definition>The date recording of this dataset was started.</definition>
			
 
				       <type>date</type>
			
 
				-      <definition>The date recording of this dataset was
			
 
				-      started.</definition>
			
 
				-    </property> 
			
 
				+    </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>EndDate</name>
			
 
				+      <definition>The date the recording of this dataset was ended.</definition>
			
 
				       <type>date</type>
			
 
				-      <definition>The date the recording of this dataset was
			
 
				-      ended.</definition>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>StartTime</name>
			
 
				-      <type>time</type>
			
 
				       <definition>The local time recording was started.</definition>
			
 
				-    </property> 
			
 
				+      <type>time</type>
			
 
				+    </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>EndTime</name>
			
 
				-      <type>time</type>
			
 
				       <definition>The local time recording was ended.</definition>
			
 
				-    </property> 
			
 
				+      <type>time</type>
			
 
				+    </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>Comment</name>
			
 
				+      <definition>A comment about the dataset (common to all files belonging to this dataset).</definition>
			
 
				       <type>text</type>
			
 
				-      <definition>A comment about the dataset (common to all files
			
 
				-      belonging to this dataset).</definition>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>File</name>
			
 
				-      <type>URL</type>
			
 
				-      <definition>The URL of a data file.</definition>
			
 
				-    </property> 
			
 
				+      <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>
			
 
				+    </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>Quality</name>
			
 
				+      <definition>A rough indication of the overall quality of the dataset. E.g. poor, fair, or good.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>A rough indication of the overall quality of
			
 
				-      the dataset. E.g. poor, fair, or good.</definition>
			
 
				-    </property> 
			
 
				+    </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>QualityRange</name>
			
 
				+      <definition>A comma separated ascending list of all used values for indicating the overall quality of the dataset.
			
 
				+        E.g. "poor,fair,good".
			
 
				+      </definition>
			
 
				       <type>string</type>
			
 
				-      <definition>A comma separated ascending list of all used
			
 
				-      values for indicating the overall quality of the
			
 
				-      dataset. E.g. "poor,fair,good".</definition>
			
 
				-    </property> 
			
 
				+    </property>
			
 
				 
			
 
				   </section>
			
 
				 </odML>
			
--- a/v1.1/dataset/odmlTerms.xsl
+++ b/v1.1/dataset/odmlTerms.xsl
@@ -1,201 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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/>
			
 
				-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
			
 
				-         <xsl:choose>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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/>
			
 
				-         
			
 
				-<!--
			
 
				--->
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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: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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/electrode/electrode.xml
+++ b/v1.1/electrode/electrode.xml
@@ -1,119 +1,121 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************** -->

			
 
				-<!--        Recording Electrodes        -->

			
 
				-<!-- ********************************** -->

			
 
				-<odML version="1.1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2014-04-01</date>

			
 
				-  <section>

			
 
				-    <type>electrode</type>

			
 
				-    <name>Electrode</name>   

			
 
				-    <definition>Properties to describe an electrode.</definition>

			
 
				-

			
 
				-    <property>

			
 
				-      <name>Type</name>

			
 
				-      <value>[sharp, patch, injection, extracellular, multibarrel, multi-electrode-array, tetrode] </value>

			
 
				-      <type>string</type>

			
 
				-      <definition>The type of electrode.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Usage</name>

			
 
				-      <value>[Ground, Reference, Channel]</value>

			
 
				-      <type>string</type>

			
 
				-      <definition>Usage of electrode.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Material</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The Material the electrodes are made of e.g. glass. tungsten, steel ...</definition>

			
 
				-    </property>  

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>GlassType</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The Type of Glass used to pull these electrodes. (e.g. Quartz, Borosilicate)</definition>

			
 
				-      <dependency>Material</dependency>

			
 
				-      <dependencyValue>Glass</dependencyValue>

			
 
				-    </property>  

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>GlassSpecification</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>Inner and outer diameter, with or without filament.</definition>

			
 
				-      <dependency>Material</dependency>

			
 
				-      <dependencyValue>Glass</dependencyValue>

			
 
				-    </property>  

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>FirePolish</name>

			
 
				-      <type>boolean</type>

			
 
				-      <definition>Specifies whether or not the electrodes were fire polished.</definition>

			
 
				-      <dependency>Material</dependency>

			
 
				-      <dependencyValue>Glass</dependencyValue>

			
 
				-    </property>  

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Puller</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The Puller used to make the electrodes.</definition>

			
 
				-      <dependency>Material</dependency>

			
 
				-      <dependencyValue>Glass</dependencyValue>

			
 
				-    </property>  

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>PullParameter</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The specific pull parameters like heat, trip velocity, heat and cooling duration etc..</definition>

			
 
				-      <dependency>Material</dependency>

			
 
				-      <dependencyValue>Glass</dependencyValue>

			
 
				-    </property>  

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>ShapeParameters</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The shape parameters of the electrode.</definition>

			
 
				-    </property>  

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Manufacturer</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The manufacturer of the electrodes if e.g. ordered from a company.</definition>

			
 
				-    </property>  

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>TipSize</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>&#956;m</unit>

			
 
				-      <definition>The tip size.</definition>

			
 
				-    </property>  

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Coating</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The coating used to insulate the electrodes.</definition>

			
 
				-    </property>  

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Impedance</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>M&#937;</unit>

			
 
				-      <definition>Electrode impedance.</definition>

			
 
				-    </property>  

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>ElectrodeCount</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>Number of electrodes in a multi-electrode-array.</definition>

			
 
				-    </property>  

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Description</name>

			
 
				-      <type>string</type>

			
 
				-      <definition></definition>

			
 
				-    </property>  

			
 
				-  </section>

			
 
				-</odML>

			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				+<!-- ********************************** -->
			
 
				+<!--        Recording Electrodes        -->
			
 
				+<!-- ********************************** -->
			
 
				+<odML version="1.1">
			
 
				+  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <version>1.0</version>
			
 
				+  <date>2014-04-01</date>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>electrode</type>
			
 
				+    <name>Electrode</name>
			
 
				+    <definition>Properties to describe an electrode.</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Type</name>
			
 
				+      <value>[sharp, patch, injection, extracellular, multibarrel, multi-electrode-array, tetrode]</value>
			
 
				+      <definition>The type of electrode.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Usage</name>
			
 
				+      <value>[Ground, Reference, Channel]</value>
			
 
				+      <definition>Usage of electrode.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Material</name>
			
 
				+      <definition>The Material the electrodes are made of e.g. glass. tungsten, steel ...</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>GlassType</name>
			
 
				+      <definition>The Type of Glass used to pull these electrodes. (e.g. Quartz, Borosilicate)</definition>
			
 
				+      <dependency>Material</dependency>
			
 
				+      <dependencyValue>Glass</dependencyValue>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>GlassSpecification</name>
			
 
				+      <definition>Inner and outer diameter, with or without filament.</definition>
			
 
				+      <dependency>Material</dependency>
			
 
				+      <dependencyValue>Glass</dependencyValue>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>FirePolish</name>
			
 
				+      <definition>Specifies whether or not the electrodes were fire polished.</definition>
			
 
				+      <dependency>Material</dependency>
			
 
				+      <dependencyValue>Glass</dependencyValue>
			
 
				+      <type>boolean</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Puller</name>
			
 
				+      <definition>The Puller used to make the electrodes.</definition>
			
 
				+      <dependency>Material</dependency>
			
 
				+      <dependencyValue>Glass</dependencyValue>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>PullParameter</name>
			
 
				+      <definition>The specific pull parameters like heat, trip velocity, heat and cooling duration etc..</definition>
			
 
				+      <dependency>Material</dependency>
			
 
				+      <dependencyValue>Glass</dependencyValue>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>ShapeParameters</name>
			
 
				+      <definition>The shape parameters of the electrode.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Manufacturer</name>
			
 
				+      <definition>The manufacturer of the electrodes if e.g. ordered from a company.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>TipSize</name>
			
 
				+      <definition>The tip size.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>&#956;m</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Coating</name>
			
 
				+      <definition>The coating used to insulate the electrodes.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Impedance</name>
			
 
				+      <definition>Electrode impedance.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>M&#937;</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>ElectrodeCount</name>
			
 
				+      <definition>Number of electrodes in a multi-electrode-array.</definition>
			
 
				+      <type>int</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Description</name>
			
 
				+      <definition/>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/electrode/odmlTerms.xsl
+++ b/v1.1/electrode/odmlTerms.xsl
@@ -1,201 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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/>
			
 
				-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
			
 
				-         <xsl:choose>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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/>
			
 
				-         
			
 
				-<!--
			
 
				--->
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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: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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/environment/environment.xml
+++ b/v1.1/environment/environment.xml
@@ -1,39 +1,38 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl"  xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************************************* -->
			
 
				-<!--                     Environment section                       -->
			
 
				+<!--                     Environment section                   -->
			
 
				 <!-- ********************************************************* -->
			
 
				 <odML version="1.1">
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.0</version>
			
 
				   <date>2014-04-01</date>
			
 
				+
			
 
				   <section>
			
 
				     <type>environment</type>
			
 
				-    <name>Environment </name>
			
 
				+    <name>Environment</name>
			
 
				     <definition>The environment conditions for the experiment.</definition>
			
 
				 
			
 
				     <property>
			
 
				       <name>Weather</name>
			
 
				       <type>string</type>
			
 
				-      <definition></definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>RoomTemperature</name>
			
 
				       <type>string</type>
			
 
				-      <definition></definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>AirHumidity</name>
			
 
				-      <type>float</type>
			
 
				       <definition>The air humidity in %..</definition>
			
 
				+      <type>float</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Description</name>
			
 
				       <type>string</type>
			
 
				-      <definition></definition>
			
 
				     </property>
			
 
				-  </section> 
			
 
				+
			
 
				+  </section>
			
 
				 </odML>
			
--- a/v1.1/environment/odmlTerms.xsl
+++ b/v1.1/environment/odmlTerms.xsl
@@ -1,201 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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/>
			
 
				-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
			
 
				-         <xsl:choose>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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/>
			
 
				-         
			
 
				-<!--
			
 
				--->
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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: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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/event/event.xml
+++ b/v1.1/event/event.xml
@@ -1,30 +1,29 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?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>2011-01-21</date>
			
 
				   <!-- ********************************************************* -->
			
 
				-  <!--                   Event Section                        -->
			
 
				+  <!--                   Event Section                           -->
			
 
				   <!-- ********************************************************* -->
			
 
				   <section>
			
 
				     <type>event</type>
			
 
				     <name>Event</name>
			
 
				-    <definition>Section for short annotations that are taken during
			
 
				-    an experiment to describe certain events.</definition>
			
 
				-    
			
 
				-    
			
 
				+    <definition>Section for short annotations that are taken during an experiment to describe certain events.
			
 
				+    </definition>
			
 
				+
			
 
				     <property>
			
 
				       <name>Timestamp</name>
			
 
				-      <type>datetime</type> 
			
 
				-      <definition>The local datetime entry of the moment the event was
			
 
				-      taken (YYYY-MM-DD hh:mm:ss format).</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <definition>The local datetime entry of the moment the event was taken (YYYY-MM-DD hh:mm:ss format).</definition>
			
 
				+      <type>datetime</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Description</name>
			
 
				-      <type>text</type> 
			
 
				       <definition>A description of the event.</definition>
			
 
				-    </property> 
			
 
				-  </section> 
			
 
				+      <type>text</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				 </odML>
			
--- a/v1.1/event/odmlTerms.xsl
+++ b/v1.1/event/odmlTerms.xsl
@@ -1,201 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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/>
			
 
				-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
			
 
				-         <xsl:choose>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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/>
			
 
				-         
			
 
				-<!--
			
 
				--->
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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: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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/experiment/behavior.xml
+++ b/v1.1/experiment/behavior.xml
@@ -1,46 +1,49 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************************************* -->

			
 
				-<!--                     Behavioral experiment			                       -->

			
 
				-<!-- ********************************************************* -->  

			
 
				-<odML version="1.1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date>	

			
 
				-  

			
 
				-  <section>

			
 
				-    <type>experiment/bahavior</type>

			
 
				-    <name>Behavior</name>

			
 
				-    <definition>Properties for describing an behavioural experiment.</definition>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Paradigm</name>

			
 
				-      <type>string</type> 

			
 
				-      <definition>The paradigm used in the experiment, e.g. Learning, navigation, etc... </definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Environment</name>

			
 
				-      <type>string</type> 

			
 
				-      <definition>The environment in which the experiments were conducted. Classical environments are e.g. the Y-maze or T-maze. Some environments are called enriched also reduced or even natural.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>IndividualCount</name>

			
 
				-      <type>int</type> 

			
 
				-      <definition>The number of individuals that are observed/investigated at the same time.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>definition</name>

			
 
				-      <type>text</type> 

			
 
				-      <definition>A definition of the conducted experiment.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Protocol</name>

			
 
				-      <type>text</type> 

			
 
				-      <definition>A description of the task protocol undertaken by the subject.</definition>

			
 
				-    </property>

			
 
				-  </section>

			
 
				-</odML>

			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				+<!-- ********************************************************* -->
			
 
				+<!--                     Behavioral experiment                 -->
			
 
				+<!-- ********************************************************* -->
			
 
				+<odML version="1.1">
			
 
				+  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <version>1.0</version>
			
 
				+  <date>2011-01-21</date>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>experiment/bahavior</type>
			
 
				+    <name>Behavior</name>
			
 
				+    <definition>Properties for describing an behavioural experiment.</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Paradigm</name>
			
 
				+      <definition>The paradigm used in the experiment, e.g. Learning, navigation, etc...</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Environment</name>
			
 
				+      <definition>The environment in which the experiments were conducted. Classical environments are e.g. the Y-maze or
			
 
				+        T-maze. Some environments are called enriched also reduced or even natural.
			
 
				+      </definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>IndividualCount</name>
			
 
				+      <definition>The number of individuals that are observed/investigated at the same time.</definition>
			
 
				+      <type>int</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>definition</name>
			
 
				+      <definition>A definition of the conducted experiment.</definition>
			
 
				+      <type>text</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Protocol</name>
			
 
				+      <definition>A description of the task protocol undertaken by the subject.</definition>
			
 
				+      <type>text</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/experiment/electrophysiology.xml
+++ b/v1.1/experiment/electrophysiology.xml
@@ -1,32 +1,33 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************************************* -->

			
 
				-<!--                    	 Electrophysiology                   			   -->

			
 
				-<!-- ********************************************************* -->  

			
 
				-<odML version="1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date>	

			
 
				-  <section>

			
 
				-    <type>experiment/electrophysiology</type>

			
 
				-    <name>Electrophysiology</name>

			
 
				-    <definition>Properties for describing an electrophysiological experiment.</definition>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Type</name>

			
 
				-      <value>[intracellular recording, extracellular

			
 
				-      recording, patch clamp, whole cell patch,

			
 
				-      loose patch, ERG, EEG, EKG, EMG]</value>

			
 
				-      <type>string</type> 

			
 
				-      <definition>Intracellular recording of single cell responses with sharp microelectrodes.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Subtype</name>

			
 
				-      <value>[single electrode recording, dual electrode recording, multi electrode recording]</value>

			
 
				-      <type>string</type> 

			
 
				-      <definition>Subtype of this electrophysiological experiment.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-  </section>

			
 
				-</odML>

			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				+<!-- ********************************************************* -->
			
 
				+<!--                       Electrophysiology                   -->
			
 
				+<!-- ********************************************************* -->
			
 
				+<odML version="1.1">
			
 
				+  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <version>1.0</version>
			
 
				+  <date>2011-01-21</date>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>experiment/electrophysiology</type>
			
 
				+    <name>Electrophysiology</name>
			
 
				+    <definition>Properties for describing an electrophysiological experiment.</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Type</name>
			
 
				+      <value>[intracellular recording, extracellular recording, patch clamp, whole cell patch, loose patch, ERG, EEG,
			
 
				+        EKG, EMG]
			
 
				+      </value>
			
 
				+      <definition>Intracellular recording of single cell responses with sharp microelectrodes.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Subtype</name>
			
 
				+      <value>[single electrode recording, dual electrode recording, multi electrode recording]</value>
			
 
				+      <definition>Subtype of this electrophysiological experiment.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/experiment/experiment.xml
+++ b/v1.1/experiment/experiment.xml
@@ -1,52 +1,56 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************************************* -->
			
 
				-<!--                     Experiment section                    				   -->
			
 
				-<!-- ********************************************************* -->  
			
 
				+<!--                     Experiment section                    -->
			
 
				+<!-- ********************************************************* -->
			
 
				 <odML version="1.1">
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.0</version>
			
 
				   <date>2011-01-21</date>
			
 
				+
			
 
				   <section>
			
 
				     <type>experiment</type>
			
 
				     <name>Experiment</name>
			
 
				-    <definition>Specification of an experiment. The Experiment is
			
 
				-    part of a Project and the recorded data for a specific
			
 
				-    Experiment are found in Datasets. Possible subsections are, for
			
 
				-    example, Dataset and Stimulus.</definition>
			
 
				-    
			
 
				+    <definition>Specification of an experiment. The Experiment is part of a Project and the recorded data for a specific
			
 
				+      Experiment are found in Datasets. Possible subsections are, for example, Dataset and Stimulus.
			
 
				+    </definition>
			
 
				+
			
 
				     <property>
			
 
				       <name>Description</name>
			
 
				-      <type>text</type> 
			
 
				-      <definition>A description of the
			
 
				-      experiment.</definition>
			
 
				+      <definition>A description of the experiment.
			
 
				+      </definition>
			
 
				+      <type>text</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>DataDOI</name>
			
 
				+      <definition>A unique Digital object identifier of data.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Type</name>
			
 
				       <value>[electrophysiology, behavior, simulation, imaging, psychophysics]</value>
			
 
				-      <type>string</type> 
			
 
				       <definition>The type of experiment.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Subtype</name>
			
 
				-      <type>string</type> 
			
 
				-      <definition></definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>ProjectName</name>
			
 
				-      <type>string</type> 
			
 
				-      <definition>The name of the project this experiment belongs
			
 
				-      to.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <definition>The name of the project this experiment belongs to.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>ProjectID</name>
			
 
				-      <type>string</type> 
			
 
				-      <definition>The ID of the project this experiment belongs
			
 
				-      to.</definition>
			
 
				-    </property>  
			
 
				-  </section> 
			
 
				+      <definition>The ID of the project this experiment belongs to.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				 </odML>
			
--- a/v1.1/experiment/imaging.xml
+++ b/v1.1/experiment/imaging.xml
@@ -1,23 +1,25 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************************************* -->

			
 
				-<!--                     Imaging experiment			                       -->

			
 
				-<!-- ********************************************************* --> 

			
 
				-<odML version="1.1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date>	

			
 
				-  <section>

			
 
				-    <type>experiment/imaging</type>

			
 
				-    <name>Imaging</name>

			
 
				-    <definition>Properties for describing an imaging experiment ranging from conventional light microscpoy to fMRI.</definition>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Type</name>

			
 
				-      <value>[REM, light microscopy, confocal, two-photon, fMRI]</value>

			
 
				-      <type>string</type> 

			
 
				-      <definition>The type of imaging like two-photon, confocal, REM, light microscopy, fMRI, etc..</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-  </section>

			
 
				-</odML>

			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				+<!-- ********************************************************* -->
			
 
				+<!--                     Imaging experiment                    -->
			
 
				+<!-- ********************************************************* -->
			
 
				+<odML version="1.1">
			
 
				+  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <version>1.0</version>
			
 
				+  <date>2011-01-21</date>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>experiment/imaging</type>
			
 
				+    <name>Imaging</name>
			
 
				+    <definition>Properties for describing an imaging experiment ranging from conventional light microscopy to fMRI.
			
 
				+    </definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Type</name>
			
 
				+      <value>[REM, light microscopy, confocal, two-photon, fMRI]</value>
			
 
				+      <definition>The type of imaging like two-photon, confocal, REM, light microscopy, fMRI, etc..</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/experiment/modeling.xml
+++ b/v1.1/experiment/modeling.xml
@@ -1,21 +1,23 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************************************* -->

			
 
				-<!--                     		Simulation	  	 			                       -->

			
 
				-<!-- ********************************************************* --> 

			
 
				-<odML version="1.1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date>

			
 
				-  <section>

			
 
				-    <type>experiment/modeling</type>

			
 
				-    <name>Modeling</name>

			
 
				-    <definition>Properties for describing a modeling experiment.</definition>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>SimulationType</name>

			
 
				-      <type>string</type> 

			
 
				-      <definition>The type of simulation: mathmatical, phenomenological, biophysical etc..</definition>

			
 
				-    </property>

			
 
				-  </section>

			
 
				-</odML>

			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				+<!-- ********************************************************* -->
			
 
				+<!--                         Simulation                        -->
			
 
				+<!-- ********************************************************* -->
			
 
				+<odML version="1.1">
			
 
				+  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <version>1.0</version>
			
 
				+  <date>2011-01-21</date>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>experiment/modeling</type>
			
 
				+    <name>Modeling</name>
			
 
				+    <definition>Properties for describing a modeling experiment.</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>SimulationType</name>
			
 
				+      <definition>The type of simulation: mathematical, phenomenological, biophysical etc..</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/experiment/odmlTerms.xsl
+++ b/v1.1/experiment/odmlTerms.xsl
@@ -1,201 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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/>
			
 
				-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
			
 
				-         <xsl:choose>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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/>
			
 
				-         
			
 
				-<!--
			
 
				--->
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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: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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/experiment/psychophysics.xml
+++ b/v1.1/experiment/psychophysics.xml
@@ -1,59 +1,63 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************************************* -->

			
 
				-<!--                     Psychophysics Experiment	                       -->

			
 
				-<!-- ********************************************************* --> 

			
 
				-<odML version="1.1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date>

			
 
				-  

			
 
				-  <section>

			
 
				-    <type>experiment/psychophysics</type>

			
 
				-    <name>Psychophysics</name>

			
 
				-    <definition>Properties for describing an psychophysical experiment.</definition>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Task</name>

			
 
				-      <type>string</type> 

			
 
				-      <definition>The task the subjects have to do like "discrimination" between different stimuli, "detection" of a stimulus etc... </definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Paradigm</name>

			
 
				-      <type>string</type> 

			
 
				-      <definition>The experimental paradigm e.g. Two-alternative-forced-choice, Three-alternative-forced-choice.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>SubjectKnowledge</name>

			
 
				-      <type>string</type> 

			
 
				-      <definition>Was the subject "naive", "trained", or "instructed"?</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>TrainingTrials</name>

			
 
				-      <type>int</type> 

			
 
				-      <definition>The number of trials used for training of the experimental subject.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>TrainingDuration</name>

			
 
				-      <type>float</type> 

			
 
				-      <unit>h</unit> 

			
 
				-      <definition>The training duration.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>SubjectInstruction</name>

			
 
				-      <type>text</type> 

			
 
				-      <definition>The instructions given to the subjects.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>definition</name>

			
 
				-      <type>text</type> 

			
 
				-      <definition>A definition of the conducted experiment.</definition>

			
 
				-    </property>

			
 
				-  </section>

			
 
				-</odML>

			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				+<!-- ********************************************************* -->
			
 
				+<!--                     Psychophysics Experiment              -->
			
 
				+<!-- ********************************************************* -->
			
 
				+<odML version="1.1">
			
 
				+  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <version>1.0</version>
			
 
				+  <date>2011-01-21</date>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>experiment/psychophysics</type>
			
 
				+    <name>Psychophysics</name>
			
 
				+    <definition>Properties for describing an psychophysical experiment.</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Task</name>
			
 
				+      <definition>The task the subjects have to do like "discrimination" between different stimuli, "detection" of a
			
 
				+        stimulus etc...
			
 
				+      </definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Paradigm</name>
			
 
				+      <definition>The experimental paradigm e.g. Two-alternative-forced-choice, Three-alternative-forced-choice.
			
 
				+      </definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>SubjectKnowledge</name>
			
 
				+      <definition>Was the subject "naive", "trained", or "instructed"?</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>TrainingTrials</name>
			
 
				+      <definition>The number of trials used for training of the experimental subject.</definition>
			
 
				+      <type>int</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>TrainingDuration</name>
			
 
				+      <definition>The training duration.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>h</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>SubjectInstruction</name>
			
 
				+      <definition>The instructions given to the subjects.</definition>
			
 
				+      <type>text</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>definition</name>
			
 
				+      <definition>A definition of the conducted experiment.</definition>
			
 
				+      <type>text</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/hardware/amplifier.xml
+++ b/v1.1/hardware/amplifier.xml
@@ -1,109 +1,121 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************** -->

			
 
				-<!--        Amplifier         		 -->

			
 
				-<!-- ********************************** -->

			
 
				-<odML version="1.1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date> 

			
 
				-  <section>

			
 
				-    <type>hardware/amplifier</type>	

			
 
				-    <name>Amplifier</name>

			
 
				-    <definition>The amplifier section defines elements that can be used to describe amplifier properties and settings.</definition>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>SerialNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The device's serial number.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>InventoryNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The inventory number of the device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Owner</name>

			
 
				-      <type>person</type>

			
 
				-      <definition> Who's the owner of the device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Model</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The model name of this hardware item.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Type</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The type of amplifier. E.g. extracellular, intracellular amplifier etc.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Manufacturer</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The Manufacturer of this hardware item.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>MeasurementType</name>

			
 
				-      <value>[Bridge, Current clamp, Voltage clamp, Voltag clamp controlle current clamp, Dynamic clamp]</value>

			
 
				-      <type>string</type>

			
 
				-      <definition>The amplifier mode. Measurement in Voltage clamp controlled current clamp -mode.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>OperationMode</name>

			
 
				-      <value>[Bridged, Discontinuous]</value>

			
 
				-      <type>string</type>

			
 
				-      <definition>The amplifier mode.</definition>

			
 
				-    </property>

			
 
				-

			
 
				-    <property>

			
 
				-      <name>SwitchingFrequency</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>Hz</unit>

			
 
				-      <dependency>OperationMode</dependency>

			
 
				-      <dependencyValue>Discontiuous</dependencyValue>

			
 
				-      <definition>The amplifier switching frequency. This property is only meaningful in Discontinuos operation modes.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>DutyCycle</name>

			
 
				-      <type>float</type>

			
 
				-      <dependency>OperationMode</dependency>

			
 
				-      <dependencyValue>Discontinuous</dependencyValue>

			
 
				-      <definition>The amplifier duty cylce if in disconinuous mode (e.g. 0.25, 0.5).</definition>

			
 
				-    </property>  

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Gain</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The amplifier gain.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>HighpassCutoff</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>Hz</unit>

			
 
				-      <definition>The cutoff frequency of the amplifier's highpass filter.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>LowpassCutoff</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>Hz</unit>

			
 
				-      <definition>The cutoff frequency of the amplifier's lowpass filter.</definition>

			
 
				-    </property>	 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Description</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>A description of this hardware item.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-  </section>

			
 
				-</odML>

			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				+<!-- ********************************** -->
			
 
				+<!--        Amplifier                   -->
			
 
				+<!-- ********************************** -->
			
 
				+<odML version="1.1">
			
 
				+  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <version>1.0</version>
			
 
				+  <date>2011-01-21</date>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>hardware/amplifier</type>
			
 
				+    <name>Amplifier</name>
			
 
				+    <definition>The amplifier section defines elements that can be used to describe amplifier properties and settings.
			
 
				+    </definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>SerialNo</name>
			
 
				+      <definition>The device's serial number.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>InventoryNo</name>
			
 
				+      <definition>The inventory number of the device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Owner</name>
			
 
				+      <definition>Who's the owner of the device.</definition>
			
 
				+      <type>person</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Model</name>
			
 
				+      <definition>The model name of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Type</name>
			
 
				+      <definition>The type of amplifier. E.g. extracellular, intracellular amplifier etc.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Manufacturer</name>
			
 
				+      <definition>The Manufacturer of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>MeasurementType</name>
			
 
				+      <value>[Bridge, CC, VC, VCcCC, Dynamic Clamp]</value>
			
 
				+      <definition>The amplifier mode. Measurement in Voltage clamp controlled current clamp -mode. Bridge: Passive
			
 
				+        measurement in Bridge -Mode; CC: Current Clamp measurement; VC: Voltage Clamp measurement; VCcCC: Voltage Clamp
			
 
				+        controlled Current Clamp measurement; Dynamic Clamp: Dynamic Clamp measurement
			
 
				+      </definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>OperationMode</name>
			
 
				+      <value>[Bridged, Discontinuous]</value>
			
 
				+      <definition>The amplifier mode. Bridged: Passive measurement in Bridge -Mode; Discontinuous: Measurement in
			
 
				+        Discontinuous (switched) -Mode
			
 
				+      </definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>SwitchingFrequency</name>
			
 
				+      <dependency>OperationMode</dependency>
			
 
				+      <dependencyValue>Discontinuous</dependencyValue>
			
 
				+      <definition>The amplifier switching frequency. This property is only meaningful in Discontinuous operation modes.
			
 
				+      </definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>Hz</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>DutyCycle</name>
			
 
				+      <dependency>OperationMode</dependency>
			
 
				+      <dependencyValue>Discontinuous</dependencyValue>
			
 
				+      <definition>The amplifier duty cycle if in discontinuous mode (e.g. 0.25, 0.5).</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Gain</name>
			
 
				+      <definition>The amplifier gain.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>HighpassCutoff</name>
			
 
				+      <definition>The cutoff frequency of the amplifier's highpass filter.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>Hz</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>LowpassCutoff</name>
			
 
				+      <definition>The cutoff frequency of the amplifier's lowpass filter.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>Hz</unit>
			
 
				+    </property>
			
 
				+    <property>
			
 
				+      <name>SampleRate</name>
			
 
				+      <definition>The sampling rate of the device.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+    <property>
			
 
				+      <name>Description</name>
			
 
				+      <definition>A description of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/hardware/attenuator.xml
+++ b/v1.1/hardware/attenuator.xml
@@ -1,83 +1,85 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************** -->

			
 
				-<!--        Attenuator properties       -->

			
 
				-<!-- ********************************** -->

			
 
				-

			
 
				-<odML version="1.1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date>

			
 
				-  <section>

			
 
				-    <type>hardware/attenuator</type>

			
 
				-    <name>Attenuator</name>

			
 
				-    <definition>Settings of the data acquisition system. most settings refer to individual channels the channel number should be given after the property name like DAQ.AISampleRate0 for the sampling rate of the analog input	channel 0.</definition>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>SerialNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The device's serial number.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Owner</name>

			
 
				-      <type>string</type>

			
 
				-      <definition> Who's the owner of the device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>InventoryNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The inventory number of the device.</definition>

			
 
				-    </property>  

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Model</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The model name of this hardware item.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Manufacturer</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The Manufacturer of this hardware item.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>LineCount</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The number of indepoendent lines.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>MaxAttenuation</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The maximum attenuation.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>MinAttenuation</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The minimum attenuation.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>StepSize</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The size of the attenuation steps between minimum and maximum attenuation.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Attenuation</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The actual attenuation setting.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Description</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>A description of this hardware item.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-  </section>

			
 
				-</odML>

			
 
				+<?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>2011-01-21</date>
			
 
				+  <!-- ********************************** -->
			
 
				+  <!--        Attenuator properties       -->
			
 
				+  <!-- ********************************** -->
			
 
				+  <section>
			
 
				+    <type>hardware/attenuator</type>
			
 
				+    <name>Attenuator</name>
			
 
				+    <definition>Settings of the data acquisition system. most settings refer to individual channels the channel
			
 
				+      number should be given after the property name like DAQ.AISampleRate0 for the sampling rate of the analog
			
 
				+      input channel 0.
			
 
				+    </definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>SerialNo</name>
			
 
				+      <definition>The device's serial number.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Owner</name>
			
 
				+      <definition>Who's the owner of the device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>InventoryNo</name>
			
 
				+      <definition>The inventory number of the device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Model</name>
			
 
				+      <definition>The model name of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Manufacturer</name>
			
 
				+      <definition>The Manufacturer of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>LineCount</name>
			
 
				+      <definition>The number of independent lines.</definition>
			
 
				+      <type>int</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>MaxAttenuation</name>
			
 
				+      <definition>The maximum attenuation.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>MinAttenuation</name>
			
 
				+      <definition>The minimum attenuation.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>StepSize</name>
			
 
				+      <definition>The size of the attenuation steps between minimum and maximum attenuation.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Attenuation</name>
			
 
				+      <definition>The actual attenuation setting.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Description</name>
			
 
				+      <definition>A description of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/hardware/camera_objective.xml
+++ b/v1.1/hardware/camera_objective.xml
@@ -1,117 +1,118 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************** -->

			
 
				-<!--           Camera Objective         		 -->

			
 
				-<!-- ********************************** -->

			
 
				-<odML version="1.1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date>

			
 
				-  <section>

			
 
				-    <type>hardware/camera_objective</type>

			
 
				-    <name>CameraObjective</name>

			
 
				-    <definition>This section contains properties that describe a camera objective.</definition>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>InventoryNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The inventory number of this device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>SerialNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The serial number of this device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Owner</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The owner of this device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Model</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The objective model name.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Manufacturer</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The Manufacturer providing the objective.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Type</name>

			
 
				-      <value>[Zoom, Macro, FixedFocus, FixedApperture]</value>

			
 
				-      <type>string</type>

			
 
				-      <definition>The type of objective.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Mount</name>

			
 
				-      <value>[C-Mount, CS-Mount]</value>

			
 
				-      <type>string</type>

			
 
				-      <definition>The type of mount.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>NumericalAperture</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The numerical aperture (N.A.) of the objective.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>MaximumAperture</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The maximum aperture of the objective.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Aperture</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The actual aperture setting of the objective.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>FocalLengthRange</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The range of focal lengths of the objective.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>FocalLength</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The focal length of the objective.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>TransmissionLowerBound</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The lower bound of transmission.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>TransmissionUpperBound</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The upper bound of transmission.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>TransmissionRange</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The transmission range (min - max).</definition>

			
 
				-    </property>

			
 
				-

			
 
				-    <property>

			
 
				-      <name>Description</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>A description of this hardware item.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-  </section>

			
 
				-</odML>

			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				+<!-- ********************************** -->
			
 
				+<!--           Camera Objective         -->
			
 
				+<!-- ********************************** -->
			
 
				+<odML version="1.1">
			
 
				+  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <version>1.0</version>
			
 
				+  <date>2011-01-21</date>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>hardware/camera_objective</type>
			
 
				+    <name>CameraObjective</name>
			
 
				+    <definition>This section contains properties that describe a camera objective.</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>InventoryNo</name>
			
 
				+      <definition>The inventory number of this device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>SerialNo</name>
			
 
				+      <definition>The serial number of this device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Owner</name>
			
 
				+      <definition>The owner of this device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Model</name>
			
 
				+      <definition>The objective model name.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Manufacturer</name>
			
 
				+      <definition>The Manufacturer providing the objective.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Type</name>
			
 
				+      <value>[Zoom, Macro, FixedFocus, FixedApperture]</value>
			
 
				+      <definition>The type of objective.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Mount</name>
			
 
				+      <value>[C-Mount, CS-Mount]</value>
			
 
				+      <definition>The type of mount.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>NumericalAperture</name>
			
 
				+      <definition>The numerical aperture (N.A.) of the objective.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>MaximumAperture</name>
			
 
				+      <definition>The maximum aperture of the objective.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Aperture</name>
			
 
				+      <definition>The actual aperture setting of the objective.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>FocalLengthRange</name>
			
 
				+      <definition>The range of focal lengths of the objective.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>FocalLength</name>
			
 
				+      <definition>The focal length of the objective.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>TransmissionLowerBound</name>
			
 
				+      <definition>The lower bound of transmission.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>TransmissionUpperBound</name>
			
 
				+      <definition>The upper bound of transmission.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>TransmissionRange</name>
			
 
				+      <definition>The transmission range (min - max).</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Description</name>
			
 
				+      <definition>A description of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/hardware/daq.xml
+++ b/v1.1/hardware/daq.xml
@@ -1,154 +1,167 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************** -->

			
 
				-<!-- Data  acquisition (DAQ) properties -->

			
 
				-<!-- ********************************** -->

			
 
				-<odML version="1.1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date>

			
 
				-

			
 
				-  <section>

			
 
				-    <type>hardware/daq</type>

			
 
				-    <name>DataAcquisition</name>

			
 
				-    <definition>The hardware section describes the settings of

			
 
				-    the used hardware. There should be one hardware section for

			
 
				-    each hardware item that was used.</definition>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>SerialNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The device's serial number.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>InventoryNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The inventory number of the device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Model</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The model name of this hardware item.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Manufacturer</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The Manufacturer of this hardware item.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Owner</name>

			
 
				-      <type>string</type>

			
 
				-      <definition> Who's the owner of the device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>AIResolution</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The voltage resolution of the analog input (AIN) subsystem given in bit.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>AIMaxSampleRate</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>Hz</unit>

			
 
				-      <definition>The maximum sampling rate.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>AIChannelCount</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The number of input channels of the DAQ-device.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>AOResolution</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The voltage resolution of a data-acquisition

			
 
				-      analog output (AO) subsystem given in bit.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>AOMaxSampleRate</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>Hz</unit>

			
 
				-      <definition>The maximum sampling rate.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>AOChannelCount</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The number of output channels of the device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>DIOLineCount</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The number of digital input/output lines (DIO) of the device.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-

			
 
				-    <property>

			
 
				-      <name>AIUsedChannelCount</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The number of used analog input channels.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>AISampleRate</name>

			
 
				-      <type>int</type>

			
 
				-      <unit>Hz</unit>

			
 
				-      <definition>The sample rate with which an individual input

			
 
				-      channel was sampled. Given in Hz. </definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>AIChannelGain</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The gain of an input channel.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>AIReference</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The reference to which voltages were measured. Usually either "common ground" or "differential".</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>AIPolarity</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The polarity of the measurement "unipolar" or "bipolar".</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>AOUsedChannelCount</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The number of used analog output channels.

			
 
				-      </definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>AOSampleRate</name>

			
 
				-      <type>int</type>

			
 
				-      <unit>Hz</unit>

			
 
				-      <definition>The sample rate with which an individual output

			
 
				-      channel was sampled. Given in Hz.</definition>

			
 
				-    </property>  

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>AOChannelGain</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The gain of an output channel.</definition>

			
 
				-    </property> 

			
 
				-

			
 
				-    <property>

			
 
				-      <name>Description</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>A description of this hardware item.</definition>

			
 
				-    </property>

			
 
				-

			
 
				-  </section>

			
 
				-</odML>

			
 
				+<?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>2011-01-21</date>
			
 
				+  <!-- ********************************** -->
			
 
				+  <!-- Data  acquisition (DAQ) properties -->
			
 
				+  <!-- ********************************** -->
			
 
				+  <section>
			
 
				+    <type>hardware/daq</type>
			
 
				+    <name>DataAcquisition</name>
			
 
				+    <definition>The hardware section describes the settings of the used hardware. There should be one hardware section
			
 
				+      for each hardware item that was used.
			
 
				+    </definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>SerialNo</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The device's serial number.</definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>InventoryNo</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The inventory number of the device.</definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Model</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The model name of this hardware item.</definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Manufacturer</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The Manufacturer of this hardware item.</definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Owner</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>Who's the owner of the device.</definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>AIResolution</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The voltage resolution of the analog input (AIN) subsystem given in bit.</definition>
			
 
				+    <type>int</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>AIMaxSampleRate</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The maximum sampling rate.</definition>
			
 
				+    <type>float</type><unit>Hz</unit></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>AIChannelCount</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The number of input channels of the DAQ-device.</definition>
			
 
				+    <type>int</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>AOResolution</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The voltage resolution of a data-acquisition analog output (AO) subsystem given in bit.</definition>
			
 
				+    <type>int</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>AOMaxSampleRate</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The maximum sampling rate.</definition>
			
 
				+    <type>float</type><unit>Hz</unit></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>AOChannelCount</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The number of output channels of the device.</definition>
			
 
				+    <type>int</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>DIOLineCount</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The number of digital input/output lines (DIO) of the device.</definition>
			
 
				+    <type>int</type></property>
			
 
				+
			
 
				+
			
 
				+    <property>
			
 
				+      <name>AIUsedChannelCount</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The number of used analog input channels.</definition>
			
 
				+    <type>int</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>AISampleRate</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The sample rate with which an individual input channel was sampled. Given in Hz.</definition>
			
 
				+    <type>int</type><unit>Hz</unit></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>AIChannelGain</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The gain of an input channel.</definition>
			
 
				+    <type>float</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>AIReference</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The reference to which voltages were measured. Usually either "common ground" or "differential".
			
 
				+      </definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>AIPolarity</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The polarity of the measurement "unipolar" or "bipolar".</definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>AOUsedChannelCount</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The number of used analog output channels.</definition>
			
 
				+    <type>int</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>AOSampleRate</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The sample rate with which an individual output channel was sampled. Given in Hz.</definition>
			
 
				+    <type>int</type><unit>Hz</unit></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>AOChannelGain</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The gain of an output channel.</definition>
			
 
				+    <type>float</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Description</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>A description of this hardware item.</definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/hardware/eyetracker.xml
+++ b/v1.1/hardware/eyetracker.xml
@@ -1,97 +1,111 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?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"> 
			
 
				+<odML version="1.1">
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.0</version>
			
 
				   <date>2011-01-21</date>
			
 
				+
			
 
				   <section>
			
 
				     <type>hardware/eyetracker</type>
			
 
				     <name>Eyetracker</name>
			
 
				     <definition>Properties of an eyetracker.</definition>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>SerialNo</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The device's serial number.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>InventoryNo</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The inventory number of the device.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Owner</name>
			
 
				-      <type>string</type>
			
 
				-      <definition> Who's the owner of the device.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>Who's the owner of the device.</definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Model</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The model name of this hardware item.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Manufacturer</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The Manufacturer of this hardware item.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Comment</name>
			
 
				-      <type>text</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>Space for some comments.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>text</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Type</name>
			
 
				-      <value>[Tabletop, Head mounted] </value>
			
 
				-      <type>string</type>
			
 
				+      <value>tabletop
			
 
				+        , head mounted
			
 
				+        </value>
			
 
				       <definition>The kind of eyetracker.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>SampleRate</name>
			
 
				-      <type>float</type>
			
 
				-      <unit>Hz</unit>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The rate with which eye positions are sampled.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>float</type><unit>Hz</unit></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>DetektorType</name>
			
 
				-      <value>[Infrared, Dual Purkinje, Coil]</value>
			
 
				-      <type>string</type>
			
 
				-      <definition>The kind of detektor used in this eyetracker.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+      <value>Infrared
			
 
				+        , Dual Purkinje
			
 
				+        , Coil
			
 
				+        </value>
			
 
				+      <definition>The kind of detector used in this eyetracker.</definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Filter</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The kind of filter applied to the data.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Calibration</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The calibration procedure.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Fixation</name>
			
 
				-      <value>[Bitebar, Chinrest]</value>
			
 
				-      <type>string</type>
			
 
				+      <value>Bitebar
			
 
				+        , Chinrest
			
 
				+        </value>
			
 
				       <dependency>Type</dependency>
			
 
				       <dependencyValue>Tabletop</dependencyValue>
			
 
				       <definition>The way the head was fixed. Makes no sense if the eytracker is head mounted.</definition>
			
 
				-    </property>
			
 
				+    <type>string</type></property>
			
 
				 
			
 
				     <property>
			
 
				       <name>Description</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>A description of this hardware item.</definition>
			
 
				-    </property>
			
 
				+    <type>string</type></property>
			
 
				 
			
 
				   </section>
			
 
				 </odML>
			
--- a/v1.1/hardware/filter.xml
+++ b/v1.1/hardware/filter.xml
@@ -1,90 +1,104 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************** -->

			
 
				-<!--        Filter properties       -->

			
 
				-<!-- ********************************** -->

			
 
				-

			
 
				-<odML version="1.1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date>

			
 
				-  <section>

			
 
				-    <type>hardware/filter</type>

			
 
				-    <name>Filter</name>

			
 
				-    <definition>Properties a filter modul for analog signal conditioning.</definition>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>SerialNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The device's serial number.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Model</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The model name of this hardware item.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Manufacturer</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The Manufacturer of this hardware item.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>InventoryNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The inventory number of the device.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Owner</name>

			
 
				-      <type>string</type>

			
 
				-      <definition> Who's the owner of the device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Type</name>

			
 
				-      <value>[Highpass, Lowpass, Bandpass, Notch]</value>

			
 
				-      <type>string</type>

			
 
				-      <definition>The type of filter.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>SubType</name>

			
 
				-      <value>[Bessel, Butterworth]</value>

			
 
				-      <type>string</type>

			
 
				-      <definition>The type of filter.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>LowpassCutoff</name>

			
 
				-      <type>float</type>

			
 
				-      <definition> The lowpass filter cutoff frequency.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>LowpassOrder</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The order of the lowpass filter</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>HighpassCutoff</name>

			
 
				-      <type>float</type>

			
 
				-      <definition> The highpass filter cutoff frequency.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>HighpassOrder</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The order of the highpass filter</definition>

			
 
				-    </property> 

			
 
				-

			
 
				-    <property>

			
 
				-      <name>Description</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>A description of this hardware item.</definition>

			
 
				-    </property>

			
 
				-  </section>

			
 
				-</odML>

			
 
				+<?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>2011-01-21</date>
			
 
				+  <!-- ********************************** -->
			
 
				+  <!--        Filter properties           -->
			
 
				+  <!-- ********************************** -->
			
 
				+  <section>
			
 
				+    <type>hardware/filter</type>
			
 
				+    <name>Filter</name>
			
 
				+    <definition>Properties a filter modul for analog signal conditioning.</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>SerialNo</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The device's serial number.</definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Model</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The model name of this hardware item.</definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Manufacturer</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The Manufacturer of this hardware item.</definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>InventoryNo</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The inventory number of the device.</definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Owner</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>Who's the owner of the device.</definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Type</name>
			
 
				+      <value>Highpass
			
 
				+        , Lowpass
			
 
				+        , Bandpass
			
 
				+        , Notch
			
 
				+        </value>
			
 
				+      <definition>The type of filter.</definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>SubType</name>
			
 
				+      <value>Bessel
			
 
				+        , Butterworth
			
 
				+        </value>
			
 
				+      <definition>The type of filter.</definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>LowpassCutoff</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The lowpass filter cutoff frequency.</definition>
			
 
				+    <type>float</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>LowpassOrder</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The order of the lowpass filter</definition>
			
 
				+    <type>int</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>HighpassCutoff</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The highpass filter cutoff frequency.</definition>
			
 
				+    <type>float</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>HighpassOrder</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The order of the highpass filter</definition>
			
 
				+    <type>int</type></property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Description</name>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>A description of this hardware item.</definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/hardware/filter_set.xml
+++ b/v1.1/hardware/filter_set.xml
@@ -1,154 +1,151 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************** -->

			
 
				-<!--     Filter set aka Filter cube     -->

			
 
				-<!-- ********************************** -->

			
 
				-

			
 
				-<odML version="1.1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date>

			
 
				-  <section>

			
 
				-    <type>hardware/filter_set</type>

			
 
				-    <name>Filterset</name>

			
 
				-    <definition>The FilterSet or also FilterCube used in a microscope.</definition>

			
 
				-    

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>InventoryNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The inventory number of the FilterSet.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Owner</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The inventory number of the FilterSet.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>ExcitationFilterModel</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The model of excitation filter.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>ExcitationFilterManufacturer</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The Manufacturer providing the  of the excitation filter.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>ExcitationFilterWavelength</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The wavelength of the excitation filter.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>ExcitationFilterLowerBound</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The lower bound of of the wavelength transmitted by the excitation filter.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>ExcitationFilterUpperBound</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The upper bound of of the wavelength transmitted by the excitation filter.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>ExcitationFilterRange</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The width of the transmitted wavelength range.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>ExcitationFilterPassbandTransmission</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The transmission in the passband. Given in %.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <!-- emission Filter -->

			
 
				-    <property>

			
 
				-      <name>EmissionFilterModel</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The model of excitation filter.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>EmissionFilterManufacturer</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The Manufacturer providing the  of the excitation filter.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>EmissionFilterWavelength</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The wavelength of the excitation filter.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>EmissionFilterLowerBound</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The lower bound of of the wavelength transmitted by the emission filter.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>EmissionFilterUpperBound</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The upper bound of of the wavelength transmitted by the excitation filter.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>EmissionFilterRange</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The width of the transmitted wavelength range.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>EmissionFilterPassbandTransmission</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The transmission in the passband. Given in %.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>BeamsplitterType</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The type of beamsplitter used.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>BeamsplitterModel</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The beam splitter model name.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>BeamsplitterManufacturer</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The Manufacturer providing the beam splitter.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>BeamsplitterWavelength</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The wavelength at which the beam splitter separates the beams.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Description</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>A description of this hardware item.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-  </section>

			
 
				-</odML>

			
 
				+<?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>2011-01-21</date>
			
 
				+  <!-- ********************************** -->
			
 
				+  <!--     Filter set aka Filter cube     -->
			
 
				+  <!-- ********************************** -->
			
 
				+  <section>
			
 
				+    <type>hardware/filter_set</type>
			
 
				+    <name>Filterset</name>
			
 
				+    <definition>The FilterSet or also FilterCube used in a microscope.</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>InventoryNo</name>
			
 
				+      <definition>The inventory number of the FilterSet.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Owner</name>
			
 
				+      <definition>The inventory number of the FilterSet.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>ExcitationFilterModel</name>
			
 
				+      <definition>The model of excitation filter.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>ExcitationFilterManufacturer</name>
			
 
				+      <definition>The Manufacturer providing the of the excitation filter.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>ExcitationFilterWavelength</name>
			
 
				+      <definition>The wavelength of the excitation filter.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>ExcitationFilterLowerBound</name>
			
 
				+      <definition>The lower bound of of the wavelength transmitted by the excitation filter.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>ExcitationFilterUpperBound</name>
			
 
				+      <definition>The upper bound of of the wavelength transmitted by the excitation filter.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>ExcitationFilterRange</name>
			
 
				+      <definition>The width of the transmitted wavelength range.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>ExcitationFilterPassbandTransmission</name>
			
 
				+      <definition>The transmission in the passband. Given in %.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>EmissionFilterModel</name>
			
 
				+      <definition>The model of excitation filter.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>EmissionFilterManufacturer</name>
			
 
				+      <definition>The Manufacturer providing the of the excitation filter.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>EmissionFilterWavelength</name>
			
 
				+      <definition>The wavelength of the excitation filter.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>EmissionFilterLowerBound</name>
			
 
				+      <definition>The lower bound of of the wavelength transmitted by the emission filter.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>EmissionFilterUpperBound</name>
			
 
				+      <definition>The upper bound of of the wavelength transmitted by the excitation filter.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>EmissionFilterRange</name>
			
 
				+      <definition>The width of the transmitted wavelength range.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>EmissionFilterPassbandTransmission</name>
			
 
				+      <definition>The transmission in the passband. Given in %.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>BeamsplitterType</name>
			
 
				+      <definition>The type of beamsplitter used.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>BeamsplitterModel</name>
			
 
				+      <definition>The beam splitter model name.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>BeamsplitterManufacturer</name>
			
 
				+      <definition>The Manufacturer providing the beam splitter.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>BeamsplitterWavelength</name>
			
 
				+      <definition>The wavelength at which the beam splitter separates the beams.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Description</name>
			
 
				+      <definition>A description of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/hardware/hardware.xml
+++ b/v1.1/hardware/hardware.xml
@@ -1,60 +1,67 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************** -->
			
 
				-<!--        unspecified HardwareItem	 -->
			
 
				+<!--        unspecified HardwareItem    -->
			
 
				 <!-- ********************************** -->
			
 
				 <odML version="1.1">
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.0</version>
			
 
				   <date>2011-01-21</date>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>hardware</type>
			
 
				     <name>Hardware</name>
			
 
				-    <definition>This is a generic hardware section meant to take
			
 
				-    information of items for which no specific terminology
			
 
				-    exists.</definition>
			
 
				-    
			
 
				+    <definition>This is a generic hardware section meant to take information of items for which no specific terminology
			
 
				+      exists.
			
 
				+    </definition>
			
 
				+
			
 
				     <property>
			
 
				       <name>SerialNo</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The device's serial number.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>InventoryNo</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The inventory number of the device.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Owner</name>
			
 
				+      <definition>Who's the owner of the device.</definition>
			
 
				       <type>person</type>
			
 
				-      <definition> Who's the owner of the device.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Model</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The model name of this hardware item.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Type</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The type of amplifier. E.g. extracellular, intracellular amplifier etc.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Manufacturer</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The Manufacturer of this hardware item.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>SampleRate</name>
			
 
				+      <definition>The sampling rate of the device.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Description</name>
			
 
				-      <type>string</type>
			
 
				       <definition>A description of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				+
			
 
				   </section>
			
 
				 </odML>
			
--- a/v1.1/hardware/iaq.xml
+++ b/v1.1/hardware/iaq.xml
@@ -1,222 +1,224 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************** -->

			
 
				-<!-- Image Acquisition (IAQ) properties -->

			
 
				-<!-- ********************************** -->

			
 
				-<odML version="1.1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date>

			
 
				-  <section>

			
 
				-    <type>hardware/iaq</type>

			
 
				-    <name>ImageAcquisition</name>

			
 
				-    <definition>Properties to define an Image acquisition device. This can be a framegrabber, a camera etc.</definition>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>InventoryNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The inventory number of the device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>SerialNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The device's serial number.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Model</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The model name of this hardware item.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Manufacturer</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The Manufacturer of this hardware item.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Owner</name>

			
 
				-      <type>string</type>

			
 
				-      <definition> Who's the owner of the device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Type</name>

			
 
				-      <value>[Digital Camera, Analogue Camera, Framegrabber]</value>

			
 
				-      <type>string</type>

			
 
				-      <definition> The kind of image acquisiton device.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Mount</name>

			
 
				-      <value>[C-Mount, CS-Mount]</value>

			
 
				-      <type>string</type>

			
 
				-      <definition> The lens mount (there are many more).</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Colorspace</name>

			
 
				-      <value>[Monochrome, Color]</value>

			
 
				-      <type>string</type>

			
 
				-      <definition> The color space of the image acquisiton device.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>DetektorType</name>

			
 
				-      <value>[CMOS, CCD, 2 CCD, 3 CCD]</value>

			
 
				-      <type>string</type>

			
 
				-      <definition> The type of detector used in the device.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>SensitivityRange</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The sensitivity range of the detektor (min - max).</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>MinFramerate</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The minimal framerate of the image acquisition system (Camera, framegrabber, etc.).</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>MaxFramerate</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The maximum framerate of the image acquisition system (Camera, framegrabber, etc.).</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Framerate</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The actual framerate of the image acquisition system (Camera, framegrabber, etc.).</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>SpatialRes</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The spatial resolution of the acquired images (width x height).</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Lens</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>This property can be used to specify which kind of optics have been used.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>ShutterSpeed</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The speed of the shutter, given in seconds or milliseconds.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Apperture</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The actual apperture (e.g. 5.6).</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>CCDGain</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The gain of a ccd chip.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Depth</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The brightness resoltuion e.g. lower 8 bit.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>RoiPositionX</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The position of the region of interest on the CCD chip. Usually given in pixel describing the top left

			
 
				-      corner relative to the chip origin (also the top left corner).</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>RoiPositionY</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The position of the region of interest on the CCD chip. Usually given in pixel describing the top left

			
 
				-      corner relative to the chip origin (also the top left corner).</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>RoiWidth</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The width of the region of interest. Given in pixels.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>RoiHeight</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The heigth of the region of interest. Given in pixels.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>PicRotation</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The rotation of the picture. (e.g. +180degrees).</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Brightness</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The brightness adjustment.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Contrast</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The contrast adjustment.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Gamma</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The gamma value.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>GammaFuntion</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The gamma calibration function.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>PixelBinning</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The type of pixel binning on the chip.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Subsampling</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The subsampling method used on the chip.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>ColorTemperature</name>

			
 
				-      <type>int</type>

			
 
				-      <definition>The color temperature.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>ColorGain</name>

			
 
				-      <type>float</type>

			
 
				-      <definition></definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Description</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>A description of this hardware item.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-  </section> 

			
 
				-</odML>

			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				+<!-- ********************************** -->
			
 
				+<!-- Image Acquisition (IAQ) properties -->
			
 
				+<!-- ********************************** -->
			
 
				+<odML version="1.1">
			
 
				+  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <version>1.0</version>
			
 
				+  <date>2011-01-21</date>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>hardware/iaq</type>
			
 
				+    <name>ImageAcquisition</name>
			
 
				+    <definition>Properties to define an Image acquisition device. This can be a framegrabber, a camera etc.</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>InventoryNo</name>
			
 
				+      <definition>The inventory number of the device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>SerialNo</name>
			
 
				+      <definition>The device's serial number.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Model</name>
			
 
				+      <definition>The model name of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Manufacturer</name>
			
 
				+      <definition>The Manufacturer of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Owner</name>
			
 
				+      <definition>Who's the owner of the device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Type</name>
			
 
				+      <value>[Digital Camera, Analogue Camera, Framegrabber]</value>
			
 
				+      <definition>The kind of image acquisition device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Mount</name>
			
 
				+      <value>[C-Mount, CS-Mount]</value>
			
 
				+      <definition>The lens mount (there are many more).</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Colorspace</name>
			
 
				+      <value>[Monochrome, Color]</value>
			
 
				+      <definition>The kind of image acquisition device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>DetektorType</name>
			
 
				+      <value>[CMOS, CCD, 2 CCD, 3 CCD, Framegrabber]</value>
			
 
				+      <definition>The kind of image acquisition device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>SensitivityRange</name>
			
 
				+      <definition>The sensitivity range of the detector (min - max).</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>MinFramerate</name>
			
 
				+      <definition>The minimal framerate of the image acquisition system (Camera, framegrabber, etc.).</definition>
			
 
				+      <type>int</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>MaxFramerate</name>
			
 
				+      <definition>The maximum framerate of the image acquisition system (Camera, framegrabber, etc.).</definition>
			
 
				+      <type>int</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Framerate</name>
			
 
				+      <definition>The actual framerate of the image acquisition system (Camera, framegrabber, etc.).</definition>
			
 
				+      <type>int</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>SpatialRes</name>
			
 
				+      <definition>The spatial resolution of the acquired images (width x height).</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Lens</name>
			
 
				+      <definition>This property can be used to specify which kind of optics have been used.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>ShutterSpeed</name>
			
 
				+      <definition>The speed of the shutter, given in seconds or milliseconds.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Apperture</name>
			
 
				+      <definition>The actual apperture (e.g. 5.6).</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>CCDGain</name>
			
 
				+      <definition>The gain of a ccd chip.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Depth</name>
			
 
				+      <definition>The brightness resolution e.g. lower 8 bit.</definition>
			
 
				+      <type>int</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>RoiPositionX</name>
			
 
				+      <definition>The position of the region of interest on the CCD chip. Usually given in pixel describing the top left
			
 
				+        corner relative to the chip origin (also the top left corner).
			
 
				+      </definition>
			
 
				+      <type>int</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>RoiPositionY</name>
			
 
				+      <definition>The position of the region of interest on the CCD chip. Usually given in pixel describing the top left
			
 
				+        corner relative to the chip origin (also the top left corner).
			
 
				+      </definition>
			
 
				+      <type>int</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>RoiWidth</name>
			
 
				+      <definition>The width of the region of interest. Given in pixels.</definition>
			
 
				+      <type>int</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>RoiHeight</name>
			
 
				+      <definition>The height of the region of interest. Given in pixels.</definition>
			
 
				+      <type>int</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>PicRotation</name>
			
 
				+      <definition>The rotation of the picture. (e.g. +180degrees).</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Brightness</name>
			
 
				+      <definition>The brightness adjustment.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Contrast</name>
			
 
				+      <definition>The contrast adjustment.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Gamma</name>
			
 
				+      <definition>The gamma value.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>GammaFuntion</name>
			
 
				+      <definition>The gamma calibration function.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>PixelBinning</name>
			
 
				+      <definition>The type of pixel binning on the chip.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Subsampling</name>
			
 
				+      <definition>The subsampling method used on the chip.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>ColorTemperature</name>
			
 
				+      <definition>The color temperature.</definition>
			
 
				+      <type>int</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>ColorGain</name>
			
 
				+      <definition/>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Description</name>
			
 
				+      <definition>A description of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/hardware/light_source.xml
+++ b/v1.1/hardware/light_source.xml
@@ -1,105 +1,108 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************** -->

			
 
				-<!--           LightSources             -->

			
 
				-<!-- ********************************** -->

			
 
				-<odML version="1.1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date>

			
 
				-  

			
 
				-  <section>

			
 
				-    <type>hardware/light_source</type>

			
 
				-    <name>Lightsource</name>

			
 
				-    <definition>This section contains keywords to describe the actual settings of a light source used for stimulation or excitation.</definition>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>SerialNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The device's serial number.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>InventoryNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The inventory number of the device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Model</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The model name of this hardware item.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Manufacturer</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The Manufacturer of this hardware item.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Owner</name>

			
 
				-      <type>string</type>

			
 
				-      <definition> Who's the owner of the device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Type</name>

			
 
				-      <value>[LED, Laser, Mercury Arc, Halogen Lamp, Xenon Lamp]</value>

			
 
				-      <type>string</type>

			
 
				-      <definition>The type of light source used.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>PulseWidth</name>

			
 
				-      <type>string</type>

			
 
				-      <unit>s</unit>

			
 
				-      <dependency>Type</dependency>

			
 
				-      <dependencyValue>Laser</dependencyValue>

			
 
				-      <definition>The width of the laser pulse.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>PulseRate</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>Hz</unit>

			
 
				-      <dependency>Type</dependency>

			
 
				-      <dependencyValue>Laser</dependencyValue>

			
 
				-      <definition>The frequency with which laser pulses are delivered.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Wavelength</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The wavelength of the emitted light.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>WavelengthLowerBound</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The lower bound of the output spectrum.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>WavelengthUpperBound</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The upper bound of the output spectrum.</definition>

			
 
				-    </property>

			
 
				-

			
 
				-    <property>

			
 
				-      <name>Intensity</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The output intensity of the light source.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Description</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>A description of this hardware item.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-  </section>

			
 
				-</odML>

			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				+<!-- ********************************** -->
			
 
				+<!--           LightSources             -->
			
 
				+<!-- ********************************** -->
			
 
				+<odML version="1.1">
			
 
				+  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <version>1.0</version>
			
 
				+  <date>2011-01-21</date>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>hardware/light_source</type>
			
 
				+    <name>Lightsource</name>
			
 
				+    <definition>This section contains keywords to describe the actual settings of a light source used for stimulation or
			
 
				+      excitation.
			
 
				+    </definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>SerialNo</name>
			
 
				+      <definition>The device's serial number.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>InventoryNo</name>
			
 
				+      <definition>The inventory number of the device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Model</name>
			
 
				+      <definition>The model name of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Manufacturer</name>
			
 
				+      <definition>The Manufacturer of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Owner</name>
			
 
				+      <definition>Who's the owner of the device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Type</name>
			
 
				+      <value>[LED, Laser, Mercury Arc, Halogen Lamp, Xenon Lamp]</value>
			
 
				+      <definition>The type of light source used.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>PulseWidth</name>
			
 
				+      <dependency>Type</dependency>
			
 
				+      <dependencyValue>Laser</dependencyValue>
			
 
				+      <definition>The width of the laser pulse.</definition>
			
 
				+      <type>string</type>
			
 
				+      <unit>s</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>PulseRate</name>
			
 
				+      <dependency>Type</dependency>
			
 
				+      <dependencyValue>Laser</dependencyValue>
			
 
				+      <definition>The frequency with which laser pulses are delivered.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>Hz</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Wavelength</name>
			
 
				+      <definition>The wavelength of the emitted light.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>WavelengthLowerBound</name>
			
 
				+      <definition>The lower bound of the output spectrum.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>WavelengthUpperBound</name>
			
 
				+      <definition>The upper bound of the output spectrum.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Intensity</name>
			
 
				+      <definition>The output intensity of the light source.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>W</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Description</name>
			
 
				+      <definition>A description of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/hardware/microscope.xml
+++ b/v1.1/hardware/microscope.xml
@@ -1,60 +1,59 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************** -->

			
 
				-<!--        Microscope properties        -->

			
 
				-<!-- ********************************** -->

			
 
				-<odML version="1.1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date>

			
 
				-  

			
 
				-  <section>

			
 
				-    <type>hardware/microscope</type>

			
 
				-    <name>Microscope</name>

			
 
				-    <definition>The Microscope section describes the properties of the used microscope.</definition>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>SerialNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The device's serial number.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>InventoryNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The inventory number of the device.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Owner</name>

			
 
				-      <type>string</type>

			
 
				-      <definition> Who's the owner of the device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Type</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The microcope type: widefield, two-photon, multi-photon, confocal, etc...</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Model</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The model name of this hardware item.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Manufacturer</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The Manufacturer of this hardware item.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Description</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>A description of this hardware item.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-  </section>

			
 
				-

			
 
				-</odML>

			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				+<!-- ********************************** -->
			
 
				+<!--        Microscope properties       -->
			
 
				+<!-- ********************************** -->
			
 
				+<odML version="1.1">
			
 
				+  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <version>1.0</version>
			
 
				+  <date>2011-01-21</date>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>hardware/microscope</type>
			
 
				+    <name>Microscope</name>
			
 
				+    <definition>The Microscope section describes the properties of the used microscope.</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>SerialNo</name>
			
 
				+      <definition>The device's serial number.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>InventoryNo</name>
			
 
				+      <definition>The inventory number of the device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Owner</name>
			
 
				+      <definition>Who's the owner of the device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Type</name>
			
 
				+      <definition>The microscope type: widefield, two-photon, multi-photon, confocal, etc...</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Model</name>
			
 
				+      <definition>The model name of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Manufacturer</name>
			
 
				+      <definition>The Manufacturer of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Description</name>
			
 
				+      <definition>A description of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/hardware/microscope_objective.xml
+++ b/v1.1/hardware/microscope_objective.xml
@@ -1,88 +1,86 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************** -->

			
 
				-<!--       Microscope Objective         -->

			
 
				-<!-- ********************************** -->

			
 
				-

			
 
				-<odML version="1.1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date>

			
 
				-  <section>

			
 
				-    <type>hardware/microscope_objective</type>

			
 
				-    <name>MicroscopeObjecive</name>

			
 
				-    <definition>This section contains properties that describe the objective used in a microscope.</definition>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>InventoryNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The inventory number of the device.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Model</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The objective model name.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Manufacturer</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The Manufacturer providing the objective.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Type</name>

			
 
				-      <value>[dry, water immersion, oil immersion]</value>

			
 
				-      <type>string</type>

			
 
				-      <definition>The type of objective used in a microscope. (e.g. water immersion, oil immersion, dry.)</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Owner</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The owner of this device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Magnification</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The magnification of the objective.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>NumericalAperture</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The numerical aperture (N.A.) of the objective.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>TransmissionLowerBound</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The lower bound of transmission.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>TransmissionUpperBound</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The upper bound of transmission.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>TransmissionRange</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The transmission range (min - max).</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Description</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>A description of this hardware item.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-  </section>

			
 
				-

			
 
				-</odML>

			
 
				+<?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>2011-01-21</date>
			
 
				+  <!-- ********************************** -->
			
 
				+  <!--           Microscope Objective     -->
			
 
				+  <!-- ********************************** -->
			
 
				+  <section>
			
 
				+    <type>hardware/microscope_objective</type>
			
 
				+    <name>MicroscopeObjecive</name>
			
 
				+    <definition>This section contains properties that describe the objective used in a microscope.</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>InventoryNo</name>
			
 
				+      <definition>The inventory number of the device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Model</name>
			
 
				+      <definition>The objective model name.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Manufacturer</name>
			
 
				+      <definition>The Manufacturer providing the objective.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Type</name>
			
 
				+      <value>[dry, water immersion, oil immersion]</value>
			
 
				+      <definition>The type of objective used in a microscope. (e.g. water immersion, oil immersion, dry.)</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Owner</name>
			
 
				+      <definition>The owner of this device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Magnification</name>
			
 
				+      <definition>The magnification of the objective.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>NumericalAperture</name>
			
 
				+      <definition>The numerical aperture (N.A.) of the objective.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>TransmissionLowerBound</name>
			
 
				+      <definition>The lower bound of transmission.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>TransmissionUpperBound</name>
			
 
				+      <definition>The upper bound of transmission.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>TransmissionRange</name>
			
 
				+      <definition>The transmission range (min - max).</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Description</name>
			
 
				+      <definition>A description of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/hardware/odmlTerms.xsl
+++ b/v1.1/hardware/odmlTerms.xsl
@@ -1,201 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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/>
			
 
				-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
			
 
				-         <xsl:choose>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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/>
			
 
				-         
			
 
				-<!--
			
 
				--->
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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: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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/hardware/scanner.xml
+++ b/v1.1/hardware/scanner.xml
@@ -1,115 +1,116 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************** -->

			
 
				-<!--              Scanner               -->

			
 
				-<!-- ********************************** -->

			
 
				-<odML version="1.1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date>

			
 
				-  

			
 
				-  <section>

			
 
				-    <type>hardware/scanner</type>

			
 
				-    <name>Scanner</name>

			
 
				-    <definition>The Scanner used to scan microscope images.</definition>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>InventoryNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The inventory number of the FilterSet.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>SerialNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The device's serial number.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Owner</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The inventory number of the FilterSet.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Model</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The scanner model name.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Manufacturer</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The Manufacturer providing the scanner.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Type</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The type of scanner used in a scanning microscope. (e.g. Galvanometer, electro-optic-deflector etc.)</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>ImageWidth</name>

			
 
				-      <type>int</type>

			
 
				-      <unit>pixel</unit>

			
 
				-      <definition>The width of the scanned image.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>ImageHeight</name>

			
 
				-      <type>int</type>

			
 
				-      <unit>pixel</unit>

			
 
				-      <definition>The height of the scanned image.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>PixelSize</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The size of each pixel.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>DwellTime</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>&#181;m</unit>

			
 
				-      <definition></definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>ScanRate</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>nm</unit>

			
 
				-      <definition>The size of each pixel.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>ScanMode</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The scanning mode e.g. line or xy.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>StackZRange</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>&#181;m</unit>

			
 
				-      <definition>The depth scanned.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>StackZStepSize</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>&#181;m</unit>

			
 
				-      <definition>The step size with which the range is scanned.</definition>

			
 
				-    </property> 

			
 
				-

			
 
				-    <property>

			
 
				-      <name>Description</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>A description of this hardware item.</definition>

			
 
				-    </property>

			
 
				-

			
 
				-  </section>

			
 
				-</odML>

			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				+<!-- ********************************** -->
			
 
				+<!--              Scanner               -->
			
 
				+<!-- ********************************** -->
			
 
				+<odML version="1.1">
			
 
				+  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <version>1.0</version>
			
 
				+  <date>2011-01-21</date>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>hardware/scanner</type>
			
 
				+    <name>Scanner</name>
			
 
				+    <definition>The Scanner used to scan microscope images.</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>InventoryNo</name>
			
 
				+      <definition>The inventory number of the FilterSet.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>SerialNo</name>
			
 
				+      <definition>The device's serial number.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Owner</name>
			
 
				+      <definition>The inventory number of the FilterSet.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Model</name>
			
 
				+      <definition>The scanner model name.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Manufacturer</name>
			
 
				+      <definition>The Manufacturer providing the scanner.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Type</name>
			
 
				+      <definition>The type of scanner used in a scanning microscope. (e.g. Galvanometer, electro-optic-deflector etc.)
			
 
				+      </definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+
			
 
				+    <property>
			
 
				+      <name>ImageWidth</name>
			
 
				+      <definition>The width of the scanned image.</definition>
			
 
				+      <type>int</type>
			
 
				+      <unit>pixel</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>ImageHeight</name>
			
 
				+      <definition>The height of the scanned image.</definition>
			
 
				+      <type>int</type>
			
 
				+      <unit>pixel</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>PixelSize</name>
			
 
				+      <definition>The size of each pixel.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>DwellTime</name>
			
 
				+      <definition/>
			
 
				+      <type>float</type>
			
 
				+      <unit>µm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>ScanRate</name>
			
 
				+      <definition>The size of each pixel.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>nm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>ScanMode</name>
			
 
				+      <definition>The scanning mode e.g. line or xy.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>StackZRange</name>
			
 
				+      <definition>The depth scanned.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>µm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>StackZStepSize</name>
			
 
				+      <definition>The step size with which the range is scanned.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>µm</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Description</name>
			
 
				+      <definition>A description of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/hardware/stimulus_isolator.xml
+++ b/v1.1/hardware/stimulus_isolator.xml
@@ -1,140 +1,144 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************** -->

			
 
				-<!--        Stimulus Isolator           -->

			
 
				-<!-- ********************************** -->

			
 
				-<odML version="1.1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date>

			
 
				-  

			
 
				-  <section>

			
 
				-    <type>hardware/stimulus_isolator</type>

			
 
				-    <name>StimulusIsolator</name>

			
 
				-    <definition>Properties of a stimulus Isolator device.</definition>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>SerialNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The device's serial number.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>InventoryNo</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The inventory number of the device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Model</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The model name of this hardware item.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Manufacturer</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>The Manufacturer of this hardware item.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Owner</name>

			
 
				-      <type>string</type>

			
 
				-      <definition> Who's the owner of the device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>InputRangeMinVoltage</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>V</unit>

			
 
				-      <definition>The minimal input voltage.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>InputRangeMaxVoltage</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>V</unit>

			
 
				-      <definition>The maximal input voltage.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>OutputRangeMinVolatge</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>V</unit>

			
 
				-      <definition>The minimal output voltage.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>OutputRangeMaxVoltage</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>V</unit>

			
 
				-      <definition>The maximal ouput voltage.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>OutputRangeMinCurrent</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>A</unit>

			
 
				-      <definition>The minimal output current.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>OutputRangeMaxCurrent</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>A</unit>

			
 
				-      <definition>The maximal ouput current.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>MaximumGain</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The maximum gain of the device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>MinimumGain</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The minimum gain of the device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>GainStepSize</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The size of the gain steps between minimum and maximum.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>OutputType</name>

			
 
				-      <type>string</type>

			
 
				-      <value>Current </value>

			
 
				-      <definition>The type of output of the stimulus isolator.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>OutpuMode</name>

			
 
				-      <value>[BipolarOn, BipolarOff]</value>

			
 
				-      <type>string</type>

			
 
				-      <definition>The polarity mode of the stimulus isolator.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Gain</name>

			
 
				-      <type>float</type>

			
 
				-      <definition>The gain of the device.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>GainDb</name>

			
 
				-      <type>float</type>

			
 
				-      <unit>db</unit>

			
 
				-      <definition>The gain of the device given in db.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Description</name>

			
 
				-      <type>string</type>

			
 
				-      <definition>A description of this hardware item.</definition>

			
 
				-    </property>

			
 
				-

			
 
				-  </section>

			
 
				-</odML>

			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				+<!-- ********************************** -->
			
 
				+<!--        Stimulus Isolator           -->
			
 
				+<!-- ********************************** -->
			
 
				+<odML version="1.1">
			
 
				+  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <version>1.0</version>
			
 
				+  <date>2011-01-21</date>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>hardware/stimulus_isolator</type>
			
 
				+    <name>StimulusIsolator</name>
			
 
				+    <definition>Properties of a stimulus Isolator device.</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>SerialNo</name>
			
 
				+      <definition>The device's serial number.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>InventoryNo</name>
			
 
				+      <definition>The inventory number of the device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Model</name>
			
 
				+      <definition>The model name of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Manufacturer</name>
			
 
				+      <definition>The Manufacturer of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Owner</name>
			
 
				+      <definition>Who's the owner of the device.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>InputRangeMinVoltage</name>
			
 
				+      <definition>The minimal input voltage.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>V</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>InputRangeMaxVoltage</name>
			
 
				+      <definition>The maximal input voltage.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>V</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>OutputRangeMinVolatge</name>
			
 
				+      <definition>The minimal output voltage.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>V</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>OutputRangeMaxVoltage</name>
			
 
				+      <definition>The maximal output voltage.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>V</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>OutputRangeMinCurrent</name>
			
 
				+      <definition>The minimal output current.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>A</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>OutputRangeMaxCurrent</name>
			
 
				+      <definition>The maximal output current.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>A</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>MaximumGain</name>
			
 
				+      <definition>The maximum gain of the device.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>MinimumGain</name>
			
 
				+      <definition>The minimum gain of the device.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>GainStepSize</name>
			
 
				+      <definition>The size of the gain steps between minimum and maximum.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>OutputType</name>
			
 
				+      <value>Voltage
			
 
				+        , Current
			
 
				+      </value>
			
 
				+      <definition>The type of output of the stimulus isolator.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>OutpuMode</name>
			
 
				+      <value>BipolarOn
			
 
				+        , BipolarOff
			
 
				+      </value>
			
 
				+      <definition>The polarity mode of the stimulus isolator.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Gain</name>
			
 
				+      <definition>The gain of the device.</definition>
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>GainDb</name>
			
 
				+      <definition>The gain of the device given in db.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>db</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Description</name>
			
 
				+      <definition>A description of this hardware item.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/license/license.xml
+++ b/v1.1/license/license.xml
@@ -0,0 +1,40 @@
 
				+<?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>2017-09-28</date>
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <!--                  License  section                         -->
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <section>
			
 
				+    <type>License</type>
			
 
				+    <name>License</name>
			
 
				+    <definition>Description of the license for data / software.</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Name</name>
			
 
				+      <definition>A name of the license.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Type</name>
			
 
				+      <definition>A type of the license.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>LicenseURL</name>
			
 
				+      <definition>URL of the license.</definition>
			
 
				+      <type>URL</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Description</name>
			
 
				+      <definition>A textual description of the license.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/license/odmlTerms.xsl
+++ b/v1.1/license/odmlTerms.xsl
@@ -0,0 +1,199 @@
 
				+<?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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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>
			
--- a/v1.1/model/lif.xml
+++ b/v1.1/model/lif.xml
@@ -1,12 +1,13 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************************************* -->
			
 
				-<!--         Leaky integrate and fire	  	 	       -->
			
 
				-<!-- ********************************************************* --> 
			
 
				+<!--                  Leaky integrate and fire                 -->
			
 
				+<!-- ********************************************************* -->
			
 
				 <odML version="1.1">
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.0</version>
			
 
				   <date>2011-01-21</date>
			
 
				+
			
 
				   <section>
			
 
				     <type>model/lif</type>
			
 
				     <name>Leaky integrate and fire</name>
			
@@ -14,158 +15,161 @@
 
				 
			
 
				     <property>
			
 
				       <name>Author</name>
			
 
				-      <type>person</type> 
			
 
				       <definition>The author of this model.</definition>
			
 
				+      <type>person</type>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>Date</name>
			
 
				-      <type>date</type> 
			
 
				       <definition>The simulation date.</definition>
			
 
				+      <type>date</type>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>Program</name>
			
 
				-      <type>string</type> 
			
 
				       <definition>The program name.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>ProgramVersion</name>
			
 
				-      <type>string</type> 
			
 
				       <definition>The program version name.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>Description</name>
			
 
				-      <type>string</type> 
			
 
				       <definition>A descriptive text.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				 
			
 
				     <!--     Basics    -->
			
 
				     <property>
			
 
				       <name>RestingPotential</name>
			
 
				-      <type>float</type> 
			
 
				-      <unit>V</unit>
			
 
				       <definition>The resting voltage.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>V</unit>
			
 
				     </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>ResetPotential</name>
			
 
				-      <type>float</type> 
			
 
				-      <unit>V</unit>
			
 
				       <definition>The potential to which the neuron's potential is set after a spike.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>V</unit>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>Resistance</name>
			
 
				-      <type>float</type> 
			
 
				+      <definition>The membrane resistance.</definition>
			
 
				+      <type>float</type>
			
 
				       <unit>Ohm</unit>
			
 
				-      <definition>The membrane restisance.</definition>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>Capacitance</name>
			
 
				-      <type>float</type> 
			
 
				+      <definition>The membrane resistance.</definition>
			
 
				+      <type>float</type>
			
 
				       <unit>F</unit>
			
 
				-      <definition>The membrane restisance.</definition>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>MembraneTimeConstant</name>
			
 
				-      <type>float</type> 
			
 
				-      <unit>s</unit>
			
 
				       <definition>The membrane time constant.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>s</unit>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>BiasCurrent</name>
			
 
				-      <type>float</type> 
			
 
				-      <unit>A</unit>
			
 
				       <definition>The offset current.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>A</unit>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>Timestep</name>
			
 
				-      <type>float</type> 
			
 
				-      <unit>s</unit>
			
 
				       <definition>The duration of a time step in the simulation.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>s</unit>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>VoltageEquation</name>
			
 
				-      <type>string</type> 
			
 
				       <definition>The equation to calculate the membrane voltage.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				 
			
 
				     <!--     Adaptation -->
			
 
				     <property>
			
 
				       <name>AdaptationIncrement</name>
			
 
				-      <type>float</type> 
			
 
				+      <definition>When an adaptation current is implemented the amount about which the adaptation is increased when a
			
 
				+        spike is fired.
			
 
				+      </definition>
			
 
				+      <type>float</type>
			
 
				       <unit>A</unit>
			
 
				-      <definition>When an adaptation current is implemented the amount about which the adaptation is increased when a spike is fired.</definition>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>AdaptationTimeConstant</name>
			
 
				-      <type>float</type> 
			
 
				-      <unit>s</unit>
			
 
				       <definition>The time constant with which the adaptation current returns back to zero.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>s</unit>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>AdaptationEquation</name>
			
 
				-      <type>string</type> 
			
 
				-      <definition>The equation to calculate the adaptation currrent.</definition>
			
 
				+      <definition>The equation to calculate the adaptation current.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				 
			
 
				     <!--     Noise  -->
			
 
				     <property>
			
 
				       <name>NoiseAmplitude</name>
			
 
				-      <type>float</type> 
			
 
				-      <unit>A</unit>
			
 
				       <definition>The amount of noise added.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>A</unit>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>NoiseType</name>
			
 
				-      <type>string</type> 
			
 
				       <definition>The type of noise. For example Gaussian, Ohrnstein-Uhlenbeck etc.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>NoiseCorrelation</name>
			
 
				-      <type>float</type> 
			
 
				-      <unit>s</unit>
			
 
				       <definition>The correlation time constant used e.g. with OU noise.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>s</unit>
			
 
				     </property>
			
 
				 
			
 
				     <!-- Threshold settings -->
			
 
				     <property>
			
 
				       <name>Threshold</name>
			
 
				-      <type>float</type> 
			
 
				-      <unit>V</unit>
			
 
				       <definition>The firing threshold.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>V</unit>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>ThresholdIncrement</name>
			
 
				-      <type>float</type> 
			
 
				-      <unit>V</unit>
			
 
				       <definition>The voltage about which the threshold is increased once a spike has been fired.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>V</unit>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>ThresholdTimeConstant</name>
			
 
				-      <type>float</type> 
			
 
				+      <definition>The time constant with which the threshold returns back to baseline.</definition>
			
 
				+      <type>float</type>
			
 
				       <unit>s</unit>
			
 
				-      <definition>The time ocnstant with which the threshold returns back to baseline.</definition>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>ThresholdEquation</name>
			
 
				-      <type>string</type> 
			
 
				       <definition>The equation to calculate the threshold.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				 
			
 
				   </section>
			
 
				-</odML> 
			
 
				+</odML>
			
--- a/v1.1/model/multi_compartment.xml
+++ b/v1.1/model/multi_compartment.xml
@@ -1,21 +1,23 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************************************* -->
			
 
				-<!--            multi compartmental model 	  	       -->
			
 
				-<!-- ********************************************************* --> 
			
 
				+<!--            multi compartmental model                      -->
			
 
				+<!-- ********************************************************* -->
			
 
				 <odML version="1.1">
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.0</version>
			
 
				   <date>2011-10-14</date>
			
 
				+
			
 
				   <section>
			
 
				-    <type>model/multi_comparment</type>
			
 
				+    <type>model/multi_compartment</type>
			
 
				     <name>Multi compartment model</name>
			
 
				     <definition>Properties to describe a biophysical model that consists of a number of compartments.</definition>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>SimulationType</name>
			
 
				-      <type>string</type> 
			
 
				-      <definition>The type of simulation: mathmatical, phenomenological, biophysical etc..</definition>
			
 
				+      <definition>The type of simulation: mathematical, phenomenological, biophysical etc..</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				+
			
 
				   </section>
			
 
				-</odML> 
			
 
				+</odML>
			
--- a/v1.1/model/odmlTerms.xsl
+++ b/v1.1/model/odmlTerms.xsl
@@ -1,101 +1,188 @@
 
				 <?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">
			
 
				+                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; } 
			
 
				+   <!-- 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%;} 
			
 
				+            #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">     
			
 
				+            #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>
			
 
				-            <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/>
			
 
				+               <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>
			
 
				-   
			
 
				-         
			
 
				-            
			
 
				-            <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>
			
 
				+            <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
			
 
				 
			
 
				-<!-- ************************************************  -->
			
 
				-<!--              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>
			
 
				+            <!--  Check if there are any properties  -->
			
 
				+            <xsl:if test="property">
			
 
				+               <table border="1" rules="rows" width="100%"><font size="-1">
			
 
				+                  <tr bgcolor="#336699">
			
 
				+                     <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>
			
 
				+                  <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%">
			
 
				+                           <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="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>
			
 
				+                  </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">
			
@@ -103,96 +190,10 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
 
				                      <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: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>
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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:if>
			
 
				+         </xsl:otherwise>
			
 
				+      </xsl:choose>
			
 
				+   </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/model/pif.xml
+++ b/v1.1/model/pif.xml
@@ -1,21 +1,23 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************************************* -->
			
 
				-<!--            perfect integrate and fire	  	       -->
			
 
				-<!-- ********************************************************* --> 
			
 
				+<!--            perfect integrate and fire                     -->
			
 
				+<!-- ********************************************************* -->
			
 
				 <odML version="1.1">
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.0</version>
			
 
				   <date>2011-10-14</date>
			
 
				+
			
 
				   <section>
			
 
				     <type>model/pif</type>
			
 
				     <name>perfect Integrate and Fire</name>
			
 
				     <definition>Properties to describe a perfect integrate and fire model.</definition>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>SimulationType</name>
			
 
				-      <type>string</type> 
			
 
				       <definition>The type of simulation: mathematical, phenomenological, biophysical etc..</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				+
			
 
				   </section>
			
 
				-</odML> 
			
 
				+</odML>
			
--- a/v1.1/model/single_compartment.xml
+++ b/v1.1/model/single_compartment.xml
@@ -1,21 +1,23 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************************************* -->
			
 
				-<!--            single-compartmental model 	  	       -->
			
 
				-<!-- ********************************************************* --> 
			
 
				+<!--            single-compartmental model                     -->
			
 
				+<!-- ********************************************************* -->
			
 
				 <odML version="1.1">
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.0</version>
			
 
				   <date>2011-10-14</date>
			
 
				+
			
 
				   <section>
			
 
				-    <type>model/single_comparment</type>
			
 
				+    <type>model/single_compartment</type>
			
 
				     <name>Single compartment model</name>
			
 
				     <definition>Properties to describe a biophysical model that consists of a single compartment.</definition>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>SimulationType</name>
			
 
				-      <type>string</type> 
			
 
				-      <definition>The type of simulation: mathmatical, phenomenological, biophysical etc..</definition>
			
 
				+      <definition>The type of simulation: mathematical, phenomenological, biophysical etc..</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				+
			
 
				   </section>
			
 
				-</odML> 
			
 
				+</odML>
			
--- a/v1.1/odML.xsd
+++ b/v1.1/odML.xsd
@@ -66,7 +66,7 @@
 
				         <xs:element name="repository" type="xs:string" minOccurs="0" maxOccurs="1"/>
			
 
				         <xs:element ref="section" minOccurs="1" maxOccurs="unbounded"/>
			
 
				       </xs:choice>
			
 
				-    <xs:attribute name="version" type="xs:string"/>
			
 
				-  </xs:complexType>
			
 
				- </xs:element>
			
 
				+      <xs:attribute name="version" type="xs:string"/>
			
 
				+    </xs:complexType>
			
 
				+  </xs:element>
			
 
				 </xs:schema>
			
--- a/v1.1/odMLTerminologies.xml
+++ b/v1.1/odMLTerminologies.xml
@@ -1,327 +1,332 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odMLTerminologies.xsl"?>
			
 
				-<odML version="1"> 
			
 
				-	<baseURL>http://www.g-node.org/odml/terminologies/v1.0/</baseURL>
			
 
				-	<section>
			
 
				-		<type>analysis/generic</type>
			
 
				-		<name>Analysis</name>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>analysis/psth</type>
			
 
				-			<name>PSTH</name>
			
 
				-		</section>
			
 
				-	</section>
			
 
				-		
			
 
				-	<section>
			
 
				-		<type>cell/generic</type>
			
 
				-		<name>Cell</name>
			
 
				-	</section>
			
 
				-	
			
 
				-	<section>
			
 
				-		<type>dataset/generic</type>
			
 
				-		<name>Dataset</name>
			
 
				-	</section>
			
 
				-	
			
 
				-	
			
 
				-	
			
 
				-	<section>
			
 
				-		<type>event/generic</type>
			
 
				-		<name>Event</name>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>event/eventList</type>
			
 
				-			<name>EventList</name>
			
 
				-		</section>
			
 
				-	</section>
			
 
				-  
			
 
				-	<section>
			
 
				-		<type>electrode/generic</type>
			
 
				-		<name>Electrode</name>
			
 
				-	</section>
			
 
				-	
			
 
				-	<section>
			
 
				-		<type>experiment/generic</type>
			
 
				-		<name>Experiment</name>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>experiment/behavior</type>
			
 
				-			<name>Behavior</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>experiment/electrophysiology</type>
			
 
				-			<name>Electrophysiology</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>experiment/imaging</type>
			
 
				-			<name>Imaging</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>experiment/modeling</type>
			
 
				-			<name>Modeling</name>		      
			
 
				-		</section>
			
 
				-   	
			
 
				-		<section>
			
 
				-			<type>experiment/pschophysics</type>
			
 
				-			<name>Psychophysics</name>
			
 
				-		</section>	
			
 
				-	</section>
			
 
				-    
			
 
				-	<section>
			
 
				-          <type>collection/hardwareProperties</type>
			
 
				-		<name>HardwareProperties</name>
			
 
				-		<definition>There are two hardware related sections i.e. the
			
 
				+<odML version="1.1">
			
 
				+  <baseURL>http://www.g-node.org/odml/terminologies/v1.1/</baseURL>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>analysis/generic</type>
			
 
				+    <name>Analysis</name>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>analysis/psth</type>
			
 
				+      <name>PSTH</name>
			
 
				+    </section>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>cell/generic</type>
			
 
				+    <name>Cell</name>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>dataset/generic</type>
			
 
				+    <name>Dataset</name>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>event/generic</type>
			
 
				+    <name>Event</name>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>event/eventList</type>
			
 
				+      <name>EventList</name>
			
 
				+    </section>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>electrode/generic</type>
			
 
				+    <name>Electrode</name>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>experiment/generic</type>
			
 
				+    <name>Experiment</name>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>experiment/behavior</type>
			
 
				+      <name>Behavior</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>experiment/electrophysiology</type>
			
 
				+      <name>Electrophysiology</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>experiment/imaging</type>
			
 
				+      <name>Imaging</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>experiment/modeling</type>
			
 
				+      <name>Modeling</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>experiment/pschophysics</type>
			
 
				+      <name>Psychophysics</name>
			
 
				+    </section>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>collection/hardwareProperties</type>
			
 
				+    <name>HardwareProperties</name>
			
 
				+    <definition>There are two hardware related sections i.e. the
			
 
				       "HardwareProperties" and the "HardwareSettings" section. While
			
 
				       the properties describe the static properties of the hardware
			
 
				       that do not change, the settings section describes the actual,
			
 
				       adjustable, parameters, of the hardware that may change with
			
 
				-      each recording or dataset e.g. the sample rate of an
			
 
				+      each recording or dataset e.g. the animal_keeping rate of an
			
 
				       data acquisition board. In each of these sections there are
			
 
				       subsections for each device (or can be) that correspond to the
			
 
				       class of the device like data-acquisition, amplifier, etc. Some
			
 
				-      properties are common for any type.</definition>
			
 
				-		<section>
			
 
				-			<type>hardware/generic</type>
			
 
				-			<name>Hardware</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/attenuator</type>
			
 
				-			<name>Attenuator</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/cameraObjective</type>
			
 
				-			<name>CameraObjective</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/daq</type>
			
 
				-			<name>DataAcquisition</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/eyetracker</type>
			
 
				-			<name>Eyetracker</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/filter</type>
			
 
				-			<name>Filter</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/filterSet</type>
			
 
				-			<name>Filterset</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/iaq</type>
			
 
				-			<name>ImageAcquisition</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/lightSource</type>
			
 
				-			<name>Lightsource</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/microscope</type>
			
 
				-			<name>Microscope</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/microscopeObjective</type>
			
 
				-			<name>MicroscopeObjective</name>
			
 
				-		</section>
			
 
				-				
			
 
				-		<section>
			
 
				-			<type>hardware/scanner</type>
			
 
				-			<name>Scanner</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/stimulusIsolator</type>
			
 
				-			<name>StimulusIsolator</name>
			
 
				-		</section>
			
 
				-	</section>
			
 
				-	
			
 
				-	<section>
			
 
				-		<type>collection/hardwareSettings</type>
			
 
				-                <name>HardwareSettings</name>
			
 
				-		<definition>There are two hardware related sections i.e. the
			
 
				+      properties are common for any type.
			
 
				+    </definition>
			
 
				+    <section>
			
 
				+      <type>hardware/generic</type>
			
 
				+      <name>Hardware</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/attenuator</type>
			
 
				+      <name>Attenuator</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/cameraObjective</type>
			
 
				+      <name>CameraObjective</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/daq</type>
			
 
				+      <name>DataAcquisition</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/eyetracker</type>
			
 
				+      <name>Eyetracker</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/filter</type>
			
 
				+      <name>Filter</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/filterSet</type>
			
 
				+      <name>Filterset</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/iaq</type>
			
 
				+      <name>ImageAcquisition</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/lightSource</type>
			
 
				+      <name>Lightsource</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/microscope</type>
			
 
				+      <name>Microscope</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/microscopeObjective</type>
			
 
				+      <name>MicroscopeObjective</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/scanner</type>
			
 
				+      <name>Scanner</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/stimulusIsolator</type>
			
 
				+      <name>StimulusIsolator</name>
			
 
				+    </section>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>collection/hardwareSettings</type>
			
 
				+    <name>HardwareSettings</name>
			
 
				+    <definition>There are two hardware related sections i.e. the
			
 
				       "Hardwaredefinition" and the "HardwareSettings" section. While
			
 
				       the properties describe the static properties of the hardware
			
 
				       that do not change, the settings section describes the actual,
			
 
				       adjustable, parameters, of the hardware that may change with
			
 
				-      each recording or dataset e.g. the sample rate of an
			
 
				+      each recording or dataset e.g. the animal_keeping rate of an
			
 
				       dataacquisition board. In each of these sections there are
			
 
				       subsections for each device (or can be) that correspond to the
			
 
				       class of the device like data-acquisition, amplifier, etc. Some
			
 
				-      properties are common for any type.</definition>  
			
 
				-      <section>
			
 
				-			<type>hardware/generic</type>
			
 
				-			<name>Hardware</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/amplifier</type>
			
 
				-			<name>Amplifier</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/attenuator</type>
			
 
				-			<name>Attenuator</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/cameraObjective</type>
			
 
				-			<name>CameraObjective</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/daq</type>
			
 
				-			<name>DataAcquisition</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/eyetracker</type>
			
 
				-			<name>Eyetracker</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/filter</type>
			
 
				-			<name>Filter</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/filterSet</type>
			
 
				-			<name>Filterset</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/iaq</type>
			
 
				-			<name>ImageAcquisition</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/lightSource</type>
			
 
				-			<name>Lightsource</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/microscope</type>
			
 
				-			<name>Microscope</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/microscopeObjective</type>
			
 
				-			<name>MicroscopeObjective</name>
			
 
				-		</section>
			
 
				-				
			
 
				-		<section>
			
 
				-			<type>hardware/scanner</type>
			
 
				-			<name>Scanner</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>hardware/stimulusIsolator</type>
			
 
				-			<name>StimulusIsolator</name>
			
 
				-		</section>
			
 
				-	</section>
			
 
				-			
			
 
				-	<section>
			
 
				-		<type>person/generic</type>
			
 
				-		<name>Person</name>
			
 
				-	</section>	
			
 
				-	
			
 
				-	<section>
			
 
				-		<type>preparation/generic</type>
			
 
				-		<name>Preparation</name>
			
 
				-	</section>
			
 
				-	
			
 
				-	<section>
			
 
				-		<type>recording/generic</type>
			
 
				-		<name>Recording</name>
			
 
				-	</section>
			
 
				-	
			
 
				-	<section>
			
 
				-		<type>setup/generic</type>
			
 
				-		<name>Setup</name>
			
 
				-	</section>
			
 
				-	
			
 
				-	<section>
			
 
				-		<type>stimulus/generic</type>
			
 
				-		<name>Stimulus</name>
			
 
				-        <definition>Some global definitions of the applied stimulus. This section is parent to various subsections that further specify the applied stimulus.</definition>
			
 
				-        
			
 
				-      	<section>
			
 
				-			<type>stimulus/dc</type>
			
 
				-			<name>DC</name>
			
 
				-		</section>
			
 
				-      
			
 
				-		<section>
			
 
				-			<type>stimulus/gabor</type>
			
 
				-			<name>Gabor</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>stimulus/grating</type>
			
 
				-			<name>Grating</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>stimulus/pulse</type>
			
 
				-			<name>Pulse</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>stimulus/movie</type>
			
 
				-		   <name>Movie</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>stimulus/ramp</type>
			
 
				-			<name>Ramp</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>stimulus/randomDot</type>
			
 
				-			<name>RandomDot</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>stimulus/sawtooth</type>
			
 
				-			<name>Sawtooth</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>stimulus/sinewave</type>
			
 
				-			<name>Sinewave</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>stimulus/squarewave</type>
			
 
				-			<name>Squarewave</name>
			
 
				-		</section>
			
 
				-		
			
 
				-		<section>
			
 
				-			<type>stimulus/whitenoise</type>
			
 
				-			<name>WhiteNoise</name>
			
 
				-		</section>
			
 
				-	</section>
			
 
				-	
			
 
				-	<section>
			
 
				-		<type>subject/generic</type>
			
 
				-		<name>Subject</name>
			
 
				-	</section>
			
 
				-   
			
 
				-	<section>
			
 
				-		<type>carmenMini/generic</type>
			
 
				-		<name>CarmenMini</name>
			
 
				-		<definition>This is a convenience section that lists the terms of the CARMEN MINI (Gibson et al. Nature Precedings, 2009 Version 0.6) and 
			
 
				-      maps them to the odml "standard" terminologies.</definition>
			
 
				-	</section>
			
 
				+      properties are common for any type.
			
 
				+    </definition>
			
 
				+    <section>
			
 
				+      <type>hardware/generic</type>
			
 
				+      <name>Hardware-2</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/amplifier</type>
			
 
				+      <name>Amplifier</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/attenuator</type>
			
 
				+      <name>Attenuator-2</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/cameraObjective</type>
			
 
				+      <name>CameraObjective-2</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/daq</type>
			
 
				+      <name>DataAcquisition-2</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/eyetracker</type>
			
 
				+      <name>Eyetracker-2</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/filter</type>
			
 
				+      <name>Filter-2</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/filterSet</type>
			
 
				+      <name>Filterset-2</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/iaq</type>
			
 
				+      <name>ImageAcquisition-2</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/lightSource</type>
			
 
				+      <name>Lightsource-2</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/microscope</type>
			
 
				+      <name>Microscope-2</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/microscopeObjective</type>
			
 
				+      <name>MicroscopeObjective-2</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/scanner</type>
			
 
				+      <name>Scanner-2</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>hardware/stimulusIsolator</type>
			
 
				+      <name>StimulusIsolator-2</name>
			
 
				+    </section>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>person/generic</type>
			
 
				+    <name>Person</name>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>preparation/generic</type>
			
 
				+    <name>Preparation</name>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>recording/generic</type>
			
 
				+    <name>Recording</name>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>setup/generic</type>
			
 
				+    <name>Setup</name>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>stimulus/generic</type>
			
 
				+    <name>Stimulus</name>
			
 
				+    <definition>Some global definitions of the applied stimulus. This section is parent to various subsections that
			
 
				+      further specify the applied stimulus.
			
 
				+    </definition>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>stimulus/dc</type>
			
 
				+      <name>DC</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>stimulus/gabor</type>
			
 
				+      <name>Gabor</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>stimulus/grating</type>
			
 
				+      <name>Grating</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>stimulus/pulse</type>
			
 
				+      <name>Pulse</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>stimulus/movie</type>
			
 
				+      <name>Movie</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>stimulus/ramp</type>
			
 
				+      <name>Ramp</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>stimulus/randomDot</type>
			
 
				+      <name>RandomDot</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>stimulus/sawtooth</type>
			
 
				+      <name>Sawtooth</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>stimulus/sinewave</type>
			
 
				+      <name>Sinewave</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>stimulus/squarewave</type>
			
 
				+      <name>Squarewave</name>
			
 
				+    </section>
			
 
				+
			
 
				+    <section>
			
 
				+      <type>stimulus/whitenoise</type>
			
 
				+      <name>WhiteNoise</name>
			
 
				+    </section>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>subject/generic</type>
			
 
				+    <name>Subject</name>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>carmenMini/generic</type>
			
 
				+    <name>CarmenMini</name>
			
 
				+    <definition>This is a convenience section that lists the terms of the CARMEN MINI (Gibson et al. Nature Precedings,
			
 
				+      2009 Version 0.6) and maps them to the odml "standard" terminologies.
			
 
				+    </definition>
			
 
				+  </section>
			
 
				+
			
 
				 </odML>
			
--- a/v1.1/odMLTerminologies.xsl
+++ b/v1.1/odMLTerminologies.xsl
@@ -1,115 +1,113 @@
 
				 <?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">
			
 
				-<!-- ************************************************  -->
			
 
				-<!--                   root template                   -->
			
 
				-<xsl:template match="odML">
			
 
				-  <html>
			
 
				+                xmlns:fn="http://www.w3.org/2005/02/xpath-functions">
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--                   root template                   -->
			
 
				+  <xsl:template match="odML">
			
 
				+    <html>
			
 
				       <style type="text/css">
			
 
				-      <link href="../../images/odMLIcon.ico" rel="shortcut icon" csoptsettings="AQAAAD142mNgYNBomeIwObe4IIeBgYEvyTDuaAoPw3IFiwOcndS8HR1NjO0NDPTNdIzzEzOByni+A8EQNoAAPMPEQ4=" livesrc="../../images/odMLIcon.png" />
			
 
				-      body { margin:0; padding:0; height:1500px; } div { border:0px
			
 
				-      solid #888; } 
			
 
				-      #contentContainer {position:absolute; left:251px; top:1px; width:80%;
			
 
				-      height:auto;}
			
 
				+        <link href="../../images/odMLIcon.ico" rel="shortcut icon"
			
 
				+              csoptsettings="AQAAAD142mNgYNBomeIwObe4IIeBgYEvyTDuaAoPw3IFiwOcndS8HR1NjO0NDPTNdIzzEzOByni+A8EQNoAAPMPEQ4="
			
 
				+              livesrc="../../images/odMLIcon.png" />
			
 
				+        body { margin:0; padding:0; height:1500px; } div { border:0px
			
 
				+        solid #888; }
			
 
				+        #contentContainer {position:absolute; left:251px; top:1px; width:80%;
			
 
				+        height:auto;}
			
 
				       </style>
			
 
				       <body>
			
 
				-      <p><a href="index.html"><img src="../../images/odMLTitle.png" alt="" title="Home" height="128" width="707" border="0" /></a></p>
			
 
				-   	<h1>odML - Terminologies</h1>
			
 
				-   	<h3>How to use:</h3>
			
 
				-   	<p>The terminologies (see below) generally define the names of properties. In some cases we also define "values". This is mainly the case if the 
			
 
				-   	occurence of a certain property value requires more properties for further specification. One example for this would
			
 
				-   	be the switching frequency on an amplifier used in an electrophysiological experiment. This property is only meaningful if the amplifier was used in 
			
 
				-   	in a discontinuous operation mode.
			
 
				-   	<ul>
			
 
				-   	<li>Please understand these names as suggestions!</li>
			
 
				-   	<li>Thus, if you find a property definition fitting your needs please use it.</li>
			
 
				-   	<li>Otherwise simply create your own properties. </li>
			
 
				-   	<li>These may not be recognized by other tools but your metadatum is stored!</li>
			
 
				-   	<li>If you further find that the just created property is of general interest please provide a definition 
			
 
				-   	and do not hesitate to send it to us. We would be happy to include it. </li>
			
 
				-   	</ul>
			
 
				-   	</p>
			
 
				-   	<h3>So far defined terminologies</h3>
			
 
				-   	<p>The following Terminologies contain definitions according to the seciton name. If you specify e.g. the 
			
 
				-   	sample rate of an analog input device include it contained within the respective section into your odML - file.</p>
			
 
				-   	<xsl:variable name="baseurl" select="baseURL"/>
			
 
				-		<ol>
			
 
				-			<xsl:if test="section">
			
 
				-				<xsl:for-each select="section">
			
 
				-				   <br/>
			
 
				-					<xsl:call-template name="sectionTemplate">
			
 
				-						<xsl:with-param name="url" select="$baseurl"/>
			
 
				-					</xsl:call-template>
			
 
				-				</xsl:for-each>
			
 
				-			</xsl:if>       
			
 
				-      </ol>
			
 
				-   </body>
			
 
				-  </html> 
			
 
				-</xsl:template>
			
 
				+        <p><a href="index.html"><img src="../../images/odMLTitle.png" alt="" title="Home" height="128" width="707" border="0" /></a></p>
			
 
				+        <h1>odML - Terminologies</h1>
			
 
				+        <h3>How to use:</h3>
			
 
				+        <p>The terminologies (see below) generally define the names of properties. In some cases we also define
			
 
				+          "values". This is mainly the case if the occurrence of a certain property value requires more properties
			
 
				+          for further specification. One example for this would be the switching frequency on an amplifier used
			
 
				+          in an electrophysiological experiment. This property is only meaningful if the amplifier was used in
			
 
				+          in a discontinuous operation mode.
			
 
				+          <ul>
			
 
				+            <li>Please understand these names as suggestions!</li>
			
 
				+            <li>Thus, if you find a property definition fitting your needs please use it.</li>
			
 
				+            <li>Otherwise simply create your own properties. </li>
			
 
				+            <li>These may not be recognized by other tools but your metadatum is stored!</li>
			
 
				+            <li>If you further find that the just created property is of general interest please provide a definition
			
 
				+              and do not hesitate to send it to us. We would be happy to include it. </li>
			
 
				+          </ul>
			
 
				+        </p>
			
 
				+        <h3>So far defined terminologies</h3>
			
 
				+        <p>The following Terminologies contain definitions according to the section name. If you specify e.g.
			
 
				+          the sample rate of an analog input device include it contained within the respective section into
			
 
				+          your odML - file.</p>
			
 
				+        <xsl:variable name="baseurl" select="baseURL"/>
			
 
				+        <ol>
			
 
				+          <xsl:if test="section">
			
 
				+            <xsl:for-each select="section">
			
 
				+              <br/>
			
 
				+              <xsl:call-template name="sectionTemplate">
			
 
				+                <xsl:with-param name="url" select="$baseurl"/>
			
 
				+              </xsl:call-template>
			
 
				+            </xsl:for-each>
			
 
				+          </xsl:if>
			
 
				+        </ol>
			
 
				+      </body>
			
 
				+    </html>
			
 
				+  </xsl:template>
			
 
				+
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              section template.                    -->
			
 
				+  <xsl:template name="sectionTemplate" match="section">
			
 
				+    <xsl:param name="url"/>
			
 
				+    <!-- combine the link name -->
			
 
				+    <xsl:variable name="linkName">
			
 
				+      <xsl:choose>
			
 
				+        <xsl:when test="baseURL">
			
 
				+          <xsl:value-of select="concat(baseURL,type,'.xml')"/>
			
 
				+        </xsl:when>
			
 
				+        <xsl:otherwise>
			
 
				+          <xsl:value-of select="concat($url,type,'.xml')"/>
			
 
				+        </xsl:otherwise>
			
 
				+      </xsl:choose>
			
 
				+    </xsl:variable>
			
 
				+    <!-- set new baseurl if specified within this section otherwise use the old one -->
			
 
				+    <xsl:variable name="baseurl">
			
 
				+      <xsl:choose>
			
 
				+        <xsl:when test="baseURL">
			
 
				+          <xsl:value-of select ="baseURL"/>
			
 
				+        </xsl:when>
			
 
				+        <xsl:otherwise>
			
 
				+          <xsl:value-of select ="$url"/>
			
 
				+        </xsl:otherwise>
			
 
				+      </xsl:choose>
			
 
				+    </xsl:variable>
			
 
				+    <!-- the anchor of this section -->
			
 
				+    <xsl:variable name="anchor" select ="type"/>
			
 
				+    <!--   debug
			
 
				+    <p>debug</p>
			
 
				+    <p>link: <xsl:value-of select="$linkName"/></p>
			
 
				+    <p>baseurl: <xsl:value-of select="$baseurl"/></p>
			
 
				+    <p>anchor: <xsl:value-of select="$anchor"/></p>
			
 
				+    <p>debug</p>
			
 
				+    -->
			
 
				+    <!--create the list item -->
			
 
				+    <li>
			
 
				+      <a name="{$anchor}"></a>
			
 
				+      <xsl:choose>
			
 
				+        <xsl:when test="type">
			
 
				+          <a  href="{$linkName}"><xsl:value-of select="concat(name,' - [',type,']')"/></a><br/>
			
 
				+        </xsl:when>
			
 
				+        <xsl:otherwise>
			
 
				+          <a  href="{$linkName}"><xsl:value-of select="name"/></a><br/>
			
 
				+        </xsl:otherwise>
			
 
				+      </xsl:choose>
			
 
				+      <xsl:if test ="definition">
			
 
				+        <p><xsl:value-of select="definition"/></p>
			
 
				+      </xsl:if>
			
 
				+      <ul>
			
 
				+        <xsl:for-each select="section">
			
 
				+          <xsl:call-template name="sectionTemplate">
			
 
				+            <xsl:with-param name="url" select="$baseurl"/>
			
 
				+          </xsl:call-template>
			
 
				+        </xsl:for-each>
			
 
				+      </ul>
			
 
				+    </li>
			
 
				+  </xsl:template>
			
 
				 
			
 
				-<!-- ************************************************  -->
			
 
				-<!--              section template.                    -->
			
 
				-<xsl:template name="sectionTemplate" match="section">
			
 
				-	<xsl:param name="url"/> 
			
 
				-	<!-- combine the link name -->
			
 
				-	<xsl:variable name="linkName">
			
 
				-	   <xsl:choose>
			
 
				-		   <xsl:when test="baseURL">
			
 
				-			   <xsl:value-of select="concat(baseURL,type,'.xml')"/>
			
 
				-		   </xsl:when>
			
 
				-		   <xsl:otherwise>
			
 
				-			   <xsl:value-of select="concat($url,type,'.xml')"/> 
			
 
				-         </xsl:otherwise>
			
 
				-	   </xsl:choose>
			
 
				-   </xsl:variable>
			
 
				-	<!-- set new baseurl if specified within this section otherwise use the old one -->
			
 
				-   <xsl:variable name="baseurl">
			
 
				-	   <xsl:choose>
			
 
				-		   <xsl:when test="baseURL">
			
 
				-			   <xsl:value-of select ="baseURL"/>        
			
 
				-   		</xsl:when>
			
 
				-	   	<xsl:otherwise>
			
 
				-			   <xsl:value-of select ="$url"/>
			
 
				-         </xsl:otherwise>
			
 
				-	   </xsl:choose>
			
 
				-	</xsl:variable>
			
 
				-	<!-- the anchor of this section -->
			
 
				-	<xsl:variable name="anchor" select ="type"/>            
			
 
				-	<!--   debug
			
 
				-	<p>debug</p>
			
 
				-	<p>link: <xsl:value-of select="$linkName"/></p>
			
 
				-	<p>baseurl: <xsl:value-of select="$baseurl"/></p>
			
 
				-	<p>anchor: <xsl:value-of select="$anchor"/></p> 
			
 
				-	<p>debug</p>
			
 
				-	-->
			
 
				-   <!--create the list item -->
			
 
				-	<li>
			
 
				-	   <a name="{$anchor}"> </a>
			
 
				-		
			
 
				-		<xsl:choose>
			
 
				-			<xsl:when test="type">
			
 
				-				<a  href="{$linkName}"><xsl:value-of select="concat(name,' - [',type,']')"/></a><br/>
			
 
				-			</xsl:when>
			
 
				-			<xsl:otherwise>
			
 
				-				<a  href="{$linkName}"><xsl:value-of select="name"/></a><br/> 
			
 
				-			</xsl:otherwise>
			
 
				-		</xsl:choose>
			
 
				-		
			
 
				-		
			
 
				-		<xsl:if test ="definition">
			
 
				-			<p><xsl:value-of select="definition"/></p>
			
 
				-		</xsl:if>
			
 
				-		
			
 
				-		<ul> 
			
 
				-			<xsl:for-each select="section"> 
			
 
				-      		<xsl:call-template name="sectionTemplate">
			
 
				-				   <xsl:with-param name="url" select="$baseurl"/>
			
 
				-				</xsl:call-template> 
			
 
				-         </xsl:for-each> 
			
 
				-		</ul>
			
 
				-		
			
 
				-	</li>
			
 
				-	
			
 
				-</xsl:template>
			
 
				-		
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/odml.xsl
+++ b/v1.1/odml.xsl
@@ -1,93 +1,191 @@
 
				 <?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" xmlns:odml="http://www.g-node.org/odml">
			
 
				-<!-- ************************************************  -->
			
 
				-<!--                   root template                   -->
			
 
				-<xsl:template match="odML">
			
 
				-<xsl:variable name="repository" select="repository"/>
			
 
				-<html>
			
 
				-<style type="text/css">
			
 
				-         body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; } 
			
 
				-    
			
 
				-         #navigationContainer { left:10%; width:95%;} 
			
 
				+                xmlns:fn="http://www.w3.org/2005/02/xpath-functions" xmlns:odml="http://www.g-node.org/odml">
			
 
				+   <!-- ************************************************  -->
			
 
				+   <!--                   root template                   -->
			
 
				+   <xsl:template match="odML">
			
 
				+      <xsl:variable name="repository" select="repository"/>
			
 
				+      <html>
			
 
				+         <style type="text/css">
			
 
				+            body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-         #contentContainer { left:10%; width:95%;}
			
 
				-      </style>
			
 
				-      
			
 
				-      <body>
			
 
				-         <a name="top" style="color:#336699"><h1>odML - Metadata</h1></a>
			
 
				-         <div id="navigationContainer">     
			
 
				+            #navigationContainer { left:10%; width:95%;}
			
 
				+
			
 
				+            #contentContainer { left:10%; width:95%;}
			
 
				+         </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>
			
 
				+
			
 
				+               <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"/>
			
 
				+      <!-- create the anchor for the navigation menu-->
			
 
				+      <xsl:variable name="anchorName" select="concat($anchorBase,position())"/>
			
 
				+      <!-- set new baseurl 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>Section: <xsl:value-of select="name"/> </h3></a>
			
 
				             <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/>
			
 
				+               <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/>
			
 
				+               <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></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>
			
 
				-          
			
 
				-	         <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>
			
 
				+            <!--  Check if there are any properties  -->
			
 
				+            <xsl:if test="property">
			
 
				+               <table border="1" rules="rows" width="100%"><font size ="-1">
			
 
				+                  <tr bgcolor="#336699">
			
 
				+                     <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>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">
			
 
				+                        <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%">
			
 
				+                           <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="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>
			
 
				             </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"/>
			
 
				-   <!-- create the anchor for the navigation menu-->   
			
 
				-   <xsl:variable name="anchorName" select="concat($anchorBase,position())"/>
			
 
				- 	<!-- set new baseurl 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>
			
 
				+            <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">
			
@@ -95,110 +193,11 @@ xmlns:fn="http://www.w3.org/2005/02/xpath-functions" xmlns:odml="http://www.g-no
 
				                      <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: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>Section: <xsl:value-of select="name"/> </h3></a>
			
 
				-         <p>
			
 
				-            <b>Type: </b><xsl:value-of select="type"/><br/>
			
 
				-            <b>Id: </b><xsl:value-of select="id"/><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/>
			
 
				-            <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">
			
 
				-                  <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>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">
			
 
				-                     <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%">
			
 
				-                        <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="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>
			
 
				-         </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:if>
			
 
				+         </xsl:otherwise>
			
 
				+      </xsl:choose>
			
 
				+   </xsl:template>
			
 
				+
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/odmlRepository.xsl
+++ b/v1.1/odmlRepository.xsl
@@ -1,55 +1,55 @@
 
				 <?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" 
			
 
				+                xmlns:fn="http://www.w3.org/2005/02/xpath-functions"
			
 
				                 xmlns:odml="http://www.g-node.org/odml">
			
 
				-<!-- ************************************************  -->
			
 
				-<!--                   root template                   -->
			
 
				-<xsl:template match="odML">
			
 
				-  <html>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--                   root template                   -->
			
 
				+  <xsl:template match="odML">
			
 
				+    <html>
			
 
				       <style type="text/css">
			
 
				-      <link href="../../images/odMLIcon.ico" rel="shortcut icon" csoptsettings="AQAAAD142mNgYNBomeIwObe4IIeBgYEvyTDuaAoPw3IFiwOcndS8HR1NjO0NDPTNdIzzEzOByni+A8EQNoAAPMPEQ4=" livesrc="../../images/odMLIcon.png" />
			
 
				-      body { margin:0; padding:0; height:1500px; } div { border:0px
			
 
				-      solid #888; } 
			
 
				-      #contentContainer {position:absolute; left:251px; top:1px; width:80%;
			
 
				-      height:auto;}
			
 
				+        <link href="../../images/odMLIcon.ico" rel="shortcut icon"
			
 
				+              csoptsettings="AQAAAD142mNgYNBomeIwObe4IIeBgYEvyTDuaAoPw3IFiwOcndS8HR1NjO0NDPTNdIzzEzOByni+A8EQNoAAPMPEQ4="
			
 
				+              livesrc="../../images/odMLIcon.png" />
			
 
				+        body { margin:0; padding:0; height:1500px; } div { border:0px
			
 
				+        solid #888; }
			
 
				+        #contentContainer {position:absolute; left:251px; top:1px; width:80%;
			
 
				+        height:auto;}
			
 
				       </style>
			
 
				       <body>
			
 
				-      <p><a href="index.html"><img src="../../images/odMLTitle.png" alt="" title="Home" height="128" width="707" border="0" /></a></p>
			
 
				-   	<h1>odML - Terminologies</h1>
			
 
				-   	<ol>
			
 
				-	       <xsl:if test="section">
			
 
				-		  <xsl:for-each select="section"><br/>
			
 
				-		    <xsl:call-template name="sectionTemplate"/>
			
 
				-	          </xsl:for-each>
			
 
				-	       </xsl:if>       
			
 
				+        <p><a href="index.html"><img src="../../images/odMLTitle.png" alt="" title="Home" height="128" width="707" border="0" /></a></p>
			
 
				+        <h1>odML - Terminologies</h1>
			
 
				+        <ol>
			
 
				+          <xsl:if test="section">
			
 
				+            <xsl:for-each select="section"><br/>
			
 
				+              <xsl:call-template name="sectionTemplate"/>
			
 
				+            </xsl:for-each>
			
 
				+          </xsl:if>
			
 
				         </ol>
			
 
				-   </body>
			
 
				-  </html> 
			
 
				-</xsl:template>
			
 
				+      </body>
			
 
				+    </html>
			
 
				+  </xsl:template>
			
 
				+
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              section template.                    -->
			
 
				+  <xsl:template name="sectionTemplate" match="section">
			
 
				+
			
 
				+    <!--   debug
			
 
				+    <p>debug</p>
			
 
				+    <p>link: <xsl:value-of select="$linkName"/></p>
			
 
				+    <p>baseurl: <xsl:value-of select="$baseurl"/></p>
			
 
				+    <p>anchor: <xsl:value-of select="$anchor"/></p>
			
 
				+    <p>debug</p>
			
 
				+    -->
			
 
				+    <!--create the list item -->
			
 
				+    <xsl:variable name="linkurl" select="include"/>
			
 
				+    <li>
			
 
				+      <a  href="{$linkurl}"><xsl:value-of select="concat(type,' - type, name: ',name)"/></a><br/>
			
 
				+      <ul>
			
 
				+        <xsl:for-each select="section">
			
 
				+          <xsl:call-template name="sectionTemplate"/>
			
 
				+        </xsl:for-each>
			
 
				+      </ul>
			
 
				+    </li>
			
 
				+  </xsl:template>
			
 
				 
			
 
				-<!-- ************************************************  -->
			
 
				-<!--              section template.                    -->
			
 
				-<xsl:template name="sectionTemplate" match="section">
			
 
				-  	
			
 
				-	<!--   debug
			
 
				-	<p>debug</p>
			
 
				-	<p>link: <xsl:value-of select="$linkName"/></p>
			
 
				-	<p>baseurl: <xsl:value-of select="$baseurl"/></p>
			
 
				-	<p>anchor: <xsl:value-of select="$anchor"/></p> 
			
 
				-	<p>debug</p>
			
 
				-	-->
			
 
				-        <!--create the list item -->
			
 
				-        <xsl:variable name="linkurl" select="include"/>
			
 
				-	<li>
			
 
				-		<a  href="{$linkurl}"><xsl:value-of select="concat(type,' - type, name: ',name)"/></a><br/>
			
 
				-		
			
 
				-		<ul> 
			
 
				-		  <xsl:for-each select="section"> 
			
 
				-      		    <xsl:call-template name="sectionTemplate"/>
			
 
				-                  </xsl:for-each> 
			
 
				-		</ul>
			
 
				-	</li>
			
 
				-	
			
 
				-</xsl:template>
			
 
				-		
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/odmlTerms.xsl
+++ b/v1.1/odmlTerms.xsl
@@ -1,199 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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>
			
 
				+          </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>
			
 
				 
			
 
				-         <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
			
 
				+        <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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> 
			
 
				+        <!--  Check if there are any properties  -->
			
 
				+        <xsl:if test="property">
			
 
				+          <table border="1" rules="rows" width="100%"><font size="-1">
			
 
				+            <tr bgcolor="#336699">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/person/odmlTerms.xsl
+++ b/v1.1/person/odmlTerms.xsl
@@ -1,201 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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/>
			
 
				-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
			
 
				-         <xsl:choose>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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/>
			
 
				-         
			
 
				-<!--
			
 
				--->
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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: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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/person/person.xml
+++ b/v1.1/person/person.xml
@@ -1,4 +1,4 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?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>
			
@@ -14,66 +14,66 @@
 
				 
			
 
				     <property>
			
 
				       <name>FirstName</name>
			
 
				+      <definition>The persons first Name (John).</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The  persons first Name (John).</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>LastName</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The persons last name (Doe).</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>FullName</name>
			
 
				+      <definition>The complete name of this person e.g. John Doe.</definition>
			
 
				       <type>person</type>
			
 
				-      <definition>The complete name of this person e.g. John
			
 
				-      Doe.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Gender</name>
			
 
				-      <type>string</type>
			
 
				       <definition>Male or female?</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Birthday</name>
			
 
				+      <definition>The birthday. YYYY-MM-dd</definition>
			
 
				       <type>date</type>
			
 
				-      <definition> The birthday. YYYY-MM-dd</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Role</name>
			
 
				       <value>[Author, Experimenter, Principle Investigator, Responsible Investigator, Subject]</value>
			
 
				+      <definition>The role of this person e.g. when describing a project (Responsible investigator), or a recording
			
 
				+        (Experimenter).
			
 
				+      </definition>
			
 
				       <type>string</type>
			
 
				-      <definition> The role of this person e.g. when describing
			
 
				-      a project (Responsible investigator), or a recording
			
 
				-      (Experimenter).</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Email</name>
			
 
				+      <definition>Person's e-mail.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition> Person's e-mail.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>PhoneNumber</name>
			
 
				+      <definition>Person's phone number.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition> Person's phone number.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Laterality</name>
			
 
				+      <definition>Handedness - the dominant hand of the subject</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>Handedness - the dominand hand of the subject</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Education level</name>
			
 
				-      <type>string</type>
			
 
				       <definition>Highest archived education level of the person.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-  </section> 
			
 
				+
			
 
				+  </section>
			
 
				 </odML>
			
--- a/v1.1/preparation/odmlTerms.xsl
+++ b/v1.1/preparation/odmlTerms.xsl
@@ -1,201 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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/>
			
 
				-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
			
 
				-         <xsl:choose>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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/>
			
 
				-         
			
 
				-<!--
			
 
				--->
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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: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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/preparation/preparation.xml
+++ b/v1.1/preparation/preparation.xml
@@ -1,123 +1,120 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl"  xmlns:odml="http://www.g-node.org/odml"?>
			
 
				-
			
 
				-<!-- ********************************************************* -->
			
 
				-<!--                  Preparation  section                     -->
			
 
				-<!-- ********************************************************* -->
			
 
				-
			
 
				 <odML version="1.1">
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.0</version>
			
 
				   <date>2011-01-21</date>
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <!--                  Preparation  section                     -->
			
 
				+  <!-- ********************************************************* -->
			
 
				   <section>
			
 
				     <type>preparation</type>
			
 
				     <name>Preparation</name>
			
 
				     <definition>Description of the preparation procedure.</definition>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Description</name>
			
 
				-      <type>text</type>
			
 
				       <definition>A textual description of the preparation.</definition>
			
 
				+      <type>text</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Date</name>
			
 
				-      <type>date</type>
			
 
				       <definition>Actual preparation date.</definition>
			
 
				-    </property>              
			
 
				-    
			
 
				+      <type>date</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Type</name>
			
 
				-      <type>string</type>
			
 
				       <definition>In vivo or in vitro?</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>RingersSolution</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The Ringer solution used during preparation.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>SlicingMethod</name>
			
 
				-      <type>string</type>
			
 
				       <definition>How was the brain sliced: Microtome etc.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>SliceThickness</name>
			
 
				+      <definition>The thickness of the slice.</definition>
			
 
				       <type>string</type>
			
 
				       <unit>&#181;m</unit>
			
 
				-      <definition>The thickness of the slice.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>SliceOrientation</name>
			
 
				+      <definition>The slice orientation: horizontal, sagittal etc.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The slice orientation: horizontal, sagital etc.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>BathSolution</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The solution the slice is bathed in.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>SolutionFlowSpeed</name>
			
 
				-      <type>string</type>
			
 
				-      <unit>ml/min</unit>	      
			
 
				       <definition>The flow speed of the bath solution.</definition>
			
 
				+      <type>string</type>
			
 
				+      <unit>ml/min</unit>
			
 
				     </property>
			
 
				-    
			
 
				-    <property>	
			
 
				+
			
 
				+    <property>
			
 
				       <name>BathTemperature</name>
			
 
				-      <type>float</type>
			
 
				       <definition>The temperature of the bath solution.</definition>
			
 
				+      <type>float</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Anaestesia</name>
			
 
				+      <definition>Is the animal under anaesthesia (true) or awake (false)?</definition>
			
 
				       <type>boolean</type>
			
 
				-      <definition>Is the animal under anaesthesia (true) or
			
 
				-      awake (false)?</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Anaesthetic</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The drug used for anaesthesia.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>AnaestheticDose</name>
			
 
				-      <type>float</type>
			
 
				       <definition>The dose of the used anaesthetic.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>LocalAnaesthesia</name>
			
 
				-      <type>boolean</type>
			
 
				       <definition>Was there some local anaesthesia applied (true or false).</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>boolean</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>LocalAnaesthetic</name>
			
 
				+      <definition>The drug that was used for local anaesthesia.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The drug that was used for local
			
 
				-      anaesthesia.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>LocalAnaestheticDose</name>
			
 
				-      <type>float</type>
			
 
				       <definition>The dose of the used local anaesthetic.</definition>
			
 
				+      <type>float</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>LocalAnaestheticLocation</name>
			
 
				-      <type>string</type>
			
 
				       <definition>Describes the place the local anaesthetic was applied.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-  </section>   
			
 
				+
			
 
				+  </section>
			
 
				 </odML>
			
--- a/v1.1/project/odmlTerms.xsl
+++ b/v1.1/project/odmlTerms.xsl
@@ -1,201 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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/>
			
 
				-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
			
 
				-         <xsl:choose>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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/>
			
 
				-         
			
 
				-<!--
			
 
				--->
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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: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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/project/project.xml
+++ b/v1.1/project/project.xml
@@ -1,53 +1,53 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-<!-- ********************************************************* -->

			
 
				-<!--                   Project section  		       -->

			
 
				-<!-- ********************************************************* -->

			
 
				-

			
 
				-<odML version="1.1">

			
 
				-  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  <version>1.0</version>

			
 
				-  <date>2011-01-21</date>

			
 
				-  <section>

			
 
				-    <type>project</type>

			
 
				-    <name>Project</name>

			
 
				-    <definition>Information about the project.</definition>

			
 
				-

			
 
				-    <property>

			
 
				-      <name>Topic</name>

			
 
				-      <type>text</type> 

			
 
				-      <definition>A descriptive text of the 

			
 
				-      project topic.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Grant</name>

			
 
				-      <type>string</type> 

			
 
				-      <definition>The name or identifier of the grant funding this project.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>PrincipleInvestigator</name>

			
 
				-      <type>person</type> 

			
 
				-      <definition>The person responsible for this project.</definition>

			
 
				-    </property>

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Scientist</name>

			
 
				-      <type>person</type> 

			
 
				-      <definition>Additional involved person(s).</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>Start</name>

			
 
				-      <type>date</type> 

			
 
				-      <definition>The day the project was begun.</definition>

			
 
				-    </property> 

			
 
				-    

			
 
				-    <property>

			
 
				-      <name>End</name>

			
 
				-      <type>date</type> 

			
 
				-      <definition>The date the project ended.</definition>

			
 
				-    </property>      

			
 
				-  </section> 

			
 
				-</odML>

			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				+<!-- ********************************************************* -->
			
 
				+<!--                     Project section                       -->
			
 
				+<!-- ********************************************************* -->
			
 
				+<odML version="1.1">
			
 
				+  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <version>1.0</version>
			
 
				+  <date>2011-01-21</date>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>project</type>
			
 
				+    <name>Project</name>
			
 
				+    <definition>Information about the project.</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Topic</name>
			
 
				+      <definition>A descriptive text of the project topic.</definition>
			
 
				+      <type>text</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Grant</name>
			
 
				+      <definition>The name or identifier of the grant funding this project.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>PrincipleInvestigator</name>
			
 
				+      <definition>The person responsible for this project.</definition>
			
 
				+      <type>person</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Scientist</name>
			
 
				+      <definition>Additional involved person(s).</definition>
			
 
				+      <type>person</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Start</name>
			
 
				+      <definition>The day the project was begun.</definition>
			
 
				+      <type>date</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>End</name>
			
 
				+      <definition>The date the project ended.</definition>
			
 
				+      <type>date</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/protocol/odmlTerms.xsl
+++ b/v1.1/protocol/odmlTerms.xsl
@@ -1,201 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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/>
			
 
				-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
			
 
				-         <xsl:choose>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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/>
			
 
				-         
			
 
				-<!--
			
 
				--->
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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: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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/protocol/protocol.xml
+++ b/v1.1/protocol/protocol.xml
@@ -1,14 +1,12 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				-
			
 
				-<!-- ********************************************************* -->
			
 
				-<!--                     Protocol section                      -->
			
 
				-<!-- ********************************************************* -->
			
 
				-
			
 
				 <odML version="1.1">
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.1</version>
			
 
				   <date>2014-03-01</date>
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <!--                     Protocol section                      -->
			
 
				+  <!-- ********************************************************* -->
			
 
				   <section>
			
 
				     <type>protocol</type>
			
 
				     <name>Protocol</name>
			
@@ -16,39 +14,45 @@
 
				 
			
 
				     <property>
			
 
				       <name>Name</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The protocol name.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				 
			
 
				     <property>
			
 
				       <name>Description</name>
			
 
				-      <type>string</type>
			
 
				       <definition>Description of the experiment</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Author</name>
			
 
				-      <type>person</type>
			
 
				       <definition>The person, who created this protocol.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>person</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>ProtocolFile</name>
			
 
				+      <definition>Protocol File</definition>
			
 
				+      <type>binary</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>ProtocolFileURL</name>
			
 
				-      <type>URL</type>
			
 
				       <definition>URL for protocol file</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>URL</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Duration</name>
			
 
				-      <type>time</type>
			
 
				       <definition>Duration of the protocol.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>time</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Version</name>
			
 
				+      <definition>Version of the protocol</definition>
			
 
				       <type>string</type>
			
 
				-      <definition> Version of the protocol</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				-  </section> 
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				 </odML>
			
--- a/v1.1/questionnaire/odmlTerms.xsl
+++ b/v1.1/questionnaire/odmlTerms.xsl
@@ -0,0 +1,199 @@
 
				+<?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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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>
			
--- a/v1.1/questionnaire/question.xml
+++ b/v1.1/questionnaire/question.xml
@@ -0,0 +1,35 @@
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				+<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				+<!-- ********************************************************* -->
			
 
				+<!--                  Question section                         -->
			
 
				+<!-- ********************************************************* -->
			
 
				+<odML version="1.1">
			
 
				+  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <version>1.0</version>
			
 
				+  <date>2017-09-28</date>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>question</type>
			
 
				+    <name>Question</name>
			
 
				+    <definition>Description of the question.</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Label</name>
			
 
				+      <definition>A label of the questionnaire.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Question</name>
			
 
				+      <definition>Text of the question.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Answer</name>
			
 
				+      <definition>Answer for a question.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/questionnaire/questionnaire.xml
+++ b/v1.1/questionnaire/questionnaire.xml
@@ -0,0 +1,46 @@
 
				+<?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>2017-09-28</date>
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <!--                  Questionnaire  section                   -->
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <section>
			
 
				+    <type>questionnaire</type>
			
 
				+    <name>questionnaire</name>
			
 
				+    <definition>Description of the questionnaire.</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Version</name>
			
 
				+      <definition>A version of the questionnaire.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Label</name>
			
 
				+      <definition>A label of the questionnaire.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Question</name>
			
 
				+      <definition>Question of the questionnaire.</definition>
			
 
				+      <type>question</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>File</name>
			
 
				+      <definition>The binary file with questionnaire.</definition>
			
 
				+      <type>File</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>FileURL</name>
			
 
				+      <definition>URL for questionnaire file.</definition>
			
 
				+      <type>URL</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/recording/odmlTerms.xsl
+++ b/v1.1/recording/odmlTerms.xsl
@@ -1,201 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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/>
			
 
				-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
			
 
				-         <xsl:choose>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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/>
			
 
				-         
			
 
				-<!--
			
 
				--->
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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: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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/recording/recording.xml
+++ b/v1.1/recording/recording.xml
@@ -1,75 +1,78 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				-
			
 
				-<!-- ********************************************************* -->
			
 
				-<!--                    Recording section                      -->
			
 
				-<!-- ********************************************************* --> 
			
 
				-
			
 
				 <odML version="1.1">
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.0</version>
			
 
				   <date>2011-01-21</date>
			
 
				-
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <!--                    Recording section                      -->
			
 
				+  <!-- ********************************************************* -->
			
 
				   <section>
			
 
				     <type>recording</type>
			
 
				     <name>Recording</name>
			
 
				-    <definition>During a recording session in a Setup Datasets are
			
 
				-    obtained from Cells and/or a Subject by using various stimuli (Stimulus section).</definition>
			
 
				-    
			
 
				+    <definition>During a recording session in a Setup Datasets are obtained from Cells and/or a Subject by using various
			
 
				+      stimuli (Stimulus section).
			
 
				+    </definition>
			
 
				+
			
 
				     <property>
			
 
				       <name>Comment</name>
			
 
				-      <type>string</type>
			
 
				       <definition>Comments on the recording session.</definition>
			
 
				-    </property>      
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Experimenter</name>
			
 
				-      <type>person</type>
			
 
				       <definition>The name of the person actually performing the recordings.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>person</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>ExperimenterID</name>
			
 
				-      <type>person</type>
			
 
				       <definition>If registered in a database the primary key of the person that performed the experiments.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>person</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Start</name>
			
 
				+      <definition>The date and time at which the recording started in (YYYY-MM-DD hh:mm:ss format).</definition>
			
 
				       <type>datetime</type>
			
 
				-      <definition>The date and time at which the recording started in  (YYYY-MM-DD hh:mm:ss format).</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>End</name>
			
 
				+      <definition>The date and time at which the recording ended in (YYYY-MM-DD hh:mm:ss format).</definition>
			
 
				       <type>datetime</type>
			
 
				-      <definition>The date and time at which the recording ended in  (YYYY-MM-DD hh:mm:ss format).</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>StartDate</name>
			
 
				-      <type>date</type>
			
 
				       <definition>The date the recording session was conducted (YYYY-MM-DD format).</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>date</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>EndDate</name>
			
 
				+      <definition>The date the recording session ended (YYYY-MM-DD format).</definition>
			
 
				       <type>date</type>
			
 
				-      <definition>The date the recording session ended (YYYY-MM-DD
			
 
				-      format).</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>StartTime</name>
			
 
				-      <type>time</type>
			
 
				       <definition>The time the recordings began (hh:mm:ss format).</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>time</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>EndTime</name>
			
 
				-      <type>time</type>
			
 
				       <definition>The time the recordings ended (hh:mm:ss format).</definition>
			
 
				-    </property> 
			
 
				+      <type>time</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Type</name>
			
 
				+      <definition>The type of recording (EEG, Eyetracker,Motion data).</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				 
			
 
				-  </section> 
			
 
				+  </section>
			
 
				 </odML>
			
--- a/v1.1/response/odmlTerms.xsl
+++ b/v1.1/response/odmlTerms.xsl
@@ -0,0 +1,199 @@
 
				+<?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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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>
			
--- a/v1.1/response/response.xml
+++ b/v1.1/response/response.xml
@@ -0,0 +1,100 @@
 
				+<?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">
			
 
				+  <version>1.0</version>
			
 
				+  <date>2011-01-21</date>
			
 
				+  <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <!--                  Response section                         -->
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <section>
			
 
				+    <type>Response</type>
			
 
				+    <name>Response</name>
			
 
				+    <definition>General description of an received response (on stimulus).</definition>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Description</name>
			
 
				+      <definition>A textual description of the response.</definition>
			
 
				+      <type>text</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Comment</name>
			
 
				+      <definition>A comment on this specific response.</definition>
			
 
				+      <type>text</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Author</name>
			
 
				+      <definition>Who is the author of this response.</definition>
			
 
				+      <type>person</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Duration</name>
			
 
				+      <definition>The duration of the response.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>s</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>StartTime</name>
			
 
				+      <definition>The time the response started.</definition>
			
 
				+      <type>time</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>EndTime</name>
			
 
				+      <definition>The time the response ended.</definition>
			
 
				+      <type>time</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Intensity</name>
			
 
				+      <definition>like the current in case of electrical stimulation.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Location</name>
			
 
				+      <definition>Describes the site of the response application.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Modality</name>
			
 
				+      <definition>Visual, acoustic, haptic, electrical, etc. response.</definition>
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>Repetitions</name>
			
 
				+      <definition>The number of repetitions of the described response.</definition>
			
 
				+      <type>int</type>
			
 
				+    </property>
			
 
				+
			
 
				+    <property>
			
 
				+      <name>InterstimulusInterval</name>
			
 
				+      <definition>The time between two subsequent response.</definition>
			
 
				+      <type>float</type>
			
 
				+      <unit>s</unit>
			
 
				+    </property>
			
 
				+
			
 
				+    <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>
			
 
				+      <type>URL</type>
			
 
				+    </property>
			
 
				+
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/setup/odmlTerms.xsl
+++ b/v1.1/setup/odmlTerms.xsl
@@ -1,201 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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/>
			
 
				-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
			
 
				-         <xsl:choose>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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/>
			
 
				-         
			
 
				-<!--
			
 
				--->
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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: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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/setup/setup.xml
+++ b/v1.1/setup/setup.xml
@@ -1,66 +1,60 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				-
			
 
				-<!-- ********************************************************* -->
			
 
				-<!--                      Setup section                        -->
			
 
				-<!-- ********************************************************* -->
			
 
				-
			
 
				 <odML version="1.1">
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.0</version>
			
 
				   <date>2011-01-21</date>
			
 
				-
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <!--                      Setup section                        -->
			
 
				+  <!-- ********************************************************* -->
			
 
				   <section>
			
 
				     <type>setup</type>
			
 
				     <name>Setup</name>
			
 
				-    <definition>The experimental setup used in the recordings. By
			
 
				-    using HardwareProperties as a subsection, a very detailed
			
 
				-    description of the setup can be given.</definition>
			
 
				-    
			
 
				+    <definition>The experimental setup used in the recordings. By using HardwareProperties as a subsection, a very
			
 
				+      detailed description of the setup can be given.
			
 
				+    </definition>
			
 
				+
			
 
				     <property>
			
 
				       <name>Description</name>
			
 
				-      <type>text</type>
			
 
				       <definition>A description of the setup.</definition>
			
 
				+      <type>text</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Location</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The location of the setup (e.g. room).</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Department</name>
			
 
				+      <definition>The department where the setup is located.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The department where the setup is
			
 
				-      located.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Creator</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The person who built the setup.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Maintainer</name>
			
 
				+      <definition>The person who is responsible for the setup maintenance.</definition>
			
 
				       <type>person</type>
			
 
				-      <definition>The person who is responsible for the setup
			
 
				-      maintanance.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Config</name>
			
 
				+      <definition>An identifier of the used setup configuration, e.g. if variations of the same setup are used.
			
 
				+      </definition>
			
 
				       <type>string</type>
			
 
				-      <definition>An identifier of the used setup
			
 
				-      configuration, e.g. if variations of the same setup are
			
 
				-      used.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>ConfigID</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The ID of a setup configuration stored e.g. in a database.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				 
			
 
				   </section>
			
--- a/v1.1/software/odmlTerms.xsl
+++ b/v1.1/software/odmlTerms.xsl
@@ -1,201 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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/>
			
 
				-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
			
 
				-         <xsl:choose>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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/>
			
 
				-         
			
 
				-<!--
			
 
				--->
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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: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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/software/software.xml
+++ b/v1.1/software/software.xml
@@ -1,83 +1,83 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				-
			
 
				 <!-- ********************************** -->
			
 
				-<!--        Software	 -->
			
 
				+<!--                Software            -->
			
 
				 <!-- ********************************** -->
			
 
				-
			
 
				 <odML version="1.1">
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.0</version>
			
 
				   <date>2014-03-02</date>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>software</type>
			
 
				     <name>Software</name>
			
 
				     <definition>This is a software section .</definition>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Name</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The software's name.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Owner</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The owner of the software.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Developer</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The developer or the developers firm.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Version</name>
			
 
				-      <type>string</type>
			
 
				       <definition>Version of the software.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Licence</name>
			
 
				-      <type>string</type>
			
 
				       <definition>License type</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>LicenceStart</name>
			
 
				-      <type>date</type>
			
 
				       <definition>The start date of time limited licence.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>date</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>LicenceExpiration</name>
			
 
				-      <type>date</type>
			
 
				       <definition>The end date of time limited licence.</definition>
			
 
				+      <type>date</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>LicenceDuration</name>
			
 
				+      <definition>Duration of the licence for the software.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>Duration of the licece for the software.</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>LicenceCount</name>
			
 
				-      <type>int</type>
			
 
				       <definition>Number of the software's licence.</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+      <type>int</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Distribution</name>
			
 
				-      <type>string</type>
			
 
				       <definition>Distribution type</definition>
			
 
				-    </property>  
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Decsription</name>
			
 
				+      <definition>The description of the software.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The descrisption of the software.</definition>
			
 
				-    </property>  
			
 
				+    </property>
			
 
				+
			
 
				   </section>
			
 
				 </odML>
			
--- a/v1.1/stimulus/dc.xml
+++ b/v1.1/stimulus/dc.xml
@@ -1,80 +1,100 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************************************* -->
			
 
				-<!--                      DC stimulus                       -->
			
 
				+<!--                      DC stimulus                          -->
			
 
				 <!-- ********************************************************* -->
			
 
				-<odML version="1.1">   
			
 
				+<odML version="1.1">
			
 
				   <version>1.0</version>
			
 
				   <date>2011-01-21</date>
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus/dc</type>
			
 
				     <name>DC</name>
			
 
				-    <definition>Property definitions to describe a DC stimulus meaning a constant stimulus e.g. a constant illumination, current etc.</definition>
			
 
				-    
			
 
				+    <definition>Property definitions to describe a DC stimulus meaning a constant stimulus e.g. a constant illumination,
			
 
				+      current etc.
			
 
				+    </definition>
			
 
				+
			
 
				     <property>
			
 
				       <name>Modality</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The stimulus modality like acoustic, haptic, light etc.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Duration</name>
			
 
				-      <type>float</type>
			
 
				-      <unit>s</unit>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The duration of the stimulus in seconds.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>float</type><unit>s</unit></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Intensity</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The stimulus intensity in absolute or relative terms.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>IntensityOffset</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The stimulus intensity given as the offset relative to another stimulus.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>TemporalOffset</name>
			
 
				-      <type>float</type>
			
 
				-      <unit>s</unit>
			
 
				-      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was presented.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was
			
 
				+        presented.
			
 
				+      </definition>
			
 
				+    <type>float</type><unit>s</unit></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Function</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The function of the described stimulus. E.g. if the white noise constitutes the carrier.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>OutputChannel</name>
			
 
				-      <type>string</type>
			
 
				-      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker, etc.). This
			
 
				-      information can be used to explicitely express that several stimuli (that share the same OutputChannel) are jointly presented.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker,
			
 
				+        etc.). This information can be used to explicitly express that several stimuli (that share the same
			
 
				+        OutputChannel) are jointly presented.
			
 
				+      </definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Position</name>
			
 
				-      <type>2-tuple</type>
			
 
				-      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position refers to the top-left corner of the object or its bounding box.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position
			
 
				+        refers to the top-left corner of the object or its bounding box.
			
 
				+      </definition>
			
 
				+    <type>2-tuple</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>PositionReference</name>
			
 
				-      <value>[top-left, center, bottom-right]</value>
			
 
				-      <type>string</type>
			
 
				-      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the bounding box). Use this property for other definitions.</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+      <value>top-left
			
 
				+        , center
			
 
				+        , bottom-right
			
 
				+        </value>
			
 
				+      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the
			
 
				+        bounding box). Use this property for other definitions.
			
 
				+      </definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>SpatialExtent</name>
			
 
				-      <type>2-tuple</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The spatial extend of the presented stimulus (width;height) e.g. (1024;768).</definition>
			
 
				-    </property> 
			
 
				+    <type>2-tuple</type></property>
			
 
				+
			
 
				   </section>
			
 
				 </odML>
			
--- a/v1.1/stimulus/gabor.xml
+++ b/v1.1/stimulus/gabor.xml
@@ -1,4 +1,4 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************************************* -->
			
 
				 <!--                      Gabor stimulus                       -->
			
@@ -7,67 +7,85 @@
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.0</version>
			
 
				   <date>2011-01-21</date>
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus/gabor</type>
			
 
				     <name>Gabor</name>
			
 
				     <definition>Property definitions to describe Gabor stimuli.</definition>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Modality</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The stimulus modality like acoustic, haptic, light etc.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Duration</name>
			
 
				-      <type>float</type>
			
 
				-      <unit>s</unit>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The duration of the stimulus in seconds.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>float</type><unit>s</unit></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>TemporalOffset</name>
			
 
				-      <type>float</type>
			
 
				-      <unit>s</unit>
			
 
				-      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was presented.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was
			
 
				+        presented.
			
 
				+      </definition>
			
 
				+    <type>float</type><unit>s</unit></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Function</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The function of the described stimulus. E.g. if the white noise constituted the carrier.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>OutputChannel</name>
			
 
				-      <type>string</type>
			
 
				-      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker, etc.). This
			
 
				-      information can be used to explicitely express that several stimuli (that share the same OutputChannel) are jointly presented.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker,
			
 
				+        etc.). This information can be used to explicitly express that several stimuli (that share the same
			
 
				+        OutputChannel) are jointly presented.
			
 
				+      </definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Dimension</name>
			
 
				-      <type>float</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The dimensionality of the gabor.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>float</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Position</name>
			
 
				-      <type>2-tuple</type>
			
 
				-      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position refers to the top-left corner of the object or its bounding box.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position
			
 
				+        refers to the top-left corner of the object or its bounding box.
			
 
				+      </definition>
			
 
				+    <type>2-tuple</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>PositionReference</name>
			
 
				-      <value>[top-left, center, bottom-right]</value>
			
 
				-      <type>string</type>
			
 
				-      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the bounding box). Use this property for other definitions.</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+      <value>top-left
			
 
				+        , center
			
 
				+        , bottom-right
			
 
				+        </value>
			
 
				+      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the
			
 
				+        bounding box). Use this property for other definitions.
			
 
				+      </definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>SpatialExtent</name>
			
 
				-      <type>2-tuple</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The spatial extend of the presented stimulus (width;height) e.g. (1024;768).</definition>
			
 
				-    </property>
			
 
				+    <type>2-tuple</type></property>
			
 
				+
			
 
				   </section>
			
 
				 </odML>
			
--- a/v1.1/stimulus/grating.xml
+++ b/v1.1/stimulus/grating.xml
@@ -1,4 +1,4 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************************************* -->
			
 
				 <!--                      Grating stimulus                     -->
			
@@ -7,6 +7,7 @@
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.0</version>
			
 
				   <date>2011-01-21</date>
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus/grating</type>
			
 
				     <name>Grating</name>
			
@@ -14,103 +15,126 @@
 
				 
			
 
				     <property>
			
 
				       <name>Modality</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The stimulus modality like acoustic, haptic, visual etc.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Type</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The type of grating used. Commonly either Sinewave or Squarewave gratings are used.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Duration</name>
			
 
				-      <type>float</type>
			
 
				-      <unit>s</unit>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The duration of the stimulus in seconds.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>float</type><unit>s</unit></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>TemporalOffset</name>
			
 
				-      <type>float</type>
			
 
				-      <unit>s</unit>
			
 
				-      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was	presented.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was
			
 
				+        presented.
			
 
				+      </definition>
			
 
				+    <type>float</type><unit>s</unit></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Contrast</name>
			
 
				-      <type>float</type>
			
 
				-      <definition>The contrast of the grating stimulus. </definition>
			
 
				-    </property>
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The contrast of the grating stimulus.</definition>
			
 
				+    <type>float</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Intensity</name>
			
 
				-      <type>float</type>
			
 
				-      <definition>The mean intensity of the grating stimulus. </definition>
			
 
				-    </property>
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The mean intensity of the grating stimulus.</definition>
			
 
				+    <type>float</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>GratingType</name>
			
 
				-      <type>string</type>
			
 
				-      <definition>The type of  grating, i.e. 'sinewave' or 'sqaurewave'. </definition>
			
 
				-    </property>
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The type of grating, i.e. 'sinewave' or 'squarewave'.</definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>SpatialWavelength</name>
			
 
				-      <type>float</type>
			
 
				-      <definition>The spatial wavelength of the  grating. </definition>
			
 
				-    </property>
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The spatial wavelength of the grating.</definition>
			
 
				+    <type>float</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>SpatialFrequency</name>
			
 
				-      <type>float</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>the spatial frequency of the grating.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>float</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>SpatialExtent</name>
			
 
				-      <type>2-tuple</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The spatial extend of the presented stimulus (width;height) e.g. (1024;768).</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>2-tuple</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Orientation</name>
			
 
				-      <unit>°</unit>
			
 
				-      <type>float</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The orientation of the grating in degrees.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>float</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>DriftingVelocity</name>
			
 
				-      <unit>°/s</unit>
			
 
				-      <type>float</type>
			
 
				-      <definition>In case of a constantly drifting grating, the velocity </definition>
			
 
				-    </property>
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>In case of a constantly drifting grating, the velocity</definition>
			
 
				+    <type>float</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Position</name>
			
 
				-      <type>2-tuple</type>
			
 
				-      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position refers to the top-left corner of the object or its bounding box.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position
			
 
				+        refers to the top-left corner of the object or its bounding box.
			
 
				+      </definition>
			
 
				+    <type>2-tuple</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>PositionReference</name>
			
 
				-      <value>[top-left, center, bottom-right</value>
			
 
				-      <type>string</type>
			
 
				-      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the bounding box). Use this property for other definitions.</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+      <value>top-left
			
 
				+        , center
			
 
				+        , bottom-right
			
 
				+        </value>
			
 
				+      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the
			
 
				+        bounding box). Use this property for other definitions.
			
 
				+      </definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Function</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The function of the described stimulus. E.g. if the white noise constituted the carrier.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>OutputChannel</name>
			
 
				-      <type>string</type>
			
 
				-      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker, etc.). This information can be used to explicitely express that several stimuli (that share the same OutputChannel) are jointly	presented.</definition>
			
 
				-    </property>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker,
			
 
				+        etc.). This information can be used to explicitly express that several stimuli (that share the same
			
 
				+        OutputChannel) are jointly presented.
			
 
				+      </definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				   </section>
			
 
				 </odML>
			
--- a/v1.1/stimulus/movie.xml
+++ b/v1.1/stimulus/movie.xml
@@ -1,7 +1,7 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************************************* -->
			
 
				-<!--                   movie stimulus                    -->
			
 
				+<!--                   movie stimulus                          -->
			
 
				 <!-- ********************************************************* -->
			
 
				 <odML version="1.1">
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
@@ -11,79 +11,96 @@
 
				   <section>
			
 
				     <type>stimulus/movie</type>
			
 
				     <name>Movie</name>
			
 
				-    <definition>Properties to describe a movie (or image sequence) stimulus.</definition> 
			
 
				-    
			
 
				+    <definition>Properties to describe a movie (or image sequence) stimulus.</definition>
			
 
				+
			
 
				     <property>
			
 
				       <name>Modality</name>
			
 
				-      <type>string</type>
			
 
				+      <value>visual
			
 
				+        </value>
			
 
				       <definition>The stimulus modality like acoustic, haptic, visual etc.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Duration</name>
			
 
				-      <type>float</type>
			
 
				-      <unit>s</unit>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The duration of the stimulus in seconds.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>float</type><unit>s</unit></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>TemporalOffset</name>
			
 
				-      <type>float</type>
			
 
				-      <unit>s</unit>
			
 
				-      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was presented.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was
			
 
				+        presented.
			
 
				+      </definition>
			
 
				+    <type>float</type><unit>s</unit></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>FrameRate</name>
			
 
				-      <type>float</type>
			
 
				-      <unit>Hz</unit>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The framerate with which the movie was presented.</definition>
			
 
				-    </property>
			
 
				+    <type>float</type><unit>Hz</unit></property>
			
 
				 
			
 
				     <property>
			
 
				       <name>SpatialResolution</name>
			
 
				-      <type>2-tuple</type>
			
 
				-      <unit>pixel</unit>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The image resolution e.g. (640;480) pixel.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>2-tuple</type><unit>pixel</unit></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>ColorSpace</name>
			
 
				-      <value>[monochrome, color]</value>
			
 
				-      <type>string</type>
			
 
				+      <value>monochrome
			
 
				+        , color
			
 
				+        </value>
			
 
				       <definition>Defines whether the movie is a monochrome, black and white, or a color movie.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>ColorDepth</name>
			
 
				-      <type>int</type>
			
 
				-      <unit>bit</unit>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The color resolution in bit.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>int</type><unit>bit</unit></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>OutputChannel</name>
			
 
				-      <type>string</type>
			
 
				-      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker, etc.). This information can be used to explicitely express that several stimuli (that share the same OutputChannel) are jointly	presented.</definition>
			
 
				-    </property>
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker,
			
 
				+        etc.). This information can be used to explicitly express that several stimuli (that share the same
			
 
				+        OutputChannel) are jointly presented.
			
 
				+      </definition>
			
 
				+    <type>string</type></property>
			
 
				 
			
 
				     <property>
			
 
				       <name>Position</name>
			
 
				-      <type>2-tuple</type>
			
 
				-      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position refers to the top-left corner of the object or its bounding box.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position
			
 
				+        refers to the top-left corner of the object or its bounding box.
			
 
				+      </definition>
			
 
				+    <type>2-tuple</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>PositionReference</name>
			
 
				-      <value>[top-left, center, bottom-right]</value>
			
 
				-      <type>string</type>
			
 
				-      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the bounding box). Use this property for other definitions.</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+      <value>top-left
			
 
				+        , center
			
 
				+        , bottom-right
			
 
				+        </value>
			
 
				+      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the
			
 
				+        bounding box). Use this property for other definitions.
			
 
				+      </definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>SpatialExtent</name>
			
 
				-      <type>2-tuple</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The spatial extend of the presented stimulus (width;height) e.g. (1024;768).</definition>
			
 
				-    </property>
			
 
				+    <type>2-tuple</type></property>
			
 
				+
			
 
				   </section>
			
 
				 </odML>
			
--- a/v1.1/stimulus/odmlTerms.xsl
+++ b/v1.1/stimulus/odmlTerms.xsl
@@ -1,199 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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>
			
 
				+          </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>
			
 
				 
			
 
				-         <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
			
 
				+        <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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> 
			
 
				+        <!--  Check if there are any properties  -->
			
 
				+        <xsl:if test="property">
			
 
				+          <table border="1" rules="rows" width="100%"><font size="-1">
			
 
				+            <tr bgcolor="#336699">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/stimulus/pulse.xml
+++ b/v1.1/stimulus/pulse.xml
@@ -1,4 +1,4 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************************************* -->
			
 
				 <!--                      pulse stimulus                       -->
			
@@ -11,64 +11,81 @@
 
				   <section>
			
 
				     <type>stimulus/pulse</type>
			
 
				     <name>Pulse</name>
			
 
				-    <definition></definition>
			
 
				-    
			
 
				+    <definition/>
			
 
				+
			
 
				     <property>
			
 
				       <name>Modality</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The stimulus modality like acoustic, haptic, light etc.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Duration</name>
			
 
				-      <type>float</type>
			
 
				-      <unit>s</unit>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The duration of the stimulus in seconds.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>float</type><unit>s</unit></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>TemporalOffset</name>
			
 
				-      <type>float</type>
			
 
				-      <unit>s</unit>
			
 
				-      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was presented.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was
			
 
				+        presented.
			
 
				+      </definition>
			
 
				+    <type>float</type><unit>s</unit></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Function</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The function of the described stimulus. E.g. if the white noise constituted the carrier.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>OutputChannel</name>
			
 
				-      <type>string</type>
			
 
				-      <definition>The physical output device (e.g. an analog output	channel, a monitor screen, the same loudspeaker, etc.). This
			
 
				-      information can be used to explicitely express that several stimuli (that share the same OutputChannel) are jointly presented.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker,
			
 
				+        etc.). This information can be used to explicitly express that several stimuli (that share the same
			
 
				+        OutputChannel) are jointly presented.
			
 
				+      </definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>IntensityOffset</name>
			
 
				-      <type>float</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The "background" onto which the pulse is added.</definition>
			
 
				-    </property>
			
 
				+    <type>float</type></property>
			
 
				 
			
 
				     <property>
			
 
				       <name>Position</name>
			
 
				-      <type>2-tuple</type>
			
 
				-      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position refers to the top-left corner of the object or its bounding box.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position
			
 
				+        refers to the top-left corner of the object or its bounding box.
			
 
				+      </definition>
			
 
				+    <type>2-tuple</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>PositionReference</name>
			
 
				-      <value>[top-left, center, bottom-right]</value>
			
 
				-      <type>string</type>
			
 
				-      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the bounding box). Use this property for other definitions.</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+      <value>top-left
			
 
				+        , center
			
 
				+        , bottom-right
			
 
				+        </value>
			
 
				+      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the
			
 
				+        bounding box). Use this property for other definitions.
			
 
				+      </definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>SpatialExtent</name>
			
 
				-      <type>2-tuple</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The spatial extend of the presented stimulus (width;height) e.g. (1024;768).</definition>
			
 
				-    </property>
			
 
				+    <type>2-tuple</type></property>
			
 
				+
			
 
				   </section>
			
 
				 </odML>
			
--- a/v1.1/stimulus/ramp.xml
+++ b/v1.1/stimulus/ramp.xml
@@ -1,92 +1,114 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************************************* -->
			
 
				-<!--                      Ramp stimulus                       -->
			
 
				+<!--                      Ramp stimulus                        -->
			
 
				 <!-- ********************************************************* -->
			
 
				 <odML version="1.1">
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.0</version>
			
 
				   <date>2011-01-21</date>
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus/ramp</type>
			
 
				     <name>Ramp</name>
			
 
				-    <definition>A ramp stimulus may either linearly increase or decrease in amplitude. Starting from a certain start amplitude and reaching with a certain slope the destination amplitude.</definition>
			
 
				-    
			
 
				+    <definition>A ramp stimulus may either linearly increase or decrease in amplitude. Starting from a certain start
			
 
				+      amplitude and reaching with a certain slope the destination amplitude.
			
 
				+    </definition>
			
 
				+
			
 
				     <property>
			
 
				       <name>Modality</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The stimulus modality like acoustic, haptic, light etc.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Duration</name>
			
 
				-      <type>float</type>
			
 
				-      <unit>s</unit>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The duration of the stimulus in seconds.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>float</type><unit>s</unit></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>TemporalOffset</name>
			
 
				-      <type>float</type>
			
 
				-      <unit>s</unit>
			
 
				-      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was presented.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was
			
 
				+        presented.
			
 
				+      </definition>
			
 
				+    <type>float</type><unit>s</unit></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Function</name>
			
 
				-      <type>string</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The function of the described stimulus. E.g. if the white noise constituted the carrier.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>OutputChannel</name>
			
 
				-      <type>string</type>
			
 
				-      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker, etc.). This 
			
 
				-      information can be used to explicitely express that several stimuli (that share the same OutputChannel) are jointly presented.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker,
			
 
				+        etc.). This information can be used to explicitly express that several stimuli (that share the same
			
 
				+        OutputChannel) are jointly presented.
			
 
				+      </definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>StartAmplitude</name>
			
 
				-      <type>float</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The start amplitude of the ramp.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    <type>float</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>EndAmplitude</name>
			
 
				-      <type>float</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The ending amplitude.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    <type>float</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Slope</name>
			
 
				-      <type>float</type>
			
 
				-      <definition>The slopewith which the ramp ascends respectively descends.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The slope with which the ramp ascends respectively descends.</definition>
			
 
				+    <type>float</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>RampStartTime</name>
			
 
				-      <type>float</type>
			
 
				-      <unit>s</unit>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The time the ramp started with respect to the beginning of this ramp stimulus.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+    <type>float</type><unit>s</unit></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Position</name>
			
 
				-      <type>2-tuple</type>
			
 
				-      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position refers to the top-left corner of the object or its bounding box.</definition>
			
 
				-    </property>
			
 
				-    
			
 
				+      <value>
			
 
				+        </value>
			
 
				+      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position
			
 
				+        refers to the top-left corner of the object or its bounding box.
			
 
				+      </definition>
			
 
				+    <type>2-tuple</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>PositionReference</name>
			
 
				-      <value>[top-left, center, bottom-right]</value>
			
 
				-      <type>string</type>
			
 
				-      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the bounding box). Use this property for other definitions.</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+      <value>top-left
			
 
				+        , center
			
 
				+        , bottom-right
			
 
				+        </value>
			
 
				+      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the
			
 
				+        bounding box). Use this property for other definitions.
			
 
				+      </definition>
			
 
				+    <type>string</type></property>
			
 
				+
			
 
				     <property>
			
 
				       <name>SpatialExtent</name>
			
 
				-      <type>2-tuple</type>
			
 
				+      <value>
			
 
				+        </value>
			
 
				       <definition>The spatial extend of the presented stimulus (width;height) e.g. (1024;768).</definition>
			
 
				-    </property>
			
 
				+    <type>2-tuple</type></property>
			
 
				+
			
 
				   </section>
			
 
				 </odML>
			
--- a/v1.1/stimulus/random_dot.xml
+++ b/v1.1/stimulus/random_dot.xml
@@ -1,4 +1,4 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************************************* -->
			
 
				 <!--                 Random dot stimulus                       -->
			
@@ -7,99 +7,107 @@
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.0</version>
			
 
				   <date>2011-01-21</date>
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus/random_dot</type>
			
 
				     <name>RandomDot</name>
			
 
				     <definition>Properties to describe a random dot stimulus.</definition>
			
 
				-    
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Modality</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The stimulus modality like acoustic, haptic, light etc.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Duration</name>
			
 
				+      <definition>The duration of the stimulus in seconds.</definition>
			
 
				       <type>float</type>
			
 
				       <unit>s</unit>
			
 
				-      <definition>The duration of the stimulus in seconds.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>TemporalOffset</name>
			
 
				+      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was
			
 
				+        presented.
			
 
				+      </definition>
			
 
				       <type>float</type>
			
 
				       <unit>s</unit>
			
 
				-      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was presented.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Function</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The function of the described stimulus. E.g. if the white noise constituted the carrier.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>OutputChannel</name>
			
 
				+      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker,
			
 
				+        etc.). This information can be used to explicitly express that several stimuli (that share the same
			
 
				+        OutputChannel) are jointly presented.
			
 
				+      </definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker, etc.). This 
			
 
				-      information can be used to explicitely express that several stimuli (that share the same OutputChannel) are jointly presented.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>DotCount</name>
			
 
				-      <type>int</type>
			
 
				       <definition>The number of random dots placed on the screen.</definition>
			
 
				+      <type>int</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>DotHorizontalExtent</name>
			
 
				+      <definition>The width of a single dot given in °.</definition>
			
 
				       <type>float</type>
			
 
				-      <definition>The width of a single dot given in &#176;.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>DotVerticalExtent</name>
			
 
				+      <definition>The height of a single dot in °.</definition>
			
 
				       <type>float</type>
			
 
				-      <definition>The height of a single dot in &#176;.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>DotPixelHeight</name>
			
 
				-      <type>int</type>
			
 
				       <definition>The height of a single dot in pixel.</definition>
			
 
				+      <type>int</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>DotPixelWidth</name>
			
 
				-      <type>int</type>
			
 
				       <definition>The width of a single dot given in pixel.</definition>
			
 
				+      <type>int</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>DotSize</name>
			
 
				-      <type>2-tuple</type>	
			
 
				       <definition>The size of a single dot specified as 2-tuple (width;height).</definition>
			
 
				+      <type>2-tuple</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Position</name>
			
 
				+      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position
			
 
				+        refers to the top-left corner of the object or its bounding box.
			
 
				+      </definition>
			
 
				       <type>2-tuple</type>
			
 
				-      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position refers to the top-left corner of the object or its bounding box.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>PositionReference</name>
			
 
				       <value>[top-left, center, bottom-right]</value>
			
 
				+      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the
			
 
				+        bounding box). Use this property for other definitions.
			
 
				+      </definition>
			
 
				       <type>string</type>
			
 
				-      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the bounding box). Use this property for other definitions.</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>SpatialExtent</name>
			
 
				-      <type>2-tuple</type>
			
 
				       <definition>The spatial extend of the presented stimulus (width;height) e.g. (1024;768).</definition>
			
 
				+      <type>2-tuple</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				   </section>
			
 
				 </odML>
			
--- a/v1.1/stimulus/sawtooth.xml
+++ b/v1.1/stimulus/sawtooth.xml
@@ -1,4 +1,4 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************************************* -->
			
 
				 <!--                      Sawtooth stimulus                    -->
			
@@ -11,56 +11,66 @@
 
				     <type>stimulus/sawtooth</type>
			
 
				     <name>Sawtooth</name>
			
 
				     <definition>Sawtooth Properties.</definition>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Modality</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The stimulus modality like acoustic, haptic, visual, electrical etc.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Duration</name>
			
 
				+      <definition>The duration of the stimulus in seconds.</definition>
			
 
				       <type>float</type>
			
 
				       <unit>s</unit>
			
 
				-      <definition>The duration of the stimulus in seconds.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>TemporalOffset</name>
			
 
				+      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was
			
 
				+        presented.
			
 
				+      </definition>
			
 
				       <type>float</type>
			
 
				       <unit>s</unit>
			
 
				-      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was presented.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Function</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The function of the described stimulus. E.g. if the white noise constituted the carrier.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>OutputChannel</name>
			
 
				+      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker,
			
 
				+        etc.). This information can be used to explicitly express that several stimuli (that share the same
			
 
				+        OutputChannel) are jointly presented.
			
 
				+      </definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker, etc.). This information can be used to explicitely express that several stimuli (that share the same OutputChannel) are jointly presented.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Position</name>
			
 
				+      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position
			
 
				+        refers to the top-left corner of the object or its bounding box.
			
 
				+      </definition>
			
 
				       <type>2-tuple</type>
			
 
				-      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position refers to the top-left corner of the object or its bounding box.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>PositionReference</name>
			
 
				       <value>[top-left, center, bottom-right]</value>
			
 
				+      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the
			
 
				+        bounding box). Use this property for other definitions.
			
 
				+      </definition>
			
 
				       <type>string</type>
			
 
				-      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the bounding box). Use this property for other definitions.</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>SpatialExtent</name>
			
 
				+      <definition>The spatial extent of the presented stimulus (width;height) e.g. (1024;768).</definition>
			
 
				       <type>2-tuple</type>
			
 
				-      <definition>The spatial extend of the presented stimulus (width;height) e.g. (1024;768).</definition>
			
 
				     </property>
			
 
				+
			
 
				   </section>
			
 
				 </odML>
			
--- a/v1.1/stimulus/sine_wave.xml
+++ b/v1.1/stimulus/sine_wave.xml
@@ -1,4 +1,4 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************************************* -->
			
 
				 <!--                      Sinewave stimulus                    -->
			
@@ -7,86 +7,97 @@
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.0</version>
			
 
				   <date>2011-01-21</date>
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus/sine_wave</type>
			
 
				     <name>Sinewave</name>
			
 
				     <definition>Properties to describe a sinewave stimulus.</definition>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Modality</name>
			
 
				-      <type>string</type>	
			
 
				       <definition>The stimulus modality like acoustic, haptic, light etc.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Duration</name>
			
 
				+      <definition>The duration of the stimulus in seconds.</definition>
			
 
				       <type>float</type>
			
 
				       <unit>s</unit>
			
 
				-      <definition>The duration of the stimulus in seconds.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>TemporalOffset</name>
			
 
				+      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was
			
 
				+        presented.
			
 
				+      </definition>
			
 
				       <type>float</type>
			
 
				       <unit>s</unit>
			
 
				-      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was presented.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Function</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The function of the described stimulus. E.g. if the white noise constituted the carrier.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>OutputChannel</name>
			
 
				+      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker,
			
 
				+        etc.). This information can be used to explicitly express that several stimuli (that share the same
			
 
				+        OutputChannel) are jointly presented.
			
 
				+      </definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker, etc.). This information can be used to explicitely express that several stimuli (that share the same OutputChannel) are jointly	presented.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Frequency</name>
			
 
				+      <definition>The frequency of the sinewave stimulation.</definition>
			
 
				       <type>float</type>
			
 
				       <unit>Hz</unit>
			
 
				-      <definition>The frequency of the sinwave stimulation.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Phase</name>
			
 
				+      <definition>Phase shift of the sinewave.</definition>
			
 
				       <type>float</type>
			
 
				       <unit>Hz</unit>
			
 
				-      <definition>Phase shift of the sinewave.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Amplitude</name>
			
 
				-      <type>float</type>
			
 
				       <definition>Amplitude of the sinewave modulation.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>float</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>MeanIntensity</name>
			
 
				-      <type>float</type>
			
 
				       <definition>The mean intensity of the stimulus.</definition>
			
 
				+      <type>float</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Position</name>
			
 
				+      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position
			
 
				+        refers to the top-left corner of the object or its bounding box.
			
 
				+      </definition>
			
 
				       <type>2-tuple</type>
			
 
				-      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position refers to the top-left corner of the object or its bounding box.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>PositionReference</name>
			
 
				       <value>[top-left, center, bottom-right]</value>
			
 
				+      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the
			
 
				+        bounding box). Use this property for other definitions.
			
 
				+      </definition>
			
 
				       <type>string</type>
			
 
				-      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the bounding box). Use this property for other definitions.</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>SpatialExtent</name>
			
 
				-      <type>2-tuple</type>
			
 
				       <definition>The spatial extend of the presented stimulus (width;height) e.g. (1024;768).</definition>
			
 
				+      <type>2-tuple</type>
			
 
				     </property>
			
 
				+
			
 
				   </section>
			
 
				 </odML>
			
--- a/v1.1/stimulus/square_wave.xml
+++ b/v1.1/stimulus/square_wave.xml
@@ -1,4 +1,4 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl"  xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************************************* -->
			
 
				 <!--                   square wave stimulus                    -->
			
@@ -11,88 +11,104 @@
 
				   <section>
			
 
				     <type>stimulus/square_wave</type>
			
 
				     <name>Squarewave</name>
			
 
				-    <definition>A squarewave stimulus was presented. Squarewaves modulate with a certain frequency about the intensity offset. </definition>
			
 
				-    
			
 
				+    <definition>A squarewave stimulus was presented. Squarewaves modulate with a certain frequency about the intensity
			
 
				+      offset.
			
 
				+    </definition>
			
 
				+
			
 
				     <property>
			
 
				       <name>Modality</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The stimulus modality like acoustic, haptic, visual etc.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Duration</name>
			
 
				+      <definition>The duration of the stimulus in seconds.</definition>
			
 
				       <type>float</type>
			
 
				       <unit>s</unit>
			
 
				-      <definition>The duration of the stimulus in seconds.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>TemporalOffset</name>
			
 
				+      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was
			
 
				+        presented.
			
 
				+      </definition>
			
 
				       <type>float</type>
			
 
				       <unit>s</unit>
			
 
				-      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was presented.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Function</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The function of the described stimulus. E.g. if the white noise constituted the carrier.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>OutputChannel</name>
			
 
				+      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker,
			
 
				+        etc.). This information can be used to explicitly express that several stimuli (that share the same
			
 
				+        OutputChannel) are jointly presented.
			
 
				+      </definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker, etc.). This information can be used to explicitely express that several stimuli (that share the same OutputChannel) are jointly	presented.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Frequency</name>
			
 
				+      <definition>The frequency of the square wave modulation.</definition>
			
 
				       <type>float</type>
			
 
				       <unit>Hz</unit>
			
 
				-      <definition>The frequency of the square wave modulation.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>DutyCycle</name>
			
 
				+      <definition>The part of the cycle spend in the up state. E.g. 0.5 if up and down state each take half of the
			
 
				+        time.
			
 
				+      </definition>
			
 
				       <type>float</type>
			
 
				-      <definition>The part of the cylce spend in the up state. E.g. 0.5 if up and down state each take half of the time.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Amplitude</name>
			
 
				-      <type>float</type>
			
 
				       <definition>The modulation amplitude (i.e. the difference between up and downstate.)</definition>
			
 
				+      <type>float</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>IntensityOffset</name>
			
 
				-      <type>float</type>
			
 
				       <definition>The mean intensity of the stimulus.</definition>
			
 
				+      <type>float</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>StartAmplitude</name>
			
 
				+      <definition>The amplitude with which the squarewave stimulus started. This may assume either intensity offset - or
			
 
				+        + amplitude/2.
			
 
				+      </definition>
			
 
				       <type>float</type>
			
 
				-      <definition>The amlitude with which the squarewave stimulus started. This may assume either intensity offset - or + amplitude/2.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Position</name>
			
 
				+      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position
			
 
				+        refers to the top-left corner of the object or its bounding box.
			
 
				+      </definition>
			
 
				       <type>2-tuple</type>
			
 
				-      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position refers to the top-left corner of the object or its bounding box.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>PositionReference</name>
			
 
				       <value>[top-left, center, bottom-right]</value>
			
 
				+      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the
			
 
				+        bounding box). Use this property for other definitions.
			
 
				+      </definition>
			
 
				       <type>string</type>
			
 
				-      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the bounding box). Use this property for other definitions.</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>SpatialExtent</name>
			
 
				-      <type>2-tuple</type>
			
 
				       <definition>The spatial extend of the presented stimulus (width;height) e.g. (1024;768).</definition>
			
 
				+      <type>2-tuple</type>
			
 
				     </property>
			
 
				+
			
 
				   </section>
			
 
				 </odML>
			
--- a/v1.1/stimulus/stimulus.xml
+++ b/v1.1/stimulus/stimulus.xml
@@ -1,115 +1,125 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl"  xmlns:odml="http://www.g-node.org/odml"?>
			
 
				-
			
 
				-<!-- ********************************************************* -->
			
 
				-<!--                  stimulation section                      -->
			
 
				-<!-- ********************************************************* -->
			
 
				-
			
 
				 <odML version="1.1">
			
 
				   <version>1.0</version>
			
 
				   <date>2011-01-21</date>
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  <!-- ********************************************************* -->
			
 
				+  <!--                  stimulation section                      -->
			
 
				+  <!-- ********************************************************* -->
			
 
				   <section>
			
 
				     <type>stimulus</type>
			
 
				     <name>Stimulus</name>
			
 
				-    <definition>General description of an applied stimulus. This
			
 
				-    section is basis of various related sections that specify
			
 
				-    more specific stimuli.</definition>
			
 
				-    
			
 
				-    
			
 
				+    <definition>General description of an applied stimulus. This section is basis of various related sections that
			
 
				+      specify more specific stimuli.
			
 
				+    </definition>
			
 
				+
			
 
				     <property>
			
 
				       <name>Description</name>
			
 
				-      <type>text</type>
			
 
				       <definition>A textual description of the stimulus.</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+      <type>text</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Comment</name>
			
 
				-      <type>text</type>
			
 
				       <definition>A comment on this specific stimulus.</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+      <type>text</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Author</name>
			
 
				-      <type>person</type>
			
 
				       <definition>Who is the author of this stimulus.</definition>
			
 
				+      <type>person</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Duration</name>
			
 
				+      <definition>The duration of the stimulus.</definition>
			
 
				       <type>float</type>
			
 
				       <unit>s</unit>
			
 
				-      <definition>The duration of the stimulus.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>StartTime</name>
			
 
				-      <type>time</type>
			
 
				       <definition>The time the stimulus started.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>time</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>EndTime</name>
			
 
				-      <type>time</type>
			
 
				       <definition>The time the stimulus ended.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>time</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Intensity</name>
			
 
				-      <type>string</type>
			
 
				       <definition>like the current in case of electrical stimulation.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Location</name>
			
 
				-      <type>string</type>
			
 
				       <definition>Describes the site of the stimulus application.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Modality</name>
			
 
				-      <type>string</type>
			
 
				       <definition>Visual, acoustic, haptic, electrical, etc. stimulation.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Repetitions</name>
			
 
				-      <type>int</type>
			
 
				       <definition>The number of repetitions of the described stimulation.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>int</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>InterstimulusInterval</name>
			
 
				+      <definition>The time between two subsequent stimulations.</definition>
			
 
				       <type>float</type>
			
 
				       <unit>s</unit>
			
 
				-      <definition>The time between two subsequent stimulations.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				+    <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>
			
 
				       <type>URL</type>
			
 
				-      <definition>The URL of a an applied stimulus file. This
			
 
				-      is the recommended alternative to explicitely including the
			
 
				-      actual stimulus via StimulusFile.</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Position</name>
			
 
				+      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position
			
 
				+        refers to the top-left corner of the object or its bounding box.
			
 
				+      </definition>
			
 
				       <type>2-tuple</type>
			
 
				-      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position refers to the top-left corner of the object or its bounding box.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>PositionReference</name>
			
 
				       <value>[top-left, center, bottom-right]</value>
			
 
				+      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the
			
 
				+        bounding box). Use this property for other definitions.
			
 
				+      </definition>
			
 
				       <type>string</type>
			
 
				-      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the bounding box). Use this property for other definitions.</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>SpatialExtent</name>
			
 
				-      <type>2-tuple</type>
			
 
				       <definition>The spatial extend of the presented stimulus (width;height) e.g. (1024;768).</definition>
			
 
				+      <type>2-tuple</type>
			
 
				     </property>
			
 
				+
			
 
				   </section>
			
 
				 </odML>
			
--- a/v1.1/stimulus/stimulusTypes.xml
+++ b/v1.1/stimulus/stimulusTypes.xml
@@ -1,70 +1,69 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>

			
 
				-<?xml-stylesheet type="text/xsl" href="odmlTerms.xsl" xmlns:odml="http://www.g-node.org/odml"?>

			
 
				-

			
 
				-<odML version="1.1"> 

			
 
				-  <section>

			
 
				-    <name>DC</name>

			
 
				-    <type>stimulus/dc</type>

			
 
				-    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  </section>

			
 
				-  

			
 
				-  <section>

			
 
				-    <name>Gabor</name>

			
 
				-    <type>stimulus/gabor</type>

			
 
				-    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  </section>

			
 
				-  

			
 
				-  <section>

			
 
				-    <name>Grating</name>

			
 
				-    <type>stimulus/grating</type>

			
 
				-    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  </section>

			
 
				-  

			
 
				-  <section>

			
 
				-    <name>Pulse</name>

			
 
				-    <type>stimulus/pulse</type>

			
 
				-    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  </section>

			
 
				-  

			
 
				-  <section>

			
 
				-    <name>Movie</name>

			
 
				-    <type>stimulus/movie</type>

			
 
				-    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  </section>

			
 
				-  

			
 
				-  <section>

			
 
				-    <name>Ramp</name>

			
 
				-    <type>stimulus/ramp</type>

			
 
				-    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  </section>

			
 
				-  

			
 
				-  <section>

			
 
				-    <name>RandomDot</name>

			
 
				-    <type>stimulus/randomdot</type>

			
 
				-    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  </section>

			
 
				-  

			
 
				-  <section>

			
 
				-    <name>Sawtooth</name>

			
 
				-    <type>stimulus/sawtooth</type>

			
 
				-    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  </section>

			
 
				-  

			
 
				-  <section>

			
 
				-    <name>Sinewave</name>

			
 
				-    <type>stimulus/sinewave</type>

			
 
				-    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  </section>

			
 
				-  

			
 
				-  <section>

			
 
				-    <name>Squarewave</name>

			
 
				-    <type>stimulus/squarewave</type>

			
 
				-    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  </section>

			
 
				-  

			
 
				-  <section>

			
 
				-    <name>WhiteNoise</name>

			
 
				-    <type>stimulus/whitenoise</type>

			
 
				-    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>

			
 
				-  </section>

			
 
				-</odML>

			
 
				+<?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">
			
 
				+  <section>
			
 
				+    <name>DC</name>
			
 
				+    <type>stimulus/dc</type>
			
 
				+    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <name>Gabor</name>
			
 
				+    <type>stimulus/gabor</type>
			
 
				+    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <name>Grating</name>
			
 
				+    <type>stimulus/grating</type>
			
 
				+    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <name>Pulse</name>
			
 
				+    <type>stimulus/pulse</type>
			
 
				+    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <name>Movie</name>
			
 
				+    <type>stimulus/movie</type>
			
 
				+    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <name>Ramp</name>
			
 
				+    <type>stimulus/ramp</type>
			
 
				+    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <name>RandomDot</name>
			
 
				+    <type>stimulus/randomdot</type>
			
 
				+    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <name>Sawtooth</name>
			
 
				+    <type>stimulus/sawtooth</type>
			
 
				+    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <name>Sinewave</name>
			
 
				+    <type>stimulus/sinewave</type>
			
 
				+    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <name>Squarewave</name>
			
 
				+    <type>stimulus/squarewave</type>
			
 
				+    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <name>WhiteNoise</name>
			
 
				+    <type>stimulus/whitenoise</type>
			
 
				+    <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				+  </section>
			
 
				+</odML>
			
--- a/v1.1/stimulus/white_noise.xml
+++ b/v1.1/stimulus/white_noise.xml
@@ -1,4 +1,4 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl"  xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************************************* -->
			
 
				 <!--                   White Noise stimulus                    -->
			
@@ -7,97 +7,107 @@
 
				   <version>1.0</version>
			
 
				   <date>2011-01-21</date>
			
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus/white_noise</type>
			
 
				     <name>WhiteNoise</name>
			
 
				     <definition>Property definitions to describe a white noise stimulus.</definition>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Modality</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The stimulus modality like acoustic, haptic, light etc.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Duration</name>
			
 
				+      <definition>The duration of the stimulus in seconds.</definition>
			
 
				       <type>float</type>
			
 
				       <unit>s</unit>
			
 
				-      <definition>The duration of the stimulus in seconds.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>OffsetTime</name>
			
 
				+      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was
			
 
				+        presented.
			
 
				+      </definition>
			
 
				       <type>float</type>
			
 
				       <unit>s</unit>
			
 
				-      <definition>The temporal offset (with respect to the begin of the recorded trial) with which this stimulus was presented.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Function</name>
			
 
				-      <type>string</type>
			
 
				       <definition>The function of the described stimulus. E.g. if the white noise constituted the carrier.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>OutputChannel</name>
			
 
				+      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker,
			
 
				+        etc.). This information can be used to explicitly express that several stimuli (that share the same
			
 
				+        OutputChannel) are jointly presented.
			
 
				+      </definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The physical output device (e.g. an analog output channel, a monitor screen, the same loudspeaker, etc.). This 
			
 
				-      information can be used to explicitely express that several stimuli (that share the same OutputChannel) are jointly presented.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Mean</name>
			
 
				-      <type>float</type>
			
 
				       <definition>The mean intensity of the white noise stimulus.</definition>
			
 
				+      <type>float</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Variance</name>
			
 
				+      <definition>The variance of the white noise stimulus.</definition>
			
 
				       <type>float</type>
			
 
				-      <definition>The variance of the white noise stimulus.</definition> 
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>LowerCutoffFrequency</name>
			
 
				+      <definition>The low frequency cutoff of the highpass filter with which the stimulus was filtered. (Lowest
			
 
				+        frequency may also be limited by the stimulus duration)
			
 
				+      </definition>
			
 
				       <type>float</type>
			
 
				       <unit>Hz</unit>
			
 
				-      <definition>The low frequency cutoff of the highpass filter with which the stimulus was filtered. (Lowest frequency may also be
			
 
				-      limited by the stimulus duration)</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>UpperCutoffFrequency</name>
			
 
				+      <definition>The upper frequency cutoff of lowpass filter with which the stimulus was filtered. (Upper cutoff may
			
 
				+        also be defined by the nyquist frequency, respective the sample rate.)
			
 
				+      </definition>
			
 
				       <type>float</type>
			
 
				       <unit>Hz</unit>
			
 
				-      <definition>The upper frequency cutoff of lowpass filter with which the stimulus was filtered. (Upper cutoff may also be
			
 
				-      defined by the nyquist frequency, respective the sample rate.)</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Filter</name>
			
 
				+      <definition>The filter method applied to limit the frequency content of the stimulus.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The filter method applied to limit the frequeny content of the stimulus.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Position</name>
			
 
				+      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position
			
 
				+        refers to the top-left corner of the object or its bounding box.
			
 
				+      </definition>
			
 
				       <type>2-tuple</type>
			
 
				-      <definition>The position of the stimulus on e.g the screen. Specified as a 2-tuple (x;y). By default this position refers to the top-left corner of the object or its bounding box.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>PositionReference</name>
			
 
				       <value>[top-left, center, bottom-right]</value>
			
 
				+      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the
			
 
				+        bounding box). Use this property for other definitions.
			
 
				+      </definition>
			
 
				       <type>string</type>
			
 
				-      <definition>By default stimulus positions are specified by the coordinates of the top-left corner (or of the bounding box). Use this property for other definitions.</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>SpatialExtent</name>
			
 
				-      <type>2-tuple</type>
			
 
				       <definition>The spatial extend of the presented stimulus (width;height) e.g. (1024;768).</definition>
			
 
				-    </property>  
			
 
				-    
			
 
				+      <type>2-tuple</type>
			
 
				+    </property>
			
 
				+
			
 
				   </section>
			
 
				 </odML>
			
--- a/v1.1/subject/odmlTerms.xsl
+++ b/v1.1/subject/odmlTerms.xsl
@@ -1,201 +1,199 @@
 
				 <?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">
			
 
				+                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" />
			
 
				+  <!-- 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; } 
			
 
				+        body { margin-left:2%; margin-top:10px; padding:0;} div { border:0px solid #888; }
			
 
				 
			
 
				-      #navigationContainer { left:20px; width:80%;} 
			
 
				+        #navigationContainer { left:20px; width:80%;}
			
 
				 
			
 
				-      #contentContainer { 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>
			
 
				+        <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;"/>
			
 
				+          </p>
			
 
				 
			
 
				-            <h2>Structure</h2>
			
 
				-	         <font  size ="-1" >
			
 
				+          <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:for-each select="section">
			
 
				+                <li>
			
 
				                   <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: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>
			
 
				-               </xsl:for-each>
			
 
				+                </li>
			
 
				+              </xsl:for-each>
			
 
				             </xsl:if>
			
 
				-         </div>
			
 
				+          </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>
			
 
				+    </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>
			
 
				+  <!-- ************************************************  -->
			
 
				+  <!--              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>
			
 
				+        <!-- 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/>
			
 
				-            <b>Id: </b><xsl:if test="id"><xsl:value-of select="id"/></xsl:if><br/>
			
 
				-         <xsl:choose>
			
 
				+        <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/>
			
 
				+              <b>Repository: </b><xsl:value-of select="repository"/><br/>
			
 
				             </xsl:when>
			
 
				             <xsl:otherwise>
			
 
				-               <b>Repository: </b><xsl:value-of select="$repository"/><br/>
			
 
				+              <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/>
			
 
				-         
			
 
				-<!--
			
 
				--->
			
 
				-         <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">
			
 
				-                  <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>
			
 
				-               <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%">
			
 
				-                        <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="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>
			
 
				-               </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: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>
			
 
				+
			
 
				+        <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">
			
 
				+              <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>
			
 
				+            <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%">
			
 
				+                  <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="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>
			
 
				+            </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:choose>
			
 
				+  </xsl:template>
			
 
				 </xsl:stylesheet>
			
--- a/v1.1/subject/subject.xml
+++ b/v1.1/subject/subject.xml
@@ -1,4 +1,4 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?xml version="1.0" encoding="UTF-8"?>
			
 
				 <?xml-stylesheet type="text/xsl" href="odmlTerms.xsl"  xmlns:odml="http://www.g-node.org/odml"?>
			
 
				 <!-- ********************************************************* -->
			
 
				 <!--                     Subject section                       -->
			
@@ -7,117 +7,112 @@
 
				   <repository>http://portal.g-node.org/odml/terminologies/v1.1/terminologies.xml</repository>
			
 
				   <version>1.0</version>
			
 
				   <date>2011-01-21</date>
			
 
				+
			
 
				   <section>
			
 
				     <type>subject</type>
			
 
				     <name>Subject</name>
			
 
				-    <definition>The investigated experimental subject (animal or person).
			
 
				-    May contain the Cell and Preparation sections as subsections.</definition>
			
 
				+    <definition>The investigated experimental subject (animal or person). May contain the Cell and Preparation sections
			
 
				+      as subsections.
			
 
				+    </definition>
			
 
				 
			
 
				     <property>
			
 
				       <name>Comment</name>
			
 
				+      <definition>A general comment on a specific subject.</definition>
			
 
				       <type>text</type>
			
 
				-      <definition>A general comment on a specific
			
 
				-      subject. </definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Species</name>
			
 
				+      <definition>The scientific name of the species e.g. Apis mellifera, Homo sapiens.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The scientific name of the species e.g. Apis
			
 
				-      mellifera, Homo sapiens.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Genus</name>
			
 
				+      <definition>The Genus of the studied subject.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The Genus of the studied
			
 
				-      subject.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>TrivialName</name>
			
 
				+      <definition>The trivial name of the species like Honeybee, Human.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The trivial name of the species like
			
 
				-      Honeybee, Human.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Gender</name>
			
 
				-      <type>string</type>
			
 
				       <definition>Male or female?</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+      <type>string</type>
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Birthday</name>
			
 
				+      <definition>The birthday. Age can be inferred from the date of recording.</definition>
			
 
				       <type>date</type>
			
 
				-      <definition> The birthday. Age can be inferred from the
			
 
				-      date of recording.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Age</name>
			
 
				+      <definition>The age of the subject since birth. E.g. P19, or 5 days.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The age of the subject since birth. E.g. P19,
			
 
				-      or 5 days.</definition>
			
 
				-    </property> 
			
 
				-    
			
 
				+    </property>
			
 
				+
			
 
				     <property>
			
 
				       <name>Strain</name>
			
 
				+      <definition>The strain the subject was taken from. E.g. a specific genetic variation etc.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The strain the subject was taken from. E.g. a
			
 
				-      specific genetic variation etc.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>CellLine</name>
			
 
				-      <type>string</type>
			
 
				       <definition>.</definition>
			
 
				+      <type>string</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Population</name>
			
 
				+      <definition>The population this subject is offspring of. This may be the bee hive, the ant colony, etc.
			
 
				+      </definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The population this subject is offspring
			
 
				-      of. This may be the bee hive, the ant colony,
			
 
				-      etc.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Label</name>
			
 
				+      <definition>If the subject has been labeled in a specific way. The label can be described here.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>If the subject has been labled in a specific
			
 
				-      way. The lable can be described here.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>HealthStatus</name>
			
 
				+      <definition>Information about the health status of this subject.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>Information about the health status of this
			
 
				-      subject.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>DevelopmentalStage</name>
			
 
				+      <definition>The developmental stage of the subject. E.g. "embryonal", "adult", "larval" etc.</definition>
			
 
				       <type>string</type>
			
 
				-      <definition>The developemtal stage of the subject. E.g. "embroyonal", "adult", "larval" etc.</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>ConactInformation</name>
			
 
				-      <type>text</type>
			
 
				       <definition>How to get in contact with this subject.</definition>
			
 
				+      <type>text</type>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Size</name>
			
 
				+      <definition>The size of the subject. This value may be used context dependent. Size could be length for a fish,
			
 
				+        height for a human subject, or shoulder height for a horse etc...
			
 
				+      </definition>
			
 
				       <type>float</type>
			
 
				-      <definition>The size of the subject. This value may be used context dependent. Size could be length for a fish, heigth for a human subject, or shoulder height for a horse etc...</definition>
			
 
				     </property>
			
 
				-    
			
 
				+
			
 
				     <property>
			
 
				       <name>Weight</name>
			
 
				+      <definition>The weight of this subject.</definition>
			
 
				       <type>float</type>
			
 
				-      <definition>The weigth of this subject.</definition>
			
 
				     </property>
			
 
				-  </section> 
			
 
				+
			
 
				+  </section>
			
 
				 </odML>
			
--- a/v1.1/terminologies.xml
+++ b/v1.1/terminologies.xml
@@ -1,39 +1,44 @@
 
				-<?xml version="1.0" encoding="ISO-8859-1"?>
			
 
				+<?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"> 
			
 
				+<odML version="1.1">
			
 
				   <section>
			
 
				     <type>analysis</type>
			
 
				     <name>Analysis</name>
			
 
				     <definition>Sections of the Analysis type can be used to describe analyses.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/analysis/analysis.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>analysis/psth</type>
			
 
				     <name>PSTH</name>
			
 
				     <definition>An Analysis-type section to describe a PSTH.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/analysis/psth.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>analysis/power_spectrum</type>
			
 
				     <name>PowerSpectrum</name>
			
 
				     <definition>Properties of this section define the way a power spectrum was calculated.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/analysis/power_spectrum.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>cell</type>
			
 
				     <name>Cell</name>
			
 
				-    <definition>Specification of the recorded cell. A cell definition should be a subsection of the <a href="../subject/subject.xml">Subject</a> section.</definition>
			
 
				+    <definition>Specification of the recorded cell. A cell definition should be a subsection of the
			
 
				+      <a href="../subject/subject.xml">Subject</a>
			
 
				+      section.
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/cell/cell.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>dataset</type>
			
 
				     <name>Dataset</name>
			
 
				-    <definition>Names (URLs) and times of recorded data files. Datasets are obtained during a Recording
			
 
				-    and may belong to different Experiments. Related sections that can be used as subsections, parent sections, or siblings are Stimulus, HardwareSettings, and Experiment.</definition>
			
 
				+    <definition>Names (URLs) and times of recorded data files. Datasets are obtained during a Recording and may belong
			
 
				+      to different Experiments. Related sections that can be used as subsections, parent sections, or siblings are
			
 
				+      Stimulus, HardwareSettings, and Experiment.
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/dataset/dataset.xml</include>
			
 
				   </section>
			
 
				 
			
@@ -54,27 +59,29 @@
 
				   <section>
			
 
				     <type>event</type>
			
 
				     <name>Event</name>
			
 
				-    <definition>Section for short annotations that are taken during an experiment to describe certain events.</definition>
			
 
				+    <definition>Section for short annotations that are taken during an experiment to describe certain events.
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/event/event.xml</include>
			
 
				   </section>
			
 
				 
			
 
				   <section>
			
 
				     <type>event_list</type>
			
 
				-    <name>EventList</name><definition>Section for grouping short annotations that are taken during
			
 
				-    an experiment, preparation etc...</definition>
			
 
				+    <name>EventList</name>
			
 
				+    <definition>Section for grouping short annotations that are taken during
			
 
				+      an experiment, preparation etc...
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/collection/event_list.xml</include>
			
 
				   </section>
			
 
				 
			
 
				   <section>
			
 
				     <type>experiment</type>
			
 
				     <name>Experiment</name>
			
 
				-    <definition>Specification of an experiment. The Experiment is
			
 
				-    part of a Project and the recorded data for a specific
			
 
				-    Experiment are found in Datasets. Possible subsections are, for
			
 
				-    example, Dataset and Stimulus.</definition>
			
 
				+    <definition>Specification of an experiment. The Experiment is part of a Project and the recorded data for a specific
			
 
				+      Experiment are found in Datasets. Possible subsections are, for example, Dataset and Stimulus.
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/experiment/experiment.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>experiment/behavior</type>
			
 
				     <name>Behavior</name>
			
@@ -84,208 +91,238 @@
 
				 
			
 
				   <section>
			
 
				     <type>experiment/electrophysiology</type>
			
 
				-    <name>Electrophysiology</name> 
			
 
				+    <name>Electrophysiology</name>
			
 
				     <definition>Properties for describing an electrophysiological experiment.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/experiment/electrophysiology.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>experiment/imaging</type>
			
 
				     <name>Imaging</name>
			
 
				-    <definition>Properties for describing an imaging experiment ranging from conventional light microscpoy to fMRI.</definition>
			
 
				+    <definition>Properties for describing an imaging experiment ranging from conventional light microscpoy to fMRI.
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/experiment/imaging.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				-  <!-- <section>
			
 
				-       <type>experiment/modeling</type>
			
 
				-       <name>Modeling</name>		      
			
 
				-       <include>http://portal.g-node.org/odml/terminologies/v1.1/experiment/modeling.xml</include>
			
 
				-       </section>-->
			
 
				 
			
 
				   <section>
			
 
				     <type>experiment/pschophysics</type>
			
 
				     <name>Psychophysics</name>
			
 
				     <definition>Properties for describing an psychophysical experiment.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/experiment/psychophysics.xml</include>
			
 
				-  </section>	
			
 
				-  
			
 
				+  </section>
			
 
				 
			
 
				   <section>
			
 
				     <type>hardware_properties</type>
			
 
				     <name>HardwareProperties</name>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/collection/hardware_properties.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>hardware_settings</type>
			
 
				     <name>HardwareSettings</name>
			
 
				     <definition>The used values of variable properties of hardware
			
 
				-    components. There are two sections for describing hardware
			
 
				-    components: the "HardwareProperties" and the "HardwareSettings"
			
 
				-    section. While the HardwareProperties describe the fixed
			
 
				-    properties of the hardware that can not be changed, the
			
 
				-    HardwareSettings section describes the actual, adjustable,
			
 
				-    parameters of the hardware that may change with each recording
			
 
				-    or dataset. For example, the sample rate of an data-acquisition
			
 
				-    board or the settings of a filter. In each of these two sections
			
 
				-    there are subsections for each device that correspond to the
			
 
				-    class of the device like data-acquisition, amplifier, etc. Some
			
 
				-    properties are common for any type. </definition>
			
 
				+      components. There are two sections for describing hardware
			
 
				+      components: the "HardwareProperties" and the "HardwareSettings"
			
 
				+      section. While the HardwareProperties describe the fixed
			
 
				+      properties of the hardware that can not be changed, the
			
 
				+      HardwareSettings section describes the actual, adjustable,
			
 
				+      parameters of the hardware that may change with each recording
			
 
				+      or dataset. For example, the sample rate of an data-acquisition
			
 
				+      board or the settings of a filter. In each of these two sections
			
 
				+      there are subsections for each device that correspond to the
			
 
				+      class of the device like data-acquisition, amplifier, etc. Some
			
 
				+      properties are common for any type.
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/collection/hardware_settings.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>hardware</type>
			
 
				     <name>Hardware</name>
			
 
				     <definition>Fixed properties of hardware components used in the
			
 
				-    experimental setup. There are two sections for describing
			
 
				-    hardware components: the "HardwareProperties" and the
			
 
				-    "HardwareSettings" section. While the HardwareProperties
			
 
				-    describe the fixed properties of the hardware that can not be
			
 
				-    changed, the HardwareSettings section describes the actual,
			
 
				-    adjustable, parameters of the hardware that may change with each
			
 
				-    recording or dataset. For example, the sample rate of an
			
 
				-    data-acquisition board or the settings of a filter. In each of
			
 
				-    these two sections there are subsections for each device that
			
 
				-    correspond to the class of the device like data-acquisition,
			
 
				-    amplifier, etc. Some properties are common for any
			
 
				-    type. </definition>
			
 
				+      experimental setup. There are two sections for describing
			
 
				+      hardware components: the "HardwareProperties" and the
			
 
				+      "HardwareSettings" section. While the HardwareProperties
			
 
				+      describe the fixed properties of the hardware that can not be
			
 
				+      changed, the HardwareSettings section describes the actual,
			
 
				+      adjustable, parameters of the hardware that may change with each
			
 
				+      recording or dataset. For example, the sample rate of an
			
 
				+      data-acquisition board or the settings of a filter. In each of
			
 
				+      these two sections there are subsections for each device that
			
 
				+      correspond to the class of the device like data-acquisition,
			
 
				+      amplifier, etc. Some properties are common for any
			
 
				+      type.
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/hardware/hardware.xml</include>
			
 
				-  </section>  
			
 
				-  
			
 
				+  </section>
			
 
				+
			
 
				   <section>
			
 
				     <type>hardware/amplifier</type>
			
 
				     <name>Amplifier</name>
			
 
				-    <definition>The amplifier section defines elements that can be used to describe amplifier properties and settings.</definition>
			
 
				+    <definition>The amplifier section defines elements that can be used to describe amplifier properties and settings.
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/hardware/amplifier.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>hardware/attenuator</type>
			
 
				     <name>Attenuator</name>
			
 
				-    <definition>Settings of the data acquisition system. most settings refer to individual channels the channel number should be given after the property name like DAQ. AISampleRate0 for the sampling rate of the analog input channel 0.</definition>
			
 
				+    <definition>Settings of the data acquisition system. most settings refer to individual channels the channel
			
 
				+      number should be given after the property name like DAQ. AISampleRate0 for the sampling rate of the analog
			
 
				+      input channel 0.
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/hardware/attenuator.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>hardware/camera_objective</type>
			
 
				     <name>CameraObjective</name>
			
 
				     <definition>This section contains properties that describe a camera objective.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/hardware/attenuator.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>hardware/daq</type>
			
 
				     <name>DataAcquisition</name>
			
 
				-    <definition>The hardware section describes the settings of the used hardware. There should be one hardware section for each hardware item that was used.</definition>
			
 
				+    <definition>The hardware section describes the settings of the used hardware. There should be one hardware section
			
 
				+      for each hardware item that was used.
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/hardware/daq.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>hardware/eyetracker</type>
			
 
				     <name>Eyetracker</name>
			
 
				     <definition>Properties of an eyetracker.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/hardware/eyetracker.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>hardware/filter</type>
			
 
				     <name>Filter</name>
			
 
				     <definition>Properties a filter modul for analog signal conditioning.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/hardware/filter.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>hardware/filter_set</type>
			
 
				     <name>Filterset</name>
			
 
				     <definition>The FilterSet or also FilterCube used in a microscope.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/hardware/filter_set.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>hardware/iaq</type>
			
 
				     <name>ImageAcquisition</name>
			
 
				     <definition>Properties to define an Image acquisition device. This can be a framegrabber, a camera etc.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/hardware/iaq.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				-    <type>hardware/light_source</type>
			
 
				-    <name>Lightsource</name>
			
 
				-    <definition>This section contains keywords to describe the actual settings of a light source used for stimulation or excitation.</definition>
			
 
				-    <include>http://portal.g-node.org/odml/terminologies/v1.1/hardware/light_source.xml</include>
			
 
				+    <type>hardware/iaq</type>
			
 
				+    <name>ImageAcquisition-2</name>
			
 
				+    <definition>Properties to define an Image acquisition device. This can be a framegrabber, a camera etc.</definition>
			
 
				+    <include>http://portal.g-node.org/odml/terminologies/v1.1/hardware/iaq.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>hardware/microscope</type>
			
 
				     <name>Microscope</name>
			
 
				     <definition>The Microscope section describes the properties of the used microscope.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/hardware/microscope.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>hardware/microscope_objective</type>
			
 
				     <name>MicroscopeObjective</name>
			
 
				     <definition>This section contains properties that describe the objective used in a microscope.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/hardware/microscope_objective.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>hardware/scanner</type>
			
 
				     <name>Scanner</name>
			
 
				     <definition>The Scanner used to scan microscope images.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/hardware/scanner.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>hardware/stimulus_isolator</type>
			
 
				     <name>StimulusIsolator</name>
			
 
				     <definition>Properties of a stimulus Isolator device.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/hardware/stimulus_isolator.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>model/lif</type>
			
 
				     <name>Leaky integrate and fire</name>
			
 
				     <definition>Section to describe a leaky integrate and fire neuron model.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/model/lif.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>model/pif</type>
			
 
				     <name>perfect integrate and fire</name>
			
 
				     <definition>Section to describe a perfect integrate and fire model.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/model/pif.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>model/multi_compartment</type>
			
 
				     <name>Multi compartment model</name>
			
 
				     <definition>Section to describe a biophysical model that consists of a number of compartments.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/model/multi_compartment.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>model/single_compartment</type>
			
 
				     <name>One compartment model</name>
			
 
				     <definition>Section to describe a biophysical model that consists of a single compartment.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/model/single_compartment.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				+  <section>
			
 
				+    <type>license</type>
			
 
				+    <name>License</name>
			
 
				+    <definition>This section contains keywords to a data or software license.</definition>
			
 
				+    <include>http://portal.g-node.org/odml/terminologies/v1.1/license/license.xml</include>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>questionnaire/questionnaire</type>
			
 
				+    <name>Questionnaire</name>
			
 
				+    <definition>Description of a questionnaire.</definition>
			
 
				+    <include>http://portal.g-node.org/odml/terminologies/v1.1/questionnaire/questionnaire.xml</include>
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>questionnaire/question</type>
			
 
				+    <name>Question</name>
			
 
				+    <definition>Description of a question if a questionnaire.</definition>
			
 
				+    <include>http://portal.g-node.org/odml/terminologies/v1.1/questionnaire/question.xml</include>
			
 
				+  </section>
			
 
				+
			
 
				   <section>
			
 
				     <type>person</type>
			
 
				     <name>Person</name>
			
 
				     <definition>Information about a person. E.g. as Experimenter, Author, etc.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/person/person.xml</include>
			
 
				-  </section>	
			
 
				-  
			
 
				+  </section>
			
 
				+
			
 
				+  <section>
			
 
				+    <type>person</type>
			
 
				+    <name>Person-2</name>
			
 
				+    <definition>Information about a person. E.g. as Experimenter, Author, etc.</definition>
			
 
				+    <include>http://portal.g-node.org/odml/terminologies/v1.1/person/person.xml</include>
			
 
				+  </section>
			
 
				+
			
 
				   <section>
			
 
				     <type>preparation</type>
			
 
				     <name>Preparation</name>
			
 
				     <definition>Description of the preparation procedure.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/preparation/preparation.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>project</type>
			
 
				     <name>Project</name>
			
@@ -299,121 +336,139 @@
 
				     <definition>Information about the experimental protocol.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/protocol/protocol.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>recording</type>
			
 
				     <name>Recording</name>
			
 
				-    <definition>During a recording session in a Setup Datasets are
			
 
				-    obtained from Cells and/or a Subject by using various stimuli (Stimulus section).</definition>
			
 
				+    <definition>During a recording session in a Setup Datasets are obtained from Cells and/or a Subject by using various
			
 
				+      stimuli (Stimulus section).
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/recording/recording.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				+  <section>
			
 
				+    <type>response</type>
			
 
				+    <name>Response</name>
			
 
				+    <definition>General description of an received response (on stimulus).</definition>
			
 
				+    <include>http://portal.g-node.org/odml/terminologies/v1.1/response/response.xml</include>
			
 
				+  </section>
			
 
				+
			
 
				   <section>
			
 
				     <type>setup</type>
			
 
				     <name>Setup</name>
			
 
				-    <definition>The experimental setup used in the recordings. By
			
 
				-    using HardwareProperties as a subsection, a very detailed
			
 
				-    description of the setup can be given.</definition>
			
 
				+    <definition>The experimental setup used in the recordings. By using HardwareProperties as a subsection, a very
			
 
				+      detailed description of the setup can be given.
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/setup/setup.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus</type>
			
 
				     <name>Stimulus</name>
			
 
				-    <definition>General description of an applied stimulus. This
			
 
				-    section is basis of various related sections that specify
			
 
				-    more specific stimuli.</definition>
			
 
				+    <definition>General description of an applied stimulus. This section is basis of various related sections that
			
 
				+      specify more specific stimuli.
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/stimulus/stimulus.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus/dc</type>
			
 
				     <name>DC</name>
			
 
				-    <definition>Property definitions to describe a DC stimulus meaning a constant stimulus e.g. a constant illumination, current etc.</definition>
			
 
				+    <definition>Property definitions to describe a DC stimulus meaning a constant stimulus e.g. a constant illumination,
			
 
				+      current etc.
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/stimulus/dc.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus/gabor</type>
			
 
				     <name>Gabor</name>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/stimulus/gabor.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus/grating</type>
			
 
				     <name>Grating</name>
			
 
				     <definition>Property definitions to describe Gabor stimuli.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/stimulus/grating.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus/pulse</type>
			
 
				     <name>Pulse</name>
			
 
				-    <definition>Properties to describe a simple pulse stimulus that starts from and returns to a certain baseline.</definition>
			
 
				+    <definition>Properties to describe a simple pulse stimulus that starts from and returns to a certain baseline.
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/stimulus/pulse.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus/movie</type>
			
 
				     <name>Movie</name>
			
 
				     <definition>Properties to describe a movie (or image sequence) stimulus.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/stimulus/movie.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus/ramp</type>
			
 
				     <name>Ramp</name>
			
 
				-    <definition>A ramp stimulus may either linearly increase or decrease in amplitude. Starting from a certain start amplitude and reaching with a certain slope the destination amplitude.</definition>
			
 
				+    <definition>A ramp stimulus may either linearly increase or decrease in amplitude. Starting from a certain start
			
 
				+      amplitude and reaching with a certain slope the destination amplitude.
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/stimulus/ramp.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus/random_dot</type>
			
 
				     <name>RandomDot</name>
			
 
				     <definition>Properties to describe a random dot stimulus.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/stimulus/random_dot.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus/sawtooth</type>
			
 
				     <name>Sawtooth</name>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/stimulus/sawtooth.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus/sine_wave</type>
			
 
				     <name>Sinewave</name>
			
 
				     <definition>Sawtooth Properties.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/stimulus/sine_wave.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus/square_wave</type>
			
 
				     <name>Squarewave</name>
			
 
				-    <definition>A squarewave stimulus was presented. Squarewaves modulate with a certain frequency about the intensity offset. </definition>
			
 
				+    <definition>A squarewave stimulus was presented. Squarewaves modulate with a certain frequency about the intensity
			
 
				+      offset.
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/stimulus/square_wave.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>stimulus/white_noise</type>
			
 
				     <name>Whitenoise</name>
			
 
				     <definition>Property definitions to describe a white noise stimulus.</definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/stimulus/white_noise.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>subject</type>
			
 
				     <name>Subject</name>
			
 
				     <definition>The investigated experimental subject (animal or person).
			
 
				-    May contain the Cell and Preparation sections as subsections.</definition>
			
 
				+      May contain the Cell and Preparation sections as subsections.
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/subject/subject.xml</include>
			
 
				   </section>
			
 
				-  
			
 
				+
			
 
				   <section>
			
 
				     <type>carmen_mini</type>
			
 
				     <name>CarmenMini</name>
			
 
				-    <definition>This is a convenience section that lists the terms of the CARMEN MINI (Gibson et al. Nature Precedings, 2009 Version 0.6) and 
			
 
				-    maps them to the odml "standard" terminologies.</definition>
			
 
				+    <definition>This is a convenience section that lists the terms of the CARMEN MINI (Gibson et al. Nature Precedings,
			
 
				+      2009 Version 0.6) and maps them to the odml "standard" terminologies.
			
 
				+    </definition>
			
 
				     <include>http://portal.g-node.org/odml/terminologies/v1.1/carmenMini/carmen_mini.xml</include>
			
 
				   </section>
			
 
				+
			
 
				 </odML>