Merge branch 'master' of https://github.com/FHIR/sample-ig

_genonce.bat

@@ -3,7 +3,7 @@ SET publisher_jar=org.hl7.fhir.publisher.jar
 SET input_cache_path=%CD%\input-cache
 
 ECHO Checking internet connection...
-PING tx.fhir.org -n 1 -w 1000 | FINDSTR TTL && GOTO isonline
+PING tx.fhir.org -4 -n 1 -w 1000 | FINDSTR TTL && GOTO isonline
 ECHO We're offline...
 SET txoption=-tx n/a
 GOTO igpublish
@@ -24,4 +24,4 @@ IF EXIST "%input_cache_path%\%publisher_jar%" (
 	ECHO IG Publisher NOT FOUND in input-cache or parent folder.  Please run _updatePublisher.  Aborting...
 )
 
-PAUSE
+PAUSE

_updatePublisher.bat

@@ -19,7 +19,7 @@ IF "%~1"=="/f" SET skipPrompts=true
 
 ECHO.
 ECHO Checking internet connection...
-PING tx.fhir.org -n 1 -w 1000 | FINDSTR TTL && GOTO isonline
+PING tx.fhir.org -4 -n 1 -w 1000 | FINDSTR TTL && GOTO isonline
 ECHO We're offline, nothing to do...
 GOTO end
 
@@ -215,4 +215,4 @@ start copy /y "_updatePublisher.new.bat" "_updatePublisher.bat" ^&^& del "_updat
 
 IF "%skipPrompts%"=="true" (
   PAUSE
-}
+}

input-cache/txcache/all-systems.cache

@@ -1,4 +1,4 @@
--------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------
 {"code" : {
   "code" : "http://hl7.org/fhirpath/System.String"
 }, "valueSet" :{
@@ -11,10 +11,74 @@
       "system" : "http://hl7.org/fhir/resource-types"
     }]
   }
-}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS"}####
+}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS"}####
-v: {
+v: {
-  "display" : "",
+  "display" : "",
-  "severity" : "error",
+  "severity" : "error",
-  "error" : "The code system \"\" is not known (encountered paired with code = \"http://hl7.org/fhirpath/System.String\"); The code provided (#http://hl7.org/fhirpath/System.String) is not  valid in the value set FHIRDefinedType"
+  "error" : "The code system \"\" is not known (encountered paired with code = \"http://hl7.org/fhirpath/System.String\"); The code provided (#http://hl7.org/fhirpath/System.String) is not  valid in the value set FHIRDefinedType"
-}
+}
--------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------
+{"code" : {
+  "code" : "text/cql"
+}, "valueSet" :{
+  "resourceType" : "ValueSet",
+  "compose" : {
+    "include" : [{
+      "system" : "urn:ietf:bcp:13"
+    }]
+  }
+}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS"}####
+v: {
+  "display" : "text/cql",
+  "severity" : null,
+  "error" : ""
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "code" : "application/elm+xml"
+}, "valueSet" :{
+  "resourceType" : "ValueSet",
+  "compose" : {
+    "include" : [{
+      "system" : "urn:ietf:bcp:13"
+    }]
+  }
+}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS"}####
+v: {
+  "display" : "application/elm+xml",
+  "severity" : null,
+  "error" : ""
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "code" : "application/pdf"
+}, "valueSet" :{
+  "resourceType" : "ValueSet",
+  "compose" : {
+    "include" : [{
+      "system" : "urn:ietf:bcp:13"
+    }]
+  }
+}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS"}####
+v: {
+  "display" : "application/pdf",
+  "severity" : null,
+  "error" : ""
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "code" : "application/elm+json"
+}, "valueSet" :{
+  "resourceType" : "ValueSet",
+  "compose" : {
+    "include" : [{
+      "system" : "urn:ietf:bcp:13"
+    }]
+  }
+}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS"}####
+v: {
+  "display" : "application/elm+json",
+  "severity" : null,
+  "error" : ""
+}
+-------------------------------------------------------------------------------------

input-cache/txcache/http___unstats.un.org_unsd_methods_m49_m49.htm.cache

@@ -1,33 +1,43 @@
--------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------
-{"code" : {
+{"code" : {
-  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
+  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
-  "code" : "001"
+  "code" : "001"
-}, "valueSet" :{
+}, "valueSet" :{
-  "resourceType" : "ValueSet",
+  "resourceType" : "ValueSet",
-  "compose" : {
+  "compose" : {
-    "include" : [{
+    "include" : [{
-      "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
+      "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
-      "filter" : [{
+      "filter" : [{
-        "property" : "class",
+        "property" : "class",
-        "op" : "=",
+        "op" : "=",
-        "value" : "region"
+        "value" : "region"
-      }]
+      }]
-    }]
+    }]
-  }
+  }
-}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS"}####
+}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS"}####
-v: {
+v: {
-  "display" : "",
+  "display" : "",
-  "severity" : "error",
+  "severity" : "error",
-  "error" : "Not done yet @ TAreaCodeServices.Close"
+  "error" : "Not done yet @ TAreaCodeServices.Close"
-}
+}
--------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------
-{"code" : {
+{"code" : {
-  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
+  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
-  "code" : "001"
+  "code" : "001"
-}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS"}####
+}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS"}####
-v: {
+v: {
-  "display" : "World",
+  "display" : "World",
-  "severity" : null,
+  "severity" : null,
-  "error" : ""
+  "error" : ""
-}
+}
--------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
+  "code" : "001"
+}, "valueSet" :null, "lang":"en-US", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS"}####
+v: {
+  "display" : "World",
+  "severity" : null,
+  "error" : ""
+}
+-------------------------------------------------------------------------------------

input-cache/txcache/loinc.cache

@@ -1,31 +1,31 @@
--------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------
-{"code" : {
+{"code" : {
-  "system" : "http://loinc.org",
+  "system" : "http://loinc.org",
-  "code" : "85354-9"
+  "code" : "85354-9"
-}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS"}####
+}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS"}####
-v: {
+v: {
-  "display" : "Blood pressure panel with all children optional",
+  "display" : "Blood pressure panel with all children optional",
-  "severity" : null,
+  "severity" : null,
-  "error" : ""
+  "error" : ""
-}
+}
--------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------
-{"code" : {
+{"code" : {
-  "system" : "http://loinc.org",
+  "system" : "http://loinc.org",
-  "code" : "8480-6"
+  "code" : "8480-6"
-}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS"}####
+}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS"}####
-v: {
+v: {
-  "display" : "Systolic blood pressure",
+  "display" : "Systolic blood pressure",
-  "severity" : null,
+  "severity" : null,
-  "error" : ""
+  "error" : ""
-}
+}
--------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------
-{"code" : {
+{"code" : {
-  "system" : "http://loinc.org",
+  "system" : "http://loinc.org",
-  "code" : "8462-4"
+  "code" : "8462-4"
-}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS"}####
+}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS"}####
-v: {
+v: {
-  "display" : "Diastolic blood pressure",
+  "display" : "Diastolic blood pressure",
-  "severity" : null,
+  "severity" : null,
-  "error" : ""
+  "error" : ""
-}
+}
--------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------

input-cache/txcache/version.ctl

@@ -1 +1 @@
-1.0.308
+1.0.329

input/cql/cql-options.json

@@ -0,0 +1,17 @@
+{
+   "options":[
+      "EnableAnnotations",
+      "EnableLocators",
+      "DisableListDemotion",
+      "DisableListPromotion"
+
+],
+   "formats":[
+     "XML",
+     "JXSON"
+   ],
+   "validateUnits":true,
+   "verifyOnly":false,
+   "errorLevel":"Info",
+   "signatureLevel":"None"
+}

input/examples/Library-example.json

@@ -1,14 +1,24 @@
 {
   "resourceType" : "Library",
+  "id": "example",
   "url" : "http://somewhere.org/fhir/uv/myig/Library/example",
   "version" : "1.0.0",
+  "name": "example",
+  "title": "Example CQL Library",
   "status" : "draft",
+  "experimental": true,
   "type" : {
     "coding" : [{
       "system" : "http://terminology.hl7.org/CodeSystem/library-type",
       "code" : "logic-library"
     }]
   },
+  "subject": {
+    "coding": [{
+      "system": "hl7.org/fhir/resource-types",
+      "code": "Patient"
+    }]
+  },
   "content" : [{
     "id" : "ig-loader-example.cql"
   }]

input/myig.xml

@@ -38,11 +38,6 @@
   <license value="CC0-1.0"/>
   <!-- This is whatever FHIR version(s) the IG artifacts are targeting (not the version of this file, which should always be 'current release') -->
   <fhirVersion value="4.0.1"/>
- <!-- <dependsOn>
-    <uri value="http://somethign"/>
-    <packageId value="de.basisprofil.r4"/>
-    <version value="0.9.2"/>
-  </dependsOn> -->
   <definition>
     <!-- You don't need to define any groupings.  The IGPublisher will define them for you.  You only need to do so if your IG is 'special' and it's
       inappropriate to use the defaults.  Feel free to provide feedback about the defaults... -->
@@ -67,9 +62,9 @@
     </resource>
     <resource>
       <reference>
-        <reference value="Bundle/h1"/>
+        <reference value="ValueSet/valueset-no-codesystem"/>
       </reference>
-      <name value="History"/>
+      <name value="Value set for no code system"/>
     </resource>
 <!--    <resource>
       <reference>
@@ -131,6 +126,10 @@
       <code value="path-binary"/>
       <value value="input\cql"/>
     </parameter>
+    <parameter>
+      <code value="path-liquid"/>
+      <value value="templates\liquid"/>
+    </parameter>
 <!-- Uncomment one or more of these if you want to limit which syntaxes are supported or want to disable the display of mappings
     <parameter>
       <code value="excludexml"/>

input/pagecontent/spec.md

@@ -1,2 +1,4 @@
 ### A Heading
-You can also use markdown if that's your thing
+You can also use markdown if that's your thing
+
+And an icon: ![resource](icon-resource.png)

input/resources/valueset-no-codesystem.xml

@@ -0,0 +1,20 @@
+<ValueSet xmlns="http://hl7.org/fhir">
+  <id value="valueset-no-codesystem"/> 
+  <url value="http://somewhere.org/fhir/uv/myig/ValueSet/valueset-no-codesystem"/> 
+  <name value="ValueSetWithNoCodeSystem"/>
+  <status value="draft"/> 
+  <experimental value="true"/> 
+  <date value="2015-06-22"/> 
+  <compose> 
+    <include> 
+      <system value="http://not-a-known-code-system"/> 
+      <version value="2.36"/> 
+      <concept> 
+        <code value="not-known-code"/> 
+      </concept> 
+      <concept> 
+        <code value="not-known-code"/> 
+      </concept> 
+    </include> 
+  </compose> 
+</ValueSet> 

templates/liquid/Library.liquid

@@ -0,0 +1,325 @@
+<div>
+    <table class="grid dict">
+        {% if Library.id.exists() %}
+        <tr>
+            <th scope="row"><b>Id: </b></th>
+            <td style="padding-left: 25px;">{{Library.id}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.url.exists() %}
+        <tr>
+            <th scope="row"><b>Url: </b></th>
+            <td style="padding-left: 25px;">{{Library.url}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.version.exists() %}
+        <tr>
+            <th scope="row"><b>Version: </b></th>
+            <td style="padding-left: 25px;">{{Library.version}}</td>
+        </tr>
+        {% endif %}
+        {% for identifier in Library.identifier %}
+        <tr>
+            <th scope="row"><b>Identifier: </b></th>
+            <td style="padding-left: 25px;">
+                {% if identifier.type.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>type: </b> <span>{{identifier.type.value}}</span>
+                </p>
+                {% endif %}
+                {% if identifier.value.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>value: </b> <span>{{identifier.value}}</span>
+                </p>
+                {% endif %}
+            </td>
+        </tr>
+        {% endfor %}
+        {% if Library.name.exists() %}
+        <tr>
+            <th scope="row"><b>Name: </b></th>
+            <td style="padding-left: 25px;">{{Library.name}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.title.exists() %}
+        <tr>
+            <th scope="row"><b>Title: </b></th>
+            <td style="padding-left: 25px;">{{Library.title}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.subtitle.exists() %}
+        <tr>
+            <th scope="row"><b>Subtitle: </b></th>
+            <td style="padding-left: 25px;">{{Library.subtitle}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.status.exists() %}
+        <tr>
+            <th scope="row"><b>Status: </b></th>
+            <td style="padding-left: 25px;">{{Library.status.value}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.experimental.exists() %}
+        <tr>
+            <th scope="row"><b>Experimental: </b></th>
+            <td style="padding-left: 25px;">{{Library.experimental.value}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.type.exists() %}
+        <tr>
+            <th scope="row"><b>Type: </b></th>
+            <td style="padding-left: 25px;">
+                {% if Library.type.coding.exists() %}
+                    {% for coding in Library.type.coding %}
+                        {% if coding.system.exists() %}
+                        <p style="margin-bottom: 5px;">
+                            <b>system: </b> <span>{{coding.system}}</span>
+                        </p>
+                        {% endif %}
+                        {% if coding.code.exists() %}
+                        <p style="margin-bottom: 5px;">
+                            <b>code: </b> <span>{{coding.code}}</span>
+                        </p>
+                        {% endif %}
+                        {% if coding.display.exists() %}
+                        <p style="margin-bottom: 5px;">
+                            <b>display: </b> <span>{{coding.display}}</span>
+                        </p>
+                        {% endif %}
+                    {% endfor %}
+                {% endif %}
+                {% if Library.type.coding.exists().not and Library.type.text.exists() %}
+                    {{Library.type.text}}
+                {% endif %}
+            </td>
+        </tr>
+        {% endif %}
+        {% if Library.subject.exists() %}
+        <tr>
+            <th scope="row"><b>Subject: </b></th>
+            {%if Library.subject is CodeableConcept %}
+            <td style="padding-left: 25px;">
+                {% if Library.subject.coding.exists() %}
+                    {% for coding in Library.subject.coding %}
+                        {% if coding.system.exists() %}
+                        <p style="margin-bottom: 5px;">
+                            <b>system: </b> <span>{{coding.system}}</span>
+                        </p>
+                        {% endif %}
+                        {% if coding.code.exists() %}
+                        <p style="margin-bottom: 5px;">
+                            <b>code: </b> <span>{{coding.code}}</span>
+                        </p>
+                        {% endif %}
+                        {% if coding.display.exists() %}
+                        <p style="margin-bottom: 5px;">
+                            <b>display: </b> <span>{{coding.display}}</span>
+                        </p>
+                        {% endif %}
+                    {% endfor %}
+                {% endif %}
+                {% if Library.subject.coding.exists().not and Library.subject.text.exists() %}
+                    {{Library.subject.text}}
+                {% endif %}
+            </td>
+            {% endif %}
+            {% if Library.subject is Reference %}
+            <td style="padding-left: 25px;">
+                {% if Library.subject.reference.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>reference: </b> <span>{{Library.subject.reference}}</span>
+                </p>
+                {% endif %}
+                {% if Library.subject.type.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>type: </b> <span>{{Library.subject.type}}</span>
+                </p>
+                {% endif %}
+                {% if Library.subject.display.exists() %}
+                <p style="margin-bottom: 5px;">
+                    <b>code: </b> <span>{{Library.subject.display}}</span>
+                </p>
+                {% endif %}
+            </td>
+            {% endif %}
+        </tr>
+        {% endif %}
+        {% if Library.date.exists() %}
+        <tr>
+            <th scope="row"><b>Date: </b></th>
+            <td style="padding-left: 25px;">{{Library.date}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.publisher.exists() %}
+        <tr>
+            <th scope="row"><b>Publisher: </b></th>
+            <td style="padding-left: 25px;">{{Library.publisher}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.description.exists() %}
+        <tr>
+            <th scope="row"><b>Description: </b></th>
+            <td style="padding-left: 25px;">{{Library.description}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.useContext.exists() %}
+        <tr>
+            <th scope="row"><b>Use Context: </b></th>
+            <td style="padding-left: 25px;">
+                <table class="grid-dict">
+                    <tr><th><b>code</b></th><th><b>value</b></th></tr>
+                    {% for useContext in Library.useContext %}
+                      <tr>
+                        <td>{{useContext.code.code}}</td>
+                        <td>{{(useContext.value as CodeableConcept).coding.first().code}}</td>
+                      </tr>
+                    {% endfor %}
+                </table>
+            </td>
+        </tr>
+        {% endif %}
+        {% if Library.jurisdiction.exists() %}
+        <tr>
+            <th scope="row"><b>Jurisdiction: </b></th>
+            <td style="padding-left: 25px;">{{Library.jurisdiction.first().coding.first().code}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.purpose.exists() %}
+        <tr>
+            <th scope="row"><b>Purpose: </b></th>
+            <td style="padding-left: 25px;">{{Library.purpose}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.usage.exists() %}
+        <tr>
+            <th scope="row"><b>Usage: </b></th>
+            <td style="padding-left: 25px;">{{Library.usage}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.copyright.exists() %}
+        <tr>
+            <th scope="row"><b>Copyright: </b></th>
+            <td style="padding-left: 25px;">{{Library.copyright}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.approvalDate.exists() %}
+        <tr>
+            <th scope="row"><b>Approval Date: </b></th>
+            <td style="padding-left: 25px;">{{Library.approvalDate}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.lastReviewDate.exists() %}
+        <tr>
+            <th scope="row"><b>Last Review Date: </b></th>
+            <td style="padding-left: 25px;">{{Library.lastReviewDate}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.effectivePeriod.exists() %}
+        <tr>
+            <th scope="row"><b>Effective Period: </b></th>
+            <td style="padding-left: 25px;">{{Library.effectivePeriod.start}}..{{Library.effectivePeriod.end}}</td>
+        </tr>
+        {% endif %}
+        {% if Library.relatedArtifact.exists() %}
+        <tr>
+          <th scope="row"><b>Related Artifacts: </b></th>
+          <td style="padding-left: 25px;">
+            <table class="grid-dict">
+              <tr><th><b>Type</b></th><th><b>Resource</b></th></tr>
+              {% for artifact in Library.relatedArtifact %}
+                <tr><td>{{artifact.type.value}}</td><td>{{artifact.resource}}</td></tr>
+              {% endfor %}
+            </table>
+          </td>
+        </tr>
+        {% endif %}
+        {% if Library.parameter.exists() %}
+        <tr>
+          <th scope="row"><b>Parameters: </b></th>
+          <td style="padding-left: 25px;">
+            <table class="grid-dict">
+              <tr><th><b>Name</b></th><th><b>Type</b></th><th><b>Min</b></th><th><b>Max</b></th><th><b>In/Out</b></th></tr>
+              {% for param in Library.parameter %}
+                <tr><th>{{param.name}}</th><th>{{param.type}}</th><th>{{param.min}}</th><th>{{param.max}}</th><th>{{param.use}}</th></tr>
+              {% endfor %}
+            </table>
+          </td>
+        </tr>
+        {% endif %}
+        {% if Library.dataRequirement.exists() %}
+        <tr>
+          <th scope="row"><b>Data Requirements:</b></th>
+          <td style="padding-left: 25px;">
+            <table class="grid-dict">
+              <tr><th><b>Type</b></th><th><b>Profile</b></th><th><b>MS</b></th><th><b>Code Filter</b></th></tr>
+              {% for requirement in Library.dataRequirement %}
+                <tr>
+                  <th>{{requirement.type.value}}</th>
+                  <th>{% for profile in requirement.profile %}{{profile.value}}{% endfor %}</th>
+                  <th>{% for support in requirement.mustSupport %}{{mustSupport}};{% endfor %}</th>
+                  <th>
+                    {% for cfilter in requirement.codeFilter %}
+                    <p style="margin-bottom: 5px;">
+                        <b>code filter: </b>
+                        {% if cfilter.path.exists() or cfilter.valueSet.exists() or cfilter.code.exists() %}
+                        <br/>
+                        {% endif %}
+                        {% if cfilter.path.exists() %}
+                        <span style="padding-left: 25px;">
+                            <b>path: </b><span>{{cfilter.path}}</span>
+                        </span>
+                        {% if cfilter.valueSet.exists() or cfilter.code.exists() %}
+                        <br/>
+                        {% endif %}
+                        {% endif %}
+                        {% if cfilter.valueSet.exists() %}
+                        <span style="padding-left: 25px;">
+                            <b>value set: </b><span>{{cfilter.valueSet.value}}</span>
+                        </span>
+                        {% endif %}
+                        {% for coding in cfilter.code %}
+                            {% if coding.system.exists() %}
+                            <p style="margin-bottom: 5px;">
+                                <b>system: </b> <span>{{coding.system}}</span>
+                            </p>
+                            {% endif %}
+                            {% if coding.code.exists() %}
+                            <p style="margin-bottom: 5px;">
+                                <b>code: </b> <span>{{coding.code}}</span>
+                            </p>
+                            {% endif %}
+                            {% if coding.display.exists() %}
+                            <p style="margin-bottom: 5px;">
+                                <b>display: </b> <span>{{coding.display}}</span>
+                            </p>
+                            {% endif %}
+                        {% endfor %}
+                    </p>
+                    {% endfor %}
+                  </th>
+                </tr>
+              {% endfor %}
+            </table>
+          </td>
+        </tr>
+        {% endif %}
+        {% for c in Library.content %}
+        {% if c.contentType = 'text/cql' %}
+        <tr>
+          <table>
+            <tr><th><b>Content: </b> {{c.contentType}}</th></tr>
+            <tr><td><pre><code>{{c.data.decode('base64').escape('html')}}</code></pre></td></tr>
+          </table>
+        </tr>
+        {% endif %}
+        {% if c.contentType != 'text/cql' %}
+        <tr>
+          <table>
+            <tr><th><b>Content: </b> {{c.contentType}}</th></tr>
+            <tr><td><pre><code>{{'Encoded data (' + c.data.length().toString() + ' characters)'}}</code></pre></td></tr>
+          </table>
+        </tr>
+        {% endif %}
+        {% endfor %}
+    </table>
+</div>