From 3fa8b27331aac0c965da6a42ac974322bae5a239 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Sun, 28 Jan 2024 20:54:10 +1100 Subject: [PATCH 1/2] new release --- install/install-tk.iss | 8 +- install/install.iss | 10 +- library/version.inc | 4 +- server/fhirconsole.lpi | 4 +- server/fhirserver.dproj | 8 +- server/fhirserver.lpi | 6 +- testcases/config/example.cfg.txt | 374 +++++++++++++++---------------- toolkit2/fhirtoolkit.lpi | 10 +- 8 files changed, 212 insertions(+), 212 deletions(-) diff --git a/install/install-tk.iss b/install/install-tk.iss index 43c7f8b4b..0e945048b 100644 --- a/install/install-tk.iss +++ b/install/install-tk.iss @@ -3,11 +3,11 @@ ; AppID can never be changed as subsequent installations require the same installation ID each time AppID=FHIRToolkit AppName=Health Intersections FHIR Toolkit -AppVerName=FHIRToolkit v3.0.5 +AppVerName=FHIRToolkit v3.1.0 ; compilation control OutputDir=..\install\build -OutputBaseFilename=fhirtoolkit-win64-3.0.5 +OutputBaseFilename=fhirtoolkit-win64-3.1.0 Compression=lzma2/ultra64 ; 64 bit @@ -32,11 +32,11 @@ UninstallFilesDir={app}\uninstall ; win2000+ add/remove programs support AppPublisher=Health Intersections P/L AppPublisherURL=http://www.healthintersections.com.au -AppVersion=3.0.5 +AppVersion=3.1.0 AppSupportURL=https://github.com/grahamegrieve/fhirserver AppUpdatesURL=https://github.com/grahamegrieve/fhirserver AppCopyright=Copyright (c) Health Intersections Pty Ltd 2020+ -VersionInfoVersion=3.0.5.0 +VersionInfoVersion=3.1.0.0 ; dialog support LicenseFile=..\license diff --git a/install/install.iss b/install/install.iss index 52023cc71..339bbe56d 100644 --- a/install/install.iss +++ b/install/install.iss @@ -3,11 +3,11 @@ ; AppID can never be changed as subsequent installations require the same installation ID each time AppID=FHIRServer AppName=Health Intersections FHIR Server -AppVerName=FHIRServer v3.0.5 +AppVerName=FHIRServer v3.1.0 ; compilation control OutputDir=..\install\build -OutputBaseFilename=fhirserver-win64-3.0.5 +OutputBaseFilename=fhirserver-win64-3.1.0 Compression=lzma2/ultra64 ; 64 bit @@ -22,7 +22,7 @@ ChangesAssociations=yes DirExistsWarning=auto DisableStartUpPrompt=yes MinVersion=0,6.1 -UninstallDisplayIcon=..\Server\fhir.ico +UninstallDisplayIcon=..\Server\fhirserver.ico WizardStyle=modern DisableDirPage=false @@ -34,11 +34,11 @@ UninstallFilesDir={app}\uninstall ; win2000+ add/remove programs support AppPublisher=Health Intersections P/L AppPublisherURL=http://www.healthintersections.com.au -AppVersion=3.0.5 +AppVersion=3.1.0 AppSupportURL=https://github.com/grahamegrieve/fhirserver AppUpdatesURL=https://github.com/grahamegrieve/fhirserver AppCopyright=Copyright (c) Health Intersections Pty Ltd 2011+ -VersionInfoVersion=3.0.5.0 +VersionInfoVersion=3.1.0.0 ; dialog support LicenseFile=..\license diff --git a/library/version.inc b/library/version.inc index cfc3a1380..107342ebf 100644 --- a/library/version.inc +++ b/library/version.inc @@ -1,3 +1,3 @@ - FHIR_CODE_FULL_VERSION = '3.1.0'; + FHIR_CODE_FULL_VERSION = '3.1.1-SNAPSHOT'; FHIR_CODE_RELEASE_DATE = '2024-01-18'; - FHIR_CODE_RELEASE_DATETIME = '20240118202004.197Z'; + FHIR_CODE_RELEASE_DATETIME = '20240118203929.371Z'; diff --git a/server/fhirconsole.lpi b/server/fhirconsole.lpi index ac68c752f..4a86e1f21 100644 --- a/server/fhirconsole.lpi +++ b/server/fhirconsole.lpi @@ -17,8 +17,8 @@ - - + + diff --git a/server/fhirserver.dproj b/server/fhirserver.dproj index 0fdfb4968..ea68baf86 100644 --- a/server/fhirserver.dproj +++ b/server/fhirserver.dproj @@ -91,8 +91,8 @@ CompanyName=;FileVersion=2.1.3.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) true 3 - 0 - 3 + 1 + 0 false @@ -167,9 +167,9 @@ true false 3 - 3 + 0 none - 0 + 1 false diff --git a/server/fhirserver.lpi b/server/fhirserver.lpi index 8188e21e0..26bb8cfdc 100644 --- a/server/fhirserver.lpi +++ b/server/fhirserver.lpi @@ -1,4 +1,3 @@ - @@ -19,6 +18,9 @@ + + + @@ -984,7 +986,7 @@ - + diff --git a/testcases/config/example.cfg.txt b/testcases/config/example.cfg.txt index d22a9f928..9720eed40 100644 --- a/testcases/config/example.cfg.txt +++ b/testcases/config/example.cfg.txt @@ -1,187 +1,187 @@ -## FHIRServer Config File - -databases - rxn - type: mssql - server: (local) - driver: SQL Server Native Client 11.0 - database: rxnorm - dbr4 - type: mssql - when-testing: true - server: (local) - driver: SQL Server Native Client 11.0 - database: fhir4 - dbr2 - type: mssql - server: (local) - driver: SQL Server Native Client 11.0 - database: fhir2 - dbr3 - type: mssql - server: (local) - driver: SQL Server Native Client 11.0 - database: fhir3 - dbr5 - type: mssql - server: (local) - driver: SQL Server Native Client 11.0 - database: fhir5 - package-server - type: mssql - server: (local) - driver: SQL Server Native Client 11.0 - database: packageserver - -# -terminologies - s-can - type: snomed - source: C:\ProgramData\FHIRServer\snomed_20161031_ca.cache - icd10cm - type: icd10 - source: C:\ProgramData\fhirserver\icd10cm.txt - ndc - type: ndc - version: 20190317 - database: rxn - unii - type: unii - database: dbr3 - sintl2 - type: snomed - source: C:\ProgramData\FHIRServer\snomed_20200131_intl.cache - default: true - scomb - type: snomed - source: C:\ProgramData\fhirserver\snomed_20170306_combined.cache - when-testing: true - loinc - type: loinc - source: C:\ProgramData\fhirserver\loinc-2.68.cache - when-testing: true - lang - type: lang - source: C:\ProgramData\fhirserver\lang.txt - icd10 - type: icd10 - source: C:\ProgramData\fhirserver\icd10.txt - rxnorm - type: rxnorm - database: rxn - s-usa - type: snomed - source: C:\ProgramData\fhirserver\snomed_20160901_us.cache - sintl - type: snomed - source: C:\ProgramData\fhirserver\snomed_20190731_intl.cache - s-aus - type: snomed - source: C:\ProgramData\fhirserver\snomed_20161031_au.cache - icd10vn - type: icd10 - source: C:\ProgramData\fhirserver\icd10vn.txt - ucum - type: ucum - source: C:\work\fhirserver\Exec\64\ucum-essence.xml - when-testing: true - -# -endpoints - packages - type: package - path: /package - database: package-server - r4 - type: r4 - path: /r4 - mode: general - security: open - version: r4 - database: dbr4 - validate: true - when-testing: true - packages: hl7.fhir.r4.examples # 4.0.1 - r2 - type: r2 - path: /r2 - mode: general - security: certificate - version: r2 - database: dbr2 - validate: true - packages: fhir.argonaut.r2 # 1.0.0 - r3 - type: r3 - path: /r3 - mode: terminology - security: read-only - version: r3 - database: dbr3 - packages: hl7.fhir.r3.elements # 3.0.2 - -# -destinations - email - host: smtp.gmail.com - port: 587 - secure: true - username: fhir-server@healthintersections.com.au - password: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - sender: fhir-server@healthintersections.com.au - direct - host: smtp10.phimail-dev.com - port: 587 - pop-host: smtp11.phimail-dev.com - pop-port: 110 - secure: 1 - username: grahame@test.directproject.net - password: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - sender: grahame@test.directproject.net - sms - account: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - token: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - from: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - -# -identity-providers - hl7.org - app-id: HL7HealthIntersections - app-secret: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - facebook.com - app-id: 355752811191794 - app-secret: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - like: 1 - google.com - app-id: 940006310138.apps.googleusercontent.com - app-secret: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - api-key: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - -# -web - host: local.fhir.org - http: 960 - https: 961 - certname: C:\work\RDPs\certificates\new\fhir.org.crt - cacertname: C:\work\RDPs\certificates\new\fhir.org.int.crt - password: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - oauth: true - googleid: UA-88535340-3 - folder: C:\work\fhirserver\server\web - no-cert: true - package-server: dbr5 - key: C:\work\RDPs\certificates\new\fhir.org.crt - plain-mode: serve - certkey: C:\work\RDPs\certificates\new\fhir.org.key -# -admin - username: g - email: grahame@healthintersections.com.au - owner-sms: - ownername: Health Intersections - scim-salt: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - default-rights: openid,profile,user/*.* - twilio: fhir4 -# -service - run-number: 0 +## FHIRServer Config File + +databases + rxn + type: mssql + server: (local) + driver: SQL Server Native Client 11.0 + database: rxnorm + dbr4 + type: mssql + when-testing: true + server: (local) + driver: SQL Server Native Client 11.0 + database: fhir4 + dbr2 + type: mssql + server: (local) + driver: SQL Server Native Client 11.0 + database: fhir2 + dbr3 + type: mssql + server: (local) + driver: SQL Server Native Client 11.0 + database: fhir3 + dbr5 + type: mssql + server: (local) + driver: SQL Server Native Client 11.0 + database: fhir5 + package-server + type: mssql + server: (local) + driver: SQL Server Native Client 11.0 + database: packageserver + +# +terminologies + s-can + type: snomed + source: C:\ProgramData\FHIRServer\snomed_20161031_ca.cache + icd10cm + type: icd10 + source: C:\ProgramData\fhirserver\icd10cm.txt + ndc + type: ndc + version: 20190317 + database: rxn + unii + type: unii + database: dbr3 + sintl2 + type: snomed + source: C:\ProgramData\FHIRServer\snomed_20200131_intl.cache + default: true + scomb + type: snomed + source: C:\ProgramData\fhirserver\snomed_20170306_combined.cache + when-testing: true + loinc + type: loinc + source: C:\ProgramData\fhirserver\loinc-2.68.cache + when-testing: true + lang + type: lang + source: C:\ProgramData\fhirserver\lang.txt + icd10 + type: icd10 + source: C:\ProgramData\fhirserver\icd10.txt + rxnorm + type: rxnorm + database: rxn + s-usa + type: snomed + source: C:\ProgramData\fhirserver\snomed_20160901_us.cache + sintl + type: snomed + source: C:\ProgramData\fhirserver\snomed_20190731_intl.cache + s-aus + type: snomed + source: C:\ProgramData\fhirserver\snomed_20161031_au.cache + icd10vn + type: icd10 + source: C:\ProgramData\fhirserver\icd10vn.txt + ucum + type: ucum + source: C:\work\fhirserver\Exec\64\ucum-essence.xml + when-testing: true + +# +endpoints + packages + type: package + path: /package + database: package-server + r4 + type: r4 + path: /r4 + mode: general + security: open + version: r4 + database: dbr4 + validate: true + when-testing: true + packages: hl7.fhir.r4.examples # 4.0.1 + r2 + type: r2 + path: /r2 + mode: general + security: certificate + version: r2 + database: dbr2 + validate: true + packages: fhir.argonaut.r2 # 1.0.0 + r3 + type: r3 + path: /r3 + mode: terminology + security: read-only + version: r3 + database: dbr3 + packages: hl7.fhir.r3.elements # 3.0.2 + +# +destinations + email + host: smtp.gmail.com + port: 587 + secure: true + username: fhir-server@healthintersections.com.au + password: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + sender: fhir-server@healthintersections.com.au + direct + host: smtp10.phimail-dev.com + port: 587 + pop-host: smtp11.phimail-dev.com + pop-port: 110 + secure: 1 + username: grahame@test.directproject.net + password: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + sender: grahame@test.directproject.net + sms + account: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + token: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + from: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + +# +identity-providers + hl7.org + app-id: HL7HealthIntersections + app-secret: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + facebook.com + app-id: 355752811191794 + app-secret: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + like: 1 + google.com + app-id: 940006310138.apps.googleusercontent.com + app-secret: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + api-key: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + +# +web + host: local.fhir.org + http: 960 + https: 961 + certname: C:\work\RDPs\certificates\new\fhir.org.crt + cacertname: C:\work\RDPs\certificates\new\fhir.org.int.crt + password: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + oauth: true + googleid: UA-88535340-3 + folder: C:\work\fhirserver\server\web + no-cert: true + package-server: dbr5 + key: C:\work\RDPs\certificates\new\fhir.org.crt + plain-mode: serve + certkey: C:\work\RDPs\certificates\new\fhir.org.key +# +admin + username: g + email: grahame@healthintersections.com.au + owner-sms: + ownername: Health Intersections + scim-salt: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + default-rights: openid,profile,user/*.* + twilio: fhir4 +# +service + run-number: 0 diff --git a/toolkit2/fhirtoolkit.lpi b/toolkit2/fhirtoolkit.lpi index 2921d25df..4fe1476ac 100644 --- a/toolkit2/fhirtoolkit.lpi +++ b/toolkit2/fhirtoolkit.lpi @@ -1,4 +1,3 @@ - @@ -17,7 +16,9 @@ - + + + @@ -231,10 +232,7 @@ - + From 2a2e6be886642ef2a38d575621fb2168b3d8cb3c Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Sun, 28 Jan 2024 21:18:15 +1100 Subject: [PATCH 2/2] Release Version 3.1.1 --- library/version.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/version.inc b/library/version.inc index 107342ebf..1aacf1ee3 100644 --- a/library/version.inc +++ b/library/version.inc @@ -1,3 +1,3 @@ - FHIR_CODE_FULL_VERSION = '3.1.1-SNAPSHOT'; - FHIR_CODE_RELEASE_DATE = '2024-01-18'; - FHIR_CODE_RELEASE_DATETIME = '20240118203929.371Z'; + FHIR_CODE_FULL_VERSION = '3.1.1'; + FHIR_CODE_RELEASE_DATE = '2024-01-28'; + FHIR_CODE_RELEASE_DATETIME = '20240128100455.561Z';