Skip to content

Commit 7907768

Browse files
JohnMoehrkeJohnMoehrke
committed
prepare for release.
close #32
1 parent ad709c3 commit 7907768

9 files changed

+138
-12
lines changed

‎_updatePublisher.bat

+14-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ SET input_cache_path=%CD%\input-cache\
88
SET skipPrompts=false
99

1010
SET scriptdlroot=https://raw.githubusercontent.com/HL7/ig-publisher-scripts/main
11+
SET build_bat_url=%scriptdlroot%/_build.bat
12+
SET build_sh_url=%scriptdlroot%/_build.sh
1113
SET update_bat_url=%scriptdlroot%/_updatePublisher.bat
1214
SET gen_bat_url=%scriptdlroot%/_genonce.bat
1315
SET gencont_bat_url=%scriptdlroot%/_gencontinuous.bat
@@ -20,7 +22,7 @@ IF "%~1"=="/f" SET skipPrompts=y
2022

2123
ECHO.
2224
ECHO Checking internet connection...
23-
PING tx.fhir.org -4 -n 1 -w 1000 | FINDSTR TTL && GOTO isonline
25+
PING tx.fhir.org -4 -n 1 -w 4000 | FINDSTR TTL && GOTO isonline
2426
ECHO We're offline, nothing to do...
2527
GOTO end
2628

@@ -69,6 +71,7 @@ IF DEFINED FORCE (
6971
IF "%skipPrompts%"=="y" (
7072
SET create=Y
7173
) ELSE (
74+
ECHO Will place publisher jar here: %input_cache_path%%publisher_jar%
7275
SET /p create="Ok? (Y/N) "
7376
)
7477
IF /I "%create%"=="Y" (
@@ -211,6 +214,16 @@ goto end
211214
start copy /y "_updatePublisher.new.bat" "_updatePublisher.bat" ^&^& del "_updatePublisher.new.bat" ^&^& exit
212215

213216

217+
:dl_script_7
218+
ECHO Updating _build.bat
219+
call POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%build_bat_url%\",\"_build.new.bat\") } else { Invoke-WebRequest -Uri "%update_bat_url%" -Outfile "_build.new.bat" }
220+
if %ERRORLEVEL% == 0 goto upd_script_6
221+
echo "Errors encountered during download: %errorlevel%"
222+
goto end
223+
:upd_script_6
224+
start copy /y "_build.new.bat" "_build.bat" ^&^& del "_build.new.bat" ^&^& exit
225+
226+
214227
:end
215228

216229

‎_updatePublisher.sh

+13-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ gencont_bat_url=$scriptdlroot/_gencontinuous.bat
1212
gencont_sh_url=$scriptdlroot/_gencontinuous.sh
1313
gen_sh_url=$scriptdlroot/_genonce.sh
1414
update_sh_url=$scriptdlroot/_updatePublisher.sh
15+
build_sh_url=$scriptdlroot/_build.sh
16+
build_bat_url=$scriptdlroot/_build.bat
1517

1618
skipPrompts=false
1719
FORCE=false
@@ -103,6 +105,16 @@ if [[ $skipPrompts != true ]]; then
103105
if [[ $skipPrompts == true ]] || [[ $response =~ ^[yY].*$ ]]; then
104106
echo "Downloading most recent scripts "
105107

108+
curl -L $build_bat_url -o /tmp/_build.new
109+
cp /tmp/_build.new _build.bat
110+
rm /tmp/_build.new
111+
112+
113+
curl -L $build_sh_url -o /tmp/_build.new
114+
cp /tmp/_build.new _build.sh
115+
chmod +x _build.sh
116+
rm /tmp/_build.new
117+
106118
curl -L $update_bat_url -o /tmp/_updatePublisher.new
107119
cp /tmp/_updatePublisher.new _updatePublisher.bat
108120
rm /tmp/_updatePublisher.new
@@ -129,4 +141,4 @@ if [[ $skipPrompts == true ]] || [[ $response =~ ^[yY].*$ ]]; then
129141
cp /tmp/_updatePublisher.new _updatePublisher.sh
130142
chmod +x _updatePublisher.sh
131143
rm /tmp/_updatePublisher.new
132-
fi
144+
fi

‎input/ignoreWarnings.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
== Suppressed Messages ==
22

33
# The valueset import the XDS-I FormatCode from dicom the SOP id for KOS. But I get a warning from the IG build tool because DICOM does not have this code in their DCM, eventhough XDS-I indicates this is in that code system.
4-
WARNING: ValueSet/formatcode: ValueSet.compose.include[2].concept[0]: The code '1.2.840.10008.5.1.4.1.1.88.59' is not valid in the system http://dicom.nema.org/resources/ontology/DCM (Unknown code '1.2.840.10008.5.1.4.1.1.88.59' in the CodeSystem 'http://dicom.nema.org/resources/ontology/DCM' version '01')
5-
INFORMATION: ValueSet/formatcode: ValueSet.compose.include[2].concept[0]: Unknown code '1.2.840.10008.5.1.4.1.1.88.59' in the CodeSystem 'http://dicom.nema.org/resources/ontology/DCM' version '01'
6-
4+
WARNING: ValueSet/formatcode: ValueSet.compose.include[2].system: URL value 'http://dicom.nema.org/resources/ontology/DCMUID' does not resolve
5+
WARNING: ValueSet/formatcode: ValueSet.compose.include[2]: Unknown System 'http://dicom.nema.org/resources/ontology/DCMUID' specified, so Concepts and Filters can't be checked (Details: A definition for CodeSystem 'http://dicom.nema.org/resources/ontology/DCMUID' could not be found, so the code cannot be validated)
6+
WARNING: ValueSet.where(id = 'formatcode'): Error from http://tx.fhir.org/r4: Unable to provide support for code system http://dicom.nema.org/resources/ontology/DCMUID

‎input/implementationguide-IHE.FormatCode.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ ImplementationGuide for IHE Format Code vocabulary.
88
</div>
99
</text>
1010
<extension url="http://hl7.org/fhir/StructureDefinition/resource-approvalDate">
11-
<valueDate value="2024-05-23"/>
11+
<valueDate value="2025-04-28"/>
1212
</extension>
1313
<url value="https://profiles.ihe.net/fhir/ihe.formatcode.fhir/ImplementationGuide/ihe.formatcode.fhir" />
14-
<version value="1.3.1-current" />
14+
<version value="1.4.0" />
1515
<name value="IHE_FORMATCODE" />
1616
<title value="IHE FormatCode Vocabulary" />
1717
<status value="active" />

‎input/pagecontent/index.md

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ The main sections of this IG are:
1313
### Download
1414

1515
- [this entire guide](full-ig.zip)
16-
- the FormatCode CodeSystem and ValueSet in [json](definitions.json.zip), or [xml](definitions.xml.zip)
1716
- The source code for this Implementation Guide can be found on [IHE GitHub repository for FormatCode](https://github.com/IHE/FormatCode)
1817

1918
#### Cross Version Analysis

‎input/resources/Bundle-history-IHE-formatcode.codesystem.xml

+51
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,57 @@
44
<id value="history-IHE-formatcode.codesystem"/>
55
<type value="collection"/>
66
<!-- includes Provenance record for each revision of the IHE FormatCodes -->
7+
<entry>
8+
<fullUrl value="urn:oid:1.3.6.1.4.1.19376.1.2.3.1.20250428.1"/>
9+
<resource>
10+
<Provenance>
11+
<id value="formatcode-provenance-20250428"/>
12+
<target>
13+
<reference value="http://ihe.net/fhir/ihe.formatcode.fhir/CodeSystem/formatcode"/>
14+
<type value="CodeSystem"/>
15+
</target>
16+
<occurredPeriod>
17+
<end value="2025-04-28"/>
18+
</occurredPeriod>
19+
<recorded value="2025-04-28T13:00:00.0000Z"/>
20+
<reason>
21+
<coding>
22+
<system value="http://terminology.hl7.org/CodeSystem/v3-ActReason"/>
23+
<code value="METAMGT"/>
24+
</coding>
25+
<text value="Fix PaLM code values, from using a `.` to `:`."/>
26+
</reason>
27+
<activity>
28+
<coding>
29+
<system value="http://terminology.hl7.org/CodeSystem/v3-DataOperation"/>
30+
<code value="UPDATE"/>
31+
</coding>
32+
</activity>
33+
<agent>
34+
<type>
35+
<coding>
36+
<system value="http://terminology.hl7.org/CodeSystem/provenance-participant-type"/>
37+
<code value="author"/>
38+
</coding>
39+
</type>
40+
<who>
41+
<display value="John Moehrke"/>
42+
</who>
43+
</agent>
44+
<agent>
45+
<type>
46+
<coding>
47+
<system value="http://terminology.hl7.org/CodeSystem/provenance-participant-type"/>
48+
<code value="custodian"/>
49+
</coding>
50+
</type>
51+
<who>
52+
<display value="Fix PaLM code values"/>
53+
</who>
54+
</agent>
55+
</Provenance>
56+
</resource>
57+
</entry>
758
<entry xmlns="http://hl7.org/fhir">
859
<fullUrl value="urn:oid:1.3.6.1.4.1.19376.1.2.3.1.20240327.1"/>
960
<resource>

‎input/resources/Bundle-history-IHE-formatcode.valueset.xml

+51
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,57 @@
44
<id value="history-IHE-formatcode.valueset"/>
55
<type value="collection"/>
66
<!-- includes Provenance record for each revision of the IHE FormatCode ValueSet-->
7+
<entry>
8+
<fullUrl value="urn:oid:1.3.6.1.4.1.19376.1.2.3.1.20250428.2"/>
9+
<resource>
10+
<Provenance>
11+
<id value="formatcode-provenance-20250428.2"/>
12+
<target>
13+
<reference value="http://ihe.net/fhir/ihe.formatcode.fhir/ValueSet/formatcode"/>
14+
<type value="ValueSet"/>
15+
</target>
16+
<occurredPeriod>
17+
<end value="2025-04-28"/>
18+
</occurredPeriod>
19+
<recorded value="2025-04-28T13:00:00.0000Z"/>
20+
<reason>
21+
<coding>
22+
<system value="http://terminology.hl7.org/CodeSystem/v3-ActReason"/>
23+
<code value="METAMGT"/>
24+
</coding>
25+
<text value="The code `1.2.840.10008.5.1.4.1.1.88.59`, is used. but is now defined in system `http://dicom.nema.org/resources/ontology/DCMUID`, as defined in CP-2453"/>
26+
</reason>
27+
<activity>
28+
<coding>
29+
<system value="http://terminology.hl7.org/CodeSystem/v3-DataOperation"/>
30+
<code value="UPDATE"/>
31+
</coding>
32+
</activity>
33+
<agent>
34+
<type>
35+
<coding>
36+
<system value="http://terminology.hl7.org/CodeSystem/provenance-participant-type"/>
37+
<code value="author"/>
38+
</coding>
39+
</type>
40+
<who>
41+
<display value="John Moehrke"/>
42+
</who>
43+
</agent>
44+
<agent>
45+
<type>
46+
<coding>
47+
<system value="http://terminology.hl7.org/CodeSystem/provenance-participant-type"/>
48+
<code value="custodian"/>
49+
</coding>
50+
</type>
51+
<who>
52+
<display value="Fix XDS-I code values"/>
53+
</who>
54+
</agent>
55+
</Provenance>
56+
</resource>
57+
</entry>
758
<entry xmlns="http://hl7.org/fhir">
859
<fullUrl value="urn:oid:1.3.6.1.4.1.19376.1.2.3.1.20240514.1"/>
960
<resource>

‎input/resources/valueset-formatcode.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
<!-- This one concept is used as the FormatCode for XDS-I. It is the KOS document definition SOP. -->
5656
<include>
57-
<system value="http://dicom.nema.org/resources/ontology/DCM" />
57+
<system value="http://dicom.nema.org/resources/ontology/DCMUID" />
5858
<concept>
5959
<code value="1.2.840.10008.5.1.4.1.1.88.59" />
6060
<display value="Key Object Selection Document" />

‎publication-request.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"package-id" : "ihe.formatcode.fhir",
3-
"version" : "1.3.0",
4-
"path" : "https://profiles.ihe.net/fhir/ihe.formatcode.fhir/1.3.0",
3+
"version" : "1.4.0",
4+
"path" : "https://profiles.ihe.net/fhir/ihe.formatcode.fhir/1.4.0",
55
"mode" : "milestone",
66
"status" : "normative",
77
"sequence": "Publication",
8-
"desc" : "Add missing Eye Care codes and IPS code"
8+
"desc" : "Fix PaLM and XDS-I values"
99
}
1010

1111

0 commit comments

Comments
 (0)