Merge pull request #2 from FHIR/master

rebase

.gitignore

@@ -1,5 +1,22 @@
-/input/images/Thumbs.db
-/input-cache/org.hl7.fhir.publisher.jar
+# Temporary folders #
+#####################
 temp
 template
 output
+
+# Don't commit this because it's so large #
+###########################################
+/input-cache/org.hl7.fhir.publisher.jar
+
+# Windows generated files #
+###########################
+Thumbs.db
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+
+# backup files #
+################
+*.bak

_gencontinuous.bat

@@ -0,0 +1,2 @@
+@ECHO OFF
+CALL _genonce.bat -watch

_gencontinuous.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+_genonce.sh -watch

_genonce.bat

@@ -17,11 +17,11 @@ SET txoption=
 SET JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
 
 IF EXIST "%input_cache_path%\%publisher_jar%" (
-	JAVA -jar input-cache/org.hl7.fhir.publisher.jar -ig ig.ini %txoption%
+	JAVA -jar %input_cache_path%\%publisher_jar% -ig ig.ini %txoption% %*
 ) ELSE If exist "..\%publisher_jar%" (
-	JAVA -jar ../%publisher_jar% -ig ig.ini %txoption%
+	JAVA -jar ..\%publisher_jar% -ig ig.ini %txoption% %*
 ) ELSE (
-	ECHO IG Publisher NOT FOUND in input-cache or parent folder... aborting
+	ECHO IG Publisher NOT FOUND in input-cache or parent folder.  Please run _updatePublisher.  Aborting...
 )
 
 PAUSE

_genonce.sh

@@ -17,13 +17,13 @@ echo "$txoption"
 
 publisher=$input_cache_path/$publisher_jar
 if test -f "$publisher"; then
-	JAVA -jar $publisher -ig ig.ini $txoption
+	JAVA -jar $publisher -ig ig.ini $txoption $*
 
 else
 	publisher=../$publisher_jar
 	if test -f "$publisher"; then
-		JAVA -jar $publisher -ig ig.ini $txoption
+		JAVA -jar $publisher -ig ig.ini $txoption $*
 	else
-		echo IG Publisher NOT FOUND in input-cache or parent folder... aborting
+		echo IG Publisher NOT FOUND in input-cache or parent folder.  Please run _updatePublisher.  Aborting...
 	fi
 fi

_updatePublisher.sh

@@ -13,7 +13,7 @@ publisher="$input_cache_dir$publisher_jar"
 if test -f "$publisher"; then
 	echo "IG Publisher FOUND in input-cache"
 	jarlocation="$publisher"
-	jarlocationname=Input Cache
+	jarlocationname="Input Cache"
 	upgrade=true
 else
 	publisher="../$publisher_jar"
@@ -21,21 +21,21 @@ else
 	if test -f "$publisher"; then
 		echo "IG Publisher FOUND in parent folder"
 		jarlocation="$publisher"
-		jarlocationname=Input Cache
+		jarlocationname="Parent Folder"
 		upgrade=true
 	else
 		echo IG Publisher NOT FOUND in input-cache or parent folder...
 		jarlocation="$input_cache_dir$publisher_jar"
-		jarlocationname=Input Cache
+		jarlocationname="Input Cache"
 		upgrade=false
 	fi
 fi
 
 if $upgrade ; then
-	message = "Overwrite $jarlocation? [Y/N] "
+	message="Overwrite $jarlocation? [Y/N] "
 else
 	echo Will place publisher jar here: $input_cache_path$publisher_jar
-	message = "Ok? [Y/N] "
+	message="Ok? [Y/N] "
 fi
 
 read -r -p $message response
@@ -45,4 +45,4 @@ if [[ "$response" =~ ^([yY])$ ]] then
 	curl $dlurl -o "$jarlocation" --create-dirs
 else
 	echo cancel...
-fi
+fi

input-cache/txcache/all-systems.cache

@@ -0,0 +1,20 @@
+-------------------------------------------------------------------------------------
+{"code" : {
+  "code" : "http://hl7.org/fhirpath/System.String"
+}, "valueSet" :{
+  "resourceType" : "ValueSet",
+  "compose" : {
+    "include" : [{
+      "system" : "http://hl7.org/fhir/data-types"
+    },
+    {
+      "system" : "http://hl7.org/fhir/resource-types"
+    }]
+  }
+}, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false"}####
+v: {
+  "display" : "",
+  "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"
+}
+-------------------------------------------------------------------------------------

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

@@ -26,7 +26,7 @@
 v: {
   "display" : "",
   "severity" : "error",
-  "error" : "Not done yet @ TAreaCodeServices.Close"
+  "error" : "Unknown code system urn:iso:std:iso:3166:-2"
 }
 -------------------------------------------------------------------------------------
 {"code" : {
@@ -39,3 +39,45 @@ v: {
   "error" : ""
 }
 -------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
+  "code" : "001"
+}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false"}####
+v: {
+  "display" : "World",
+  "severity" : null,
+  "error" : ""
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
+  "code" : "001"
+}, "valueSet" :{
+  "resourceType" : "ValueSet",
+  "compose" : {
+    "include" : [{
+      "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
+      "filter" : [{
+        "property" : "class",
+        "op" : "=",
+        "value" : "region"
+      }]
+    }]
+  }
+}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false"}####
+v: {
+  "display" : "",
+  "severity" : "error",
+  "error" : "Not done yet @ TAreaCodeServices.Close"
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
+  "code" : "001"
+}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false"}####
+v: {
+  "display" : "World",
+  "severity" : null,
+  "error" : ""
+}
+-------------------------------------------------------------------------------------

input-cache/txcache/loinc.cache

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

input-cache/txcache/version.ctl

@@ -1 +1 @@
-1.0.287
+1.0.304