Add new files and navigation XSL

incf-nidash · Mar 20, 2008 · 5dabb76 · 5dabb76
1 parent c1ca9ef
commit 5dabb76
Show file tree

Hide file tree

Showing 23 changed files with 1,665 additions and 44 deletions.
diff --git a/XCEDE/examples/fBIRNPhaseII-new/Makefile b/XCEDE/examples/fBIRNPhaseII-new/Makefile
@@ -3,7 +3,7 @@ FBIRNSCHEMA=/home/gadde/birn-cvs/BIRN/XCEDE/extensions/fbirn/xcede-fbirn-base.xs
 
 INPUTS=ACQUISITIONlist.xcede ACQUISITION.xcede ANALYSIS.xml AssessmentProtocolExample.xcede CATALOG.xcede EPISODE.xcede EVENTS.xcede PROJECT.xcede STUDY.xcede SUBJECT.xcede VISIT.xcede
 
-all: merged.xml merged.html xcede2html.css
+all: merged.xml merged.html merged-nav.html xcede2html.css xcede2html-nav.css
 
 merged.xml: ../../tools/xcede_merge/xcede_merge.xsl ${INPUTS}
 	cp ../../tools/xcede_merge/xcede_merge.xsl .
@@ -15,6 +15,14 @@ merged.html: merged.xml ../../tools/xcede2html/xcede2html.xsl ../../extensions/f
 	rm -f merged.html
 	xsltproc ../../extensions/fbirn/xcede2html_fbirn.xsl merged.xml > merged.html
 
+merged-nav.html: merged.xml ../../tools/xcede2html/xcede2html-nav.xsl
+	rm -f merged-nav.html
+	xsltproc --stringparam targetframe data --stringparam basefile merged.html ../../tools/xcede2html/xcede2html-nav.xsl merged.xml > merged-nav.html
+
 xcede2html.css: ../../tools/xcede2html/xcede2html.css
 	cp ../../tools/xcede2html/xcede2html.css .
 
+xcede2html-nav.css: ../../tools/xcede2html/xcede2html-nav.css
+	cp ../../tools/xcede2html/xcede2html-nav.css .
+
+
diff --git a/XCEDE/examples/fBIRNPhaseII-new/merged-nav.html b/XCEDE/examples/fBIRNPhaseII-new/merged-nav.html
@@ -0,0 +1,45 @@
+<html xmlns="http://www.xcede.org/xcede-2" xmlns:xcede="http://www.xcede.org/xcede-2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dyn="http://exslt.org/dynamic"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="xcede2html-nav.css" type="text/css" media="screen"></link><title>XCEDE dataset</title><p id="debug"></p><script type="text/javascript"><!--
+function debuglog(text) {
+  var debugelem = document.getElementById('debug');
+  debug.appendChild(document.createTextNode(text));
+  debug.appendChild(document.createElement('br'));
+  debug.appendChild(document.createTextNode('\n'));
+}
+function showhide_sw_open(id)
+{
+  document.getElementById(id).style.display='';
+  document.getElementById('sw_closed_'+id).style.display='none';
+  document.getElementById('sw_open_'+id).style.display='';
+}
+function showhide_sw_close(id)
+{
+  document.getElementById(id).style.display='none';
+  document.getElementById('sw_open_'+id).style.display='none';
+  document.getElementById('sw_closed_'+id).style.display='';
+}
+--></script></head><body bgcolor="#FFFFFF"><li class="project-nav"><span class="projectTitle-nav"><a target="data" href="merged.html#project:A:A:::::"><span class="levelName">Project:</span><span class="levelID"> A</span></a></span>
+<div class="switchContainer"><span class="switchOpen" id="sw_open_project:A:A:::::_nav" onclick="showhide_sw_close('project:A:A:::::_nav');">collapse</span>
+      <span class="switchClosed" style="display: none" id="sw_closed_project:A:A:::::_nav" onclick="showhide_sw_open('project:A:A:::::_nav');">expand</span>
+</div><div class="levelBody" id="project:A:A:::::_nav"><li class="visit-nav"><span class="visitTitle-nav"><a target="data" href="merged.html#visit:1:A:1:1:::"><span class="levelName">Visit:</span> Subject 1,<span class="levelID"> 1</span></a></span>
+<div class="switchContainer"><span class="switchOpen" id="sw_open_visit:1:A:1:1:::_nav" onclick="showhide_sw_close('visit:1:A:1:1:::_nav');">collapse</span>
+      <span class="switchClosed" style="display: none" id="sw_closed_visit:1:A:1:1:::_nav" onclick="showhide_sw_open('visit:1:A:1:1:::_nav');">expand</span>
+</div><div class="levelBody" id="visit:1:A:1:1:::_nav"><li class="study-nav"><span class="studyTitle-nav"><a target="data" href="merged.html#study:MR:A:1:1:MR::"><span class="levelName">Study:</span><span class="levelID"> MR</span></a></span>
+<div class="switchContainer"><span class="switchOpen" id="sw_open_study:MR:A:1:1:MR::_nav" onclick="showhide_sw_close('study:MR:A:1:1:MR::_nav');">collapse</span>
+      <span class="switchClosed" style="display: none" id="sw_closed_study:MR:A:1:1:MR::_nav" onclick="showhide_sw_open('study:MR:A:1:1:MR::_nav');">expand</span>
+</div><div class="levelBody" id="study:MR:A:1:1:MR::_nav"><li class="episode-nav"><span class="episodeTitle-nav"><a target="data" href="merged.html#episode:task run 1:A:1:1:MR:task run 1:"><span class="levelName">Episode:</span><span class="levelID"> task run 1</span></a></span>
+<div class="switchContainer"><span class="switchOpen" id="sw_open_episode:task run 1:A:1:1:MR:task run 1:_nav" onclick="showhide_sw_close('episode:task run 1:A:1:1:MR:task run 1:_nav');">collapse</span>
+      <span class="switchClosed" style="display: none" id="sw_closed_episode:task run 1:A:1:1:MR:task run 1:_nav" onclick="showhide_sw_open('episode:task run 1:A:1:1:MR:task run 1:_nav');">expand</span>
+</div><div class="levelBody" id="episode:task run 1:A:1:1:MR:task run 1:_nav"><li class="acquisition-nav"><span class="acquisitionTitle-nav"><a target="data" href="merged.html#acquisition:events:A:1:1:MR:task run 1:events"><span class="levelName">Acquisition:</span><span class="levelID"> events</span></a></span>
+<div class="switchContainer"><span class="switchOpen" id="sw_open_acquisition:events:A:1:1:MR:task run 1:events_nav" onclick="showhide_sw_close('acquisition:events:A:1:1:MR:task run 1:events_nav');">collapse</span>
+      <span class="switchClosed" style="display: none" id="sw_closed_acquisition:events:A:1:1:MR:task run 1:events_nav" onclick="showhide_sw_open('acquisition:events:A:1:1:MR:task run 1:events_nav');">expand</span>
+</div><div class="levelBody" id="acquisition:events:A:1:1:MR:task run 1:events_nav"><div class="blockTitle-nav"><a target="data" href="merged.html#data:ZZZZ::::::">Events</a></div></div></li><li class="acquisition-nav"><span class="acquisitionTitle-nav"><a target="data" href="merged.html#acquisition:MR:A:1:1:MR:task run 1:MR"><span class="levelName">Acquisition:</span><span class="levelID"> MR</span></a></span>
+<div class="switchContainer"><span class="switchOpen" id="sw_open_acquisition:MR:A:1:1:MR:task run 1:MR_nav" onclick="showhide_sw_close('acquisition:MR:A:1:1:MR:task run 1:MR_nav');">collapse</span>
+      <span class="switchClosed" style="display: none" id="sw_closed_acquisition:MR:A:1:1:MR:task run 1:MR_nav" onclick="showhide_sw_open('acquisition:MR:A:1:1:MR:task run 1:MR_nav');">expand</span>
+</div><div class="levelBody" id="acquisition:MR:A:1:1:MR:task run 1:MR_nav"><div class="blockTitle-nav"><a target="data" href="merged.html#resource:XXXX:A:1:1:MR:task run 1:MR">Mapped Binary Data Resource</a></div><div class="blockTitle-nav"><a target="data" href="merged.html#analysis::A:1:1:MR:task run 1:MR">Analysis</a></div></div></li><li class="acquisition-nav"><span class="acquisitionTitle-nav"><a target="data" href="merged.html#acquisition:MR_list:A:1:1:MR:task run 1:MR_list"><span class="levelName">Acquisition:</span><span class="levelID"> MR_list</span></a></span>
+<div class="switchContainer"><span class="switchOpen" id="sw_open_acquisition:MR_list:A:1:1:MR:task run 1:MR_list_nav" onclick="showhide_sw_close('acquisition:MR_list:A:1:1:MR:task run 1:MR_list_nav');">collapse</span>
+      <span class="switchClosed" style="display: none" id="sw_closed_acquisition:MR_list:A:1:1:MR:task run 1:MR_list_nav" onclick="showhide_sw_open('acquisition:MR_list:A:1:1:MR:task run 1:MR_list_nav');">expand</span>
+</div><div class="levelBody" id="acquisition:MR_list:A:1:1:MR:task run 1:MR_list_nav"><div class="blockTitle-nav"><a target="data" href="merged.html#resource:YYYY:A:1:1:MR:task run 1:MR_list">Resource</a></div></div></li></div></li></div></li></div></li></div></li><li class="project-nav"><span class="projectTitle-nav"><a target="data" href="merged.html#project:B:B:::::"><span class="levelName">Project:</span><span class="levelID"> B</span></a></span>
+<div class="switchContainer"><span class="switchOpen" id="sw_open_project:B:B:::::_nav" onclick="showhide_sw_close('project:B:B:::::_nav');">collapse</span>
+      <span class="switchClosed" style="display: none" id="sw_closed_project:B:B:::::_nav" onclick="showhide_sw_open('project:B:B:::::_nav');">expand</span>
+</div><div class="levelBody" id="project:B:B:::::_nav"></div></li><div class="blockTitle-nav"><a target="data" href="merged.html#protocol:V1::::::">Protocol V1</a></div></body></html>
diff --git a/XCEDE/examples/fBIRNPhaseII-new/merged-top.html b/XCEDE/examples/fBIRNPhaseII-new/merged-top.html
@@ -0,0 +1,6 @@
+<html>
+  <frameset cols="25%,75%">
+    <frame name="nav" src="merged-nav.html" />
+    <frame name="data" src="merged.html" />
+  </frameset>
+</html>
diff --git a/XCEDE/examples/fBIRNPhaseII-new/merged.html b/XCEDE/examples/fBIRNPhaseII-new/merged.html
diff --git a/XCEDE/examples/fBIRNPhaseII-new/merged.xml b/XCEDE/examples/fBIRNPhaseII-new/merged.xml
@@ -3357,7 +3357,7 @@
         <user>gadde</user>
         <hostName>golgi</hostName>
         <platform>AIX</platform>
-        <cvs>$Id: merged.xml,v 1.4 2008-03-14 17:26:36 gadde Exp $</cvs>
+        <cvs>$Id: merged.xml,v 1.5 2008-03-20 15:42:43 gadde Exp $</cvs>
         <package>FreeSurfer</package>
       </processStep>
     </provenance>
@@ -5186,7 +5186,6 @@
       <acquisitionMatrix>64</acquisitionMatrix>
       <flipAngle>90</flipAngle>
 
-      <param name="examnumber">45015</param>
       <param name="studyid">BIRN20</param>
       <param name="seriesnumber">4</param>
       <param name="runnumber">2</param>

diff --git a/XCEDE/extensions/fbirn/xcede-fbirn-base.xsd b/XCEDE/extensions/fbirn/xcede-fbirn-base.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns="http://www.xcede.org/xcede-2/extensions/fbirn" targetNamespace="http://www.xcede.org/xcede-2/extensions/fbirn" xmlns:fbirn="http://www.xcede.org/xcede-2/extensions/fbirn" xmlns:xcede="http://www.xcede.org/xcede-2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:sch="http://purl.oclc.org/dsdl/schematron" elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <xs:import schemaLocation="../../xcede-2.0-mr.xsd" namespace="http://www.xcede.org/xcede-2"/>
+  <xs:complexType name="fipsEpisodeInfo_t">
+    <xs:complexContent>
+      <xs:extension base="xcede:episodeInfo_t">
+        <xs:sequence>
+          <xs:element name="nameLocal" type="xs:string" minOccurs="0" />
+          <xs:element name="nameStandard" type="xs:string" minOccurs="0" />
+          <xs:element name="segmentID" type="xs:string" minOccurs="0" />
+          <xs:element name="seriesTime" type="xs:string" minOccurs="0" />
+          <xs:element name="comment" type="xs:string" minOccurs="0" />
+          <xs:element name="type" type="xs:string" minOccurs="0" />
+          <xs:element name="paradigm" type="xs:string" minOccurs="0" />
+          <xs:element name="paradigmVersion" type="xs:string" minOccurs="0" />
+          <xs:element name="number" type="xs:string" minOccurs="0" />
+          <xs:element name="sliceOrder" type="xs:string" minOccurs="0" />
+          <xs:element name="skipInitialVols" type="xs:string" minOccurs="0" />
+          <xs:element name="analysisLevel" minOccurs="0">
+            <xs:complexType>
+              <xs:sequence>
+                <xs:element name="level" type="xs:string" minOccurs="0" />
+                <xs:element name="name" type="xs:string" minOccurs="0" />
+              </xs:sequence>
+            </xs:complexType>
+          </xs:element>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+</xs:schema>
diff --git a/XCEDE/extensions/fbirn/xcede-fbirn-use.xsd b/XCEDE/extensions/fbirn/xcede-fbirn-use.xsd
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <xs:import schemaLocation="../../xcede-2.0-mr.xsd" namespace="http://www.xcede.org/xcede-2"/>
+  <xs:import schemaLocation="xcede-fbirn-base.xsd" namespace="http://www.xcede.org/xcede-2/extensions/fbirn"/>
+</xs:schema>
diff --git a/XCEDE/extensions/fbirn/xcede2html_fbirn.xsl b/XCEDE/extensions/fbirn/xcede2html_fbirn.xsl
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet
+  xmlns="http://www.xcede.org/xcede-2"
+  xmlns:fbirn="http://www.xcede.org/xcede-2/extensions/fbirn"
+  xmlns:xcede="http://www.xcede.org/xcede-2"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:dyn="http://exslt.org/dynamic"
+  version="1.0">
+
+  <xsl:output method="html"/>
+
+  <xsl:include href="../../tools/xcede2html/xcede2html.xsl" />
+
+  <xsl:template match="xcede:episodeInfo[xcede:checkTypeMatch(@xsi:type, 'http://www.xcede.org/xcede-2/extensions/fbirn', 'fipsEpisodeInfo_t')]">
+    <xsl:element name="div">
+      <xsl:attribute name="class">block</xsl:attribute>
+      <xsl:element name="div">
+        <xsl:attribute name="class">blocktitle</xsl:attribute>
+        <xsl:text>FIPS Info</xsl:text>
+      </xsl:element>
+      <xsl:element name="div">
+        <xsl:attribute name="class">blockcontent</xsl:attribute>
+        <xsl:call-template name="genericElement" />
+      </xsl:element>
+    </xsl:element>
+  </xsl:template>
+
+  <xsl:template match="xcede:acquisitionInfo[xcede:checkTypeMatch(@xsi:type, 'http://www.xcede.org/xcede-2', 'mrAcquisitionInfo_t')]">
+    <xsl:element name="div">
+      <xsl:attribute name="class">block</xsl:attribute>
+      <xsl:element name="div">
+        <xsl:attribute name="class">blocktitle</xsl:attribute>
+        <xsl:text>MR Acquisition</xsl:text>
+      </xsl:element>
+      <xsl:element name="div">
+        <xsl:attribute name="class">blockcontent</xsl:attribute>
+        <xsl:call-template name="genericElement" />
+      </xsl:element>
+    </xsl:element>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/XCEDE/manual/images/analysis_instance.odg b/XCEDE/manual/images/analysis_instance.odg
diff --git a/XCEDE/manual/images/assessment_data.odg b/XCEDE/manual/images/assessment_data.odg
diff --git a/XCEDE/manual/images/assessment_definition.odg b/XCEDE/manual/images/assessment_definition.odg
diff --git a/XCEDE/manual/images/binary_data_resource_instance.odg b/XCEDE/manual/images/binary_data_resource_instance.odg
diff --git a/XCEDE/manual/images/event_instance.odg b/XCEDE/manual/images/event_instance.odg
diff --git a/XCEDE/manual/images/hierarchy_levels-old.odg b/XCEDE/manual/images/hierarchy_levels-old.odg
diff --git a/XCEDE/manual/images/hierarchy_levels.odg b/XCEDE/manual/images/hierarchy_levels.odg
diff --git a/XCEDE/manual/images/protocol_instance.odg b/XCEDE/manual/images/protocol_instance.odg
diff --git a/XCEDE/manual/images/provenance_instance.odg b/XCEDE/manual/images/provenance_instance.odg
diff --git a/XCEDE/manual/images/terminology_instance.odg b/XCEDE/manual/images/terminology_instance.odg
diff --git a/XCEDE/manual/images/terminology_instance2.odg b/XCEDE/manual/images/terminology_instance2.odg