diff --git a/build/windows-all.bat b/build/windows-all.bat index 22f83f882..1d73e3b18 100644 --- a/build/windows-all.bat +++ b/build/windows-all.bat @@ -5,7 +5,7 @@ REM the folder must exist set FSDIR=%CD% setlocal -set "tmp=r:\fsbuild" +set "tmp=c:\temp" IF %1.==. GOTO No1 set "tmp=%1" diff --git a/build/windows-fhirserver.bat b/build/windows-fhirserver.bat index 4b3e1873e..af2079ebf 100644 --- a/build/windows-fhirserver.bat +++ b/build/windows-fhirserver.bat @@ -5,7 +5,7 @@ REM the folder must exist set FSDIR=%CD% setlocal -set "tmp=r:\fsbuild" +set "tmp=c:\temp" md exec\64 copy exec\pack\*.cfg exec\64\ @@ -19,49 +19,23 @@ set "tmp=%1" :No1 -echo ## compile packages/fhir_indy.lpk -%tmp%\tools\lazarus\lazbuild.exe packages/fhir_indy.lpk -q -q --build-all +del *.ppu /s /q +del *.o /s /q -echo ## compile packages/fhir_fsl.lpk +%tmp%\tools\lazarus\lazbuild.exe packages/fhir_indy.lpk -q -q --build-all %tmp%\tools\lazarus\lazbuild.exe packages/fhir_fsl.lpk -q -q --build-all - -echo ## compile packages/fcomp.lpk %tmp%\tools\lazarus\lazbuild.exe packages/fcomp.lpk -q -q --build-all - -echo ## compile packages/fhir.lpk %tmp%\tools\lazarus\lazbuild.exe packages/fhir.lpk -q -q --build-all - -echo ## compile packages/fhir2.lpk %tmp%\tools\lazarus\lazbuild.exe packages/fhir2.lpk -q -q --build-all - -echo ## compile packages/fhir3.lpk %tmp%\tools\lazarus\lazbuild.exe packages/fhir3.lpk -q -q --build-all - -echo ## compile packages/fhir4.lpk %tmp%\tools\lazarus\lazbuild.exe packages/fhir4.lpk -q -q --build-all - -echo ## compile packages/fhir4b.lpk %tmp%\tools\lazarus\lazbuild.exe packages/fhir4b.lpk -q -q --build-all - -echo ## compile packages/fhir5.lpk %tmp%\tools\lazarus\lazbuild.exe packages/fhir5.lpk -q -q --build-all - -echo ## compile packages/fhir_xver.lpk %tmp%\tools\lazarus\lazbuild.exe packages/fhir_xver.lpk -q -q --build-all - -echo ## compile packages/fhir_fui.lpk %tmp%\tools\lazarus\lazbuild.exe packages/fhir_fui.lpk -q -q --build-all - -echo ## compile code tools %tmp%\tools\lazarus\lazbuild.exe utilities/codescan/codescan.lpi --build-mode=win64 -q -q --build-all - -echo ## compile console %tmp%\tools\lazarus\lazbuild.exe server/fhirconsole.lpi --build-mode=win64 -q -q --build-all - -echo ## compile server %tmp%\tools\lazarus\lazbuild.exe server/fhirserver.lpr --build-mode=win64 -q -q --build-all - -echo ## compile toolkit %tmp%\tools\lazarus\lazbuild.exe toolkit2/fhirtoolkit.lpr --build-mode=win64 -q -q --build-all copy exec\64\fhirserver.exe exec\64\FHIRServer.debug.exe @@ -71,13 +45,11 @@ del exec\64\fhirconsole.exe copy exec\64\fhirtoolkit.exe exec\64\FHIRToolkit.debug.exe del exec\64\fhirtoolkit.exe -echo ## compile console -%tmp%\tools\lazarus\lazbuild.exe server/fhirconsole.lpi --build-mode=win64-release -q -q --build-all +del *.ppu /s /q +del *.o /s /q -echo ## compile server +%tmp%\tools\lazarus\lazbuild.exe server/fhirconsole.lpi --build-mode=win64-release -q -q --build-all %tmp%\tools\lazarus\lazbuild.exe server/fhirserver.lpr --build-mode=win64-release -q -q --build-all - -echo ## compile toolkit %tmp%\tools\lazarus\lazbuild.exe toolkit2/fhirtoolkit.lpr --build-mode=win64-release -q -q --build-all :: ========================================================================================= @@ -97,7 +69,7 @@ copy exec\64\*.exe "C:\Users\graha\Health Intersections Dropbox\Health Intersect copy exec\pack\fhirserver.web "C:\Users\graha\Health Intersections Dropbox\Health Intersections Team Folder\fhirserver\win64" rem } -IF EXIST exec\64\fhirserver.exe echo Sucess! +IF EXIST exec\64\fhirserver.exe echo Success! rem rem echo Failed (no server executable found) rem diff --git a/build/windows-full-release.bat b/build/windows-full-release.bat deleted file mode 100644 index ff9ca8166..000000000 --- a/build/windows-full-release.bat +++ /dev/null @@ -1,42 +0,0 @@ - -git pull - -if errorlevel 1 goto Quit - -Rem ---- initial set up ---------- - -REM user can pass in a parameter if they want the temporary scratch area to be somewhere else than c:\temp (which is a RAM drive) -REM the folder must exist - -set FSDIR=%CD% -setlocal -set "tmp=c:\temp" - -IF %2.==. GOTO No2 -set "tmp=%2" - -:No2 - -copy library\fhir-dev.inc library\fhir-status.inc - -call build\windows-libraries.bat %tmp% - -call build\windows-fhirserver.bat %tmp% - -pause - -exec\64\fhirserver.exe -tests -test-settings exec\64\fhir-tests.ini -mode brief - -if errorlevel 1 goto Quit - -pause - -copy library\fhir-prod.inc library\fhir-status.inc - -pause - -call build\windows-release %1 %tmp% - -copy library\fhir-dev.inc library\fhir-status.inc - -:Quit \ No newline at end of file diff --git a/build/windows-libraries.bat b/build/windows-libraries.bat index 19257d204..4c36cd225 100644 --- a/build/windows-libraries.bat +++ b/build/windows-libraries.bat @@ -5,7 +5,7 @@ REM the folder must exist set FSDIR=%CD% setlocal -set "tmp=r:\fsbuild" +set "tmp=c:\temp" IF %1.==. GOTO No1 set "tmp=%1" diff --git a/build/windows-release.bat b/build/windows-release.bat index 154d63b94..9e0dd21a1 100644 --- a/build/windows-release.bat +++ b/build/windows-release.bat @@ -11,11 +11,14 @@ :: user can pass in a parameter if they want the temporary scratch area to be somewhere else than r:\fsbuild (which is a RAM drive) :: the folder must exist -:: ========================================================================================= -:: parameters + +git pull + +if errorlevel 1 goto Quit + set FSDIR=%CD% setlocal -set "tmp=r:\fsbuild" +set "tmp=c:\temp" :: %1 is the version we're going to release @@ -24,12 +27,6 @@ set "tmp=%2" :No2 -@echo off - -:: ========================================================================================= -:: checks -echo ## getting ready ## - :: check a version was provided IF %1.==. GOTO NoVer GOTO OK @@ -42,34 +39,71 @@ exit /b 1 :OK -:: write version and date to source code +@echo off + +call build\windows-libraries.bat %tmp% +rem call build\windows-fhirserver.bat %tmp% + +pause + + +pause + utilities\codescan\codescan.exe -check library\version.inc -message "Not run from the right directory - run in the root directory of the repo" || goto :error del library\version.inc utilities\codescan\codescan.exe -check !library\version.inc -message "setting up the version failed" || goto :error utilities\codescan\codescan.exe -version %1 utilities\codescan\codescan.exe -check library\version.inc -message "saving the version failed" || goto :error - utilities\codescan\codescan.exe -check release-notes.md -message "Please provide some release notes" || goto :error -del exec\64\*.exe /q /s 1>nul -del install\build\*.exe 1>nul -del release-notes-old.md 1>nul - -:: ok. we're good to go... +pause utilities\codescan\codescan.exe -proj-version c:\work\fhirserver\server\fhirconsole.lpi -version %1 -debug false || goto :error utilities\codescan\codescan.exe -proj-version server\fhirserver.lpi -version %1 -debug true || goto :error utilities\codescan\codescan.exe -proj-version server\fhirserver.lpi -version %1 -debug false || goto :error utilities\codescan\codescan.exe -proj-version toolkit2\fhirtoolkit.lpi -version %1 -debug false || goto :error -call build\windows-fhirserver.bat %2 +pause + +REM OK, do the real builds +del exec\64\*.exe /q /s 1>nul +del install\build\*.exe 1>nul +del release-notes-old.md 1>nul +del *.ppu /s /q +del *.o /s /q + + +%tmp%\tools\lazarus\lazbuild.exe utilities/codescan/codescan.lpi --build-mode=win64 -q -q --build-all +%tmp%\tools\lazarus\lazbuild.exe server/fhirconsole.lpi --build-mode=win64 -q -q --build-all +%tmp%\tools\lazarus\lazbuild.exe server/fhirserver.lpr --build-mode=win64 -q -q --build-all +%tmp%\tools\lazarus\lazbuild.exe toolkit2/fhirtoolkit.lpr --build-mode=win64 -q -q --build-all + +copy exec\64\fhirserver.exe exec\64\FHIRServer.debug.exe +del exec\64\fhirserver.exe +copy exec\64\fhirconsole.exe exec\64\FHIRConsole.debug.exe +del exec\64\fhirconsole.exe +copy exec\64\fhirtoolkit.exe exec\64\FHIRToolkit.debug.exe +del exec\64\fhirtoolkit.exe + +del *.ppu /s /q +del *.o /s /q + +%tmp%\tools\lazarus\lazbuild.exe server/fhirconsole.lpi --build-mode=win64-release -q -q --build-all +%tmp%\tools\lazarus\lazbuild.exe server/fhirserver.lpr --build-mode=win64-release -q -q --build-all +%tmp%\tools\lazarus\lazbuild.exe toolkit2/fhirtoolkit.lpr --build-mode=win64-release -q -q --build-all + +pause utilities\codescan\codescan.exe -check exec\64\fhirconsole.exe -message "Building the console failed" || goto :error -utilities\codescan\codescan.exe -check exec\64\fhirserver.exe -message "Building the Debug server failed" || goto :error +utilities\codescan\codescan.exe -check exec\64\fhirserver.debug.exe -message "Building the Debug server failed" || goto :error utilities\codescan\codescan.exe -check exec\64\fhirserver.exe -message "Building the server failed" || goto :error utilities\codescan\codescan.exe -check exec\64\fhirtoolkit.exe -message "Building the toolkit failed" || goto :error -echo All compile done +pause + +exec\64\fhirserver.debug.exe -tests -test-settings exec\64\fhir-tests.ini -mode brief + +if errorlevel 1 goto Quit :: ========================================================================================= :: todo: sign the 4 binaries @@ -109,7 +143,9 @@ cd .. echo ## GitHub Release ## git commit -a -m "Release Version %1" git push +pause install\tools\gh release create v%1 "install\build\fhirserver-win64-%1.exe#Windows Server Installer" "install\build\fhirserver-win64-%1.zip#Windows Server Installer Zip" "install\build\fhirtoolkit-win64-%1.exe#Windows Toolkit Installer" -F release-notes.md +pause rename release-notes.md release-notes-old.md utilities\codescan\codescan.exe -next-version %1 @@ -130,4 +166,4 @@ pause exit /b %errorlevel% - +:Quit \ No newline at end of file diff --git a/build/windows-toolchain.bat b/build/windows-toolchain.bat index 345bfb423..07c15888a 100644 --- a/build/windows-toolchain.bat +++ b/build/windows-toolchain.bat @@ -5,7 +5,7 @@ REM the folder must exist set FSDIR=%CD% setlocal -set "tmp=r:\fsbuild" +set "tmp=c:\temp" IF %1.==. GOTO No1 set "tmp=%1" diff --git a/build/windows-update.bat b/build/windows-update.bat index 4e89b85d9..088620aec 100644 --- a/build/windows-update.bat +++ b/build/windows-update.bat @@ -5,7 +5,7 @@ REM the folder must exist set FSDIR=%CD% setlocal -set "tmp=r:\fsbuild" +set "tmp=c:\temp" IF %1.==. GOTO No1 set "tmp=%1" diff --git a/install/install-tk.iss b/install/install-tk.iss index 18e9fdfda..6acfa2b58 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.1.12 +AppVerName=FHIRToolkit v3.4.1 ; compilation control OutputDir=..\install\build -OutputBaseFilename=fhirtoolkit-win64-3.1.12 +OutputBaseFilename=fhirtoolkit-win64-3.4.1 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.1.12 +AppVersion=3.4.1 AppSupportURL=https://github.com/grahamegrieve/fhirserver AppUpdatesURL=https://github.com/grahamegrieve/fhirserver AppCopyright=Copyright (c) Health Intersections Pty Ltd 2020+ -VersionInfoVersion=3.1.12.0 +VersionInfoVersion=3.4.1.0 ; dialog support LicenseFile=..\license diff --git a/install/install.iss b/install/install.iss index 7a669dcca..5aaa09255 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.1.12 +AppVerName=FHIRServer v3.4.1 ; compilation control OutputDir=..\install\build -OutputBaseFilename=fhirserver-win64-3.1.12 +OutputBaseFilename=fhirserver-win64-3.4.1 Compression=lzma2/ultra64 ; 64 bit @@ -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.1.12 +AppVersion=3.4.1 AppSupportURL=https://github.com/grahamegrieve/fhirserver AppUpdatesURL=https://github.com/grahamegrieve/fhirserver AppCopyright=Copyright (c) Health Intersections Pty Ltd 2011+ -VersionInfoVersion=3.1.12.0 +VersionInfoVersion=3.4.1.0 ; dialog support LicenseFile=..\license diff --git a/library/fhir2/fhir2_profiles.pas b/library/fhir2/fhir2_profiles.pas index 9f6e9838e..6d7e78c54 100644 --- a/library/fhir2/fhir2_profiles.pas +++ b/library/fhir2/fhir2_profiles.pas @@ -136,7 +136,7 @@ TBaseWorkerContextR2 = class abstract (TFHIRWorkerContext) procedure seeResource(res : TFHIRResourceV); overload; override; procedure seeResource(res : TFHIRResourceProxyV); overload; override; procedure dropResource(rtype, id : string); override; - procedure LoadCodeSystem(r : TFhirResourceProxyV); override; overload; + procedure LoadCodeSystem(r : TFhirResourceProxyV); overload; override; procedure LoadCodeSystem(r : TFhirResourceProxy); overload; virtual; procedure LoadFromDefinitions(filename : string); procedure LoadFromFolder(folder : string); diff --git a/library/fhir3/fhir3_profiles.pas b/library/fhir3/fhir3_profiles.pas index 6b6003f2c..fab3ec850 100644 --- a/library/fhir3/fhir3_profiles.pas +++ b/library/fhir3/fhir3_profiles.pas @@ -136,7 +136,7 @@ TBaseWorkerContextR3 = class abstract (TFHIRWorkerContext) procedure seeResource(res : TFHIRResourceV); overload; override; procedure seeResource(res : TFHIRResourceProxyV); overload; override; procedure dropResource(rtype, id : string); override; - procedure LoadCodeSystem(r : TFhirResourceProxyV); override; overload; + procedure LoadCodeSystem(r : TFhirResourceProxyV); overload; override; procedure LoadCodeSystem(r : TFhirResourceProxy); overload; virtual; procedure LoadFromDefinitions(filename : string); procedure LoadFromFolder(folder : string); diff --git a/library/fhir4/fhir4_profiles.pas b/library/fhir4/fhir4_profiles.pas index 10f98a082..1dbd1263b 100644 --- a/library/fhir4/fhir4_profiles.pas +++ b/library/fhir4/fhir4_profiles.pas @@ -139,7 +139,7 @@ TBaseWorkerContextR4 = class abstract (TFHIRWorkerContext) procedure seeResource(res : TFHIRResourceV); overload; override; procedure seeResource(res : TFHIRResourceProxyV); overload; override; procedure dropResource(rtype, id : string); override; - procedure LoadCodeSystem(r : TFhirResourceProxyV); override; overload; + procedure LoadCodeSystem(r : TFhirResourceProxyV); overload; override; procedure LoadCodeSystem(r : TFhirResourceProxy); overload; virtual; procedure LoadFromDefinitions(filename : string); procedure LoadFromFolder(folder : string); diff --git a/library/fhir4b/fhir4b_profiles.pas b/library/fhir4b/fhir4b_profiles.pas index 5ff25986c..5485d0c6e 100644 --- a/library/fhir4b/fhir4b_profiles.pas +++ b/library/fhir4b/fhir4b_profiles.pas @@ -139,7 +139,7 @@ TBaseWorkerContextR4B = class abstract (TFHIRWorkerContext) procedure seeResource(res : TFHIRResourceV); overload; override; procedure seeResource(res : TFHIRResourceProxyV); overload; override; procedure dropResource(rtype, id : string); override; - procedure LoadCodeSystem(r : TFhirResourceProxyV); override; overload; + procedure LoadCodeSystem(r : TFhirResourceProxyV); overload; override; procedure LoadCodeSystem(r : TFhirResourceProxy); overload; virtual; procedure LoadFromDefinitions(filename : string); procedure LoadFromFolder(folder : string); diff --git a/library/fhir5/fhir5_profiles.pas b/library/fhir5/fhir5_profiles.pas index ffe2c330a..59a18f557 100644 --- a/library/fhir5/fhir5_profiles.pas +++ b/library/fhir5/fhir5_profiles.pas @@ -138,7 +138,7 @@ TBaseWorkerContextR5 = class abstract (TFHIRWorkerContext) procedure seeResource(res : TFHIRResourceV); overload; override; procedure seeResource(res : TFHIRResourceProxyV); overload; override; procedure dropResource(rtype, id : string); override; - procedure LoadCodeSystem(r : TFhirResourceProxyV); override; overload; + procedure LoadCodeSystem(r : TFhirResourceProxyV); overload; override; procedure LoadCodeSystem(r : TFhirResourceProxy); overload; virtual; procedure LoadFromDefinitions(filename : string); procedure LoadFromFolder(folder : string); diff --git a/library/fsl/fsl_base.pas b/library/fsl/fsl_base.pas index 6c4737644..6cc035663 100644 --- a/library/fsl/fsl_base.pas +++ b/library/fsl/fsl_base.pas @@ -1065,7 +1065,7 @@ constructor TFslObject.Create; {$IFOPT C+} isNil := t.firstObject = nil; if not (isNil = (t.count = 0)) then - handleObjectTrackingFail(className+': firstObject = '+BoolToStr(isNil, 'Nil', 'not nil')+' and count = '+inttostr(t.count)+' (create)'); + handleObjectTrackingFail(className+': firstObject = '+BoolToStr(isNil{$IFDEF FPC}, 'Nil', 'not nil'{$ENDIF})+' and count = '+inttostr(t.count)+' (create)'); {$ENDIF} inc(t.count); @@ -1157,7 +1157,7 @@ destructor TFslObject.Destroy; {$IFOPT C+} isNil := t.firstObject = nil; if not (isNil = (t.count = 0)) then - handleObjectTrackingFail(className+': firstObject = '+BoolToStr(isNil, 'Nil', 'not nil')+' and count = '+inttostr(t.count)+' (destroy)'); + handleObjectTrackingFail(className+': firstObject = '+BoolToStr(isNil{$IFDEF FPC}, 'Nil', 'not nil'{$ENDIF})+' and count = '+inttostr(t.count)+' (destroy)'); {$ENDIF} finally LeaveCriticalSection(GLock); diff --git a/library/fsl/fsl_logging.pas b/library/fsl/fsl_logging.pas index d04b67df6..55ad726ee 100644 --- a/library/fsl/fsl_logging.pas +++ b/library/fsl/fsl_logging.pas @@ -574,14 +574,12 @@ function OSMem : UInt64; function TLogging.InternalMem : UInt64; {$IFDEF DELPHI} var - st : TMemoryManagerUsageSummary; -{$ELSE} - //hs : TFPCHeapStatus; + st : THeapStatus; {$ENDIF} begin {$IFDEF DELPHI} - GetMemoryManagerUsageSummary(st); - result := st.AllocatedBytes + st.OverheadBytes; + st := GetHeapStatus; + result := st.TotalAllocated + st.Overhead; {$ELSE} result := TFPCMemoryManagerTracker.totalMemory; {$ENDIF} diff --git a/library/version.inc b/library/version.inc index 0c319d5f9..e8912a2f9 100644 --- a/library/version.inc +++ b/library/version.inc @@ -1,3 +1,3 @@ - FHIR_CODE_FULL_VERSION = '3.1.12'; - FHIR_CODE_RELEASE_DATE = '2024-03-09'; - FHIR_CODE_RELEASE_DATETIME = '20240309120644.755Z'; + FHIR_CODE_FULL_VERSION = '3.4.1'; + FHIR_CODE_RELEASE_DATE = '2024-03-10'; + FHIR_CODE_RELEASE_DATETIME = '20240310111623.382Z'; diff --git a/server/FHIRServer.dpr b/server/FHIRServer.dpr index 1944949df..a048f2da0 100644 --- a/server/FHIRServer.dpr +++ b/server/FHIRServer.dpr @@ -570,7 +570,8 @@ uses tx_omop in 'tx\tx_omop.pas', fhir4_ips in '..\library\fhir4\fhir4_ips.pas', fdb_fts in '..\library\fdb\fdb_fts.pas', - tests_cpt in 'tests\tests_cpt.pas'; + tests_cpt in 'tests\tests_cpt.pas', + fsl_cpu in '..\library\fsl\fsl_cpu.pas'; begin ExecuteFhirServer(TCommandLineParameters.Create); diff --git a/server/fhirconsole.lpi b/server/fhirconsole.lpi index c905b25d6..fddc8ab24 100644 --- a/server/fhirconsole.lpi +++ b/server/fhirconsole.lpi @@ -1,4 +1,3 @@ - @@ -18,8 +17,9 @@ - - + + + @@ -219,10 +219,7 @@ - + @@ -510,7 +507,7 @@ - + diff --git a/server/fhirserver.dproj b/server/fhirserver.dproj index 24a16005b..979a08035 100644 --- a/server/fhirserver.dproj +++ b/server/fhirserver.dproj @@ -1,1529 +1,1535 @@ - - - {7F316173-C96F-45F2-9CDF-8D999F4C4F82} - 19.5 - VCL - FHIRServer.dpr - True - Test - Win64 - 3 - Console - - - true - - - true - Base - true - - - true - Base - true - - - true - Base - true - - - true - Cfg_1 - true - true - - - true - Cfg_1 - true - true - - - true - Base - true - - - true - Cfg_2 - true - true - - - true - Cfg_2 - true - true - - - true - Base - true - - - true - Cfg_3 - true - true - - - true - Cfg_3 - true - true - - - $(BDS)\bin\delphi_PROJECTICON.ico - $(BDS)\bin\delphi_PROJECTICNS.icns - FHIRServer - System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace) - .\$(Platform)\$(Config) - .\$(Platform)\$(Config) - false - false - false - false - false - TESTINSIGHT;$(DCC_Define) - 3081 - 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 - 1 - 12 - false - - - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) - 1033 - esbpcs_base_db_rt_d17;esbpcs_base_rt_d17;fs17;frx17;bindcompfmx;DBXSqliteDriver;vcldbx;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;TeeDB;bindcomp;inetdb;esbpcs_xtras_db_rt_d17;vclib;inetdbbde;DBXInterBaseDriver;DataSnapClient;DataSnapCommon;DBXOdbcDriver;DataSnapServer;Tee;esbpcs_calcs_rt_d17;esbpcs_dates_rt_d17;DataSnapProviderClient;xmlrtl;svnui;ibxpress;DbxCommonDriver;DBXSybaseASEDriver;vclimg;esbpcs_stats_rt_d17;IndyProtocols;dbxcds;DBXMySQLDriver;DatasnapConnectorsFreePascal;MetropolisUILiveTile;esbpcs_calcs_db_rt_d17;esbpcs_xtras_rt_d17;vclactnband;bindengine;vcldb;soaprtl;bindcompdbx;vcldsnap;bindcompvcl;FMXTee;TeeUI;vclie;vcltouch;DBXDb2Driver;websnap;DBXOracleDriver;CustomIPTransport;vclribbon;VclSmp;dsnap;IndyIPServer;DBXInformixDriver;Intraweb;fmxase;vcl;IndyCore;DataSnapConnectors;esbpcs_stats_db_rt_d17;IndyIPCommon;CloudService;DBXMSSQLDriver;dsnapcon;DBXFirebirdDriver;FmxTeeUI;inet;fsDB17;fmxobj;frxDB17;CodeSiteExpressPkg;esbpcs_dates_db_rt_d17;vclx;frxe17;inetdbxpress;webdsnap;svn;DBXSybaseASADriver;fmxdae;bdertl;dbexpress;adortl;DataSnapIndy10ServerTransport;IndyIPClient;$(DCC_UsePackage) - ..\..\server\dependencies\Indy10\System;..\..\server\dependencies\Indy10\Core;..\..\server\dependencies\Indy10\Protocols;..\..\server\dependencies\jcl;..\..\server\dependencies\d64\debug;..\..\server\library;..\..\server\dependencies\qrcode;$(DCC_UnitSearchPath) - (None) - USE_VCL_BITMAP;$(DCC_Define) - - - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) - 1033 - bindcompfmx;DBXSqliteDriver;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;bindcomp;inetdb;DBXInterBaseDriver;DataSnapClient;DataSnapCommon;DBXOdbcDriver;DataSnapServer;DataSnapProviderClient;xmlrtl;DbxCommonDriver;DBXSybaseASEDriver;vclimg;IndyProtocols;dbxcds;DBXMySQLDriver;vclactnband;bindengine;vcldb;soaprtl;bindcompdbx;vcldsnap;bindcompvcl;vclie;vcltouch;DBXDb2Driver;websnap;DBXOracleDriver;CustomIPTransport;VclSmp;dsnap;IndyIPServer;DBXInformixDriver;fmxase;vcl;IndyCore;IndyIPCommon;DBXMSSQLDriver;dsnapcon;DBXFirebirdDriver;inet;fmxobj;vclx;inetdbxpress;webdsnap;DBXSybaseASADriver;fmxdae;dbexpress;DataSnapIndy10ServerTransport;IndyIPClient;$(DCC_UsePackage) - ..\..\server\dependencies\Indy10\System;..\..\server\dependencies\Indy10\Core;..\..\server\dependencies\Indy10\Protocols;..\..\server\dependencies\jcl;..\..\server\library;..\..\server\dependencies\Indy10\OpenSSL;..\..\server\dependencies\Indy10\OpenSSL\static;..\..\server\dependencies\Indy10;..\..\source\ZXing.Delphi\Lib\Classes\Common;..\..\source\ZXing.Delphi\Lib\Classes\1D Barcodes;..\..\source\ZXing.Delphi\Lib\Classes\2D Barcodes;..\..\source\ZXing.Delphi\Lib\Classes\Common\ReedSolomon;..\..\source\ZXing.Delphi\Lib\Classes\Common\Detector;..\..\source\ZXing.Delphi\Lib\Classes\Filtering;..\..\source\ZXing.Delphi\Lib\Classes;..\..\source\ZXing.Delphi\Lib\Classes\2D Barcodes\Decoder;..\..\source\ZXing.Delphi\Lib\Classes\2D Barcodes\Detector;$(DCC_UnitSearchPath) - (None) - USE_VCL_BITMAP;$(DCC_Define) - -cmd exec -cfg https://storage.googleapis.com/tx-fhir-org -local c:\temp\zero - - - DEBUG;$(DCC_Define) - true - false - true - true - true - 3081 - CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) - - - false - fhir.ico - -cmd exec -load -ini ..\..\server\Exec\fhir.dev.local.ini -password gg -endpoint r5 -packages hl7.fhir.r5.core - true - true - true - ..\..\server\dependencies\d32\debug;$(DCC_UnitSearchPath) - INDY_V10;$(DCC_Define) - 1033 - None - ..\..\server\tmp\units\32\ - false - CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) - ..\..\server\Exec\32\ - - - false - false - false - -cmd exec -cfg Z:\work\server\exec\fhirserver.cfg -local c:\temp\zero - ..\..\server\tmp\units\64\ - ..\..\server\exec\64 - 3 - true - off - false - 1033 - None - true - error - false - error - error - error - error - error - false - error - ..\..\server\exec\64 - ..\exec\icons\fhir-server.ico - true - true - false - 3 - 12 - none - 1 - false - - - false - RELEASE;$(DCC_Define) - 0 - 0 - - - C:\HL7Connect\indysoap\source;$(DCC_UnitSearchPath) - -debug -ini ..\..\server\Exec\fhir.local.ini -xsnomed-rf2 "C:\Data\terminologies\snomed-ct au\20130530\RF2 Release\Snapshot" -xremount -xtests -xloinc C:\Data\terminologies\FHIR.Loinc.Base\LOINCDB.MDB - None - 1033 - false - fhir.ico - - - true - 1033 - None - true - false - true - -tests -ini ..\..\server\Exec\fhir.local.ini - 1 - 3 - none - - - C:\Program Files (x86)\Embarcadero\Studio\21.0\source\DunitX;$(DCC_UnitSearchPath) - ..\..\server\exec\32\ - 1033 - - - -cmd exec -cfg https://storage.googleapis.com/tx-fhir-org -local c:\temp\zero -xtestinsight -version * - 1033 - ..\..\server\exec\64\ - ..\..\server\tmp\units\64\ - error - false - false - false - true - true - ..\exec\icons\fhir-server.ico - 1 - 3 - false - true - true - none - - - - MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ServerGUI
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Base - - - Cfg_1 - Base - - - Cfg_2 - Base - - - Cfg_3 - Base - - - - Delphi.Personality.12 - - - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 3081 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - - - - - - - - - FHIRServer.dpr - - - Embarcadero C++Builder Office 2000 Servers Package - Embarcadero C++Builder Office XP Servers Package - Microsoft Office 2000 Sample Automation Server Wrapper Components - Microsoft Office XP Sample Automation Server Wrapper Components - - - - - - - - fhirserver.exe - true - - - - - - 1 - - - 0 - - - - - classes - 64 - - - classes - 64 - - - - - res\xml - 1 - - - res\xml - 1 - - - - - library\lib\armeabi-v7a - 1 - - - - - library\lib\armeabi - 1 - - - library\lib\armeabi - 1 - - - - - library\lib\armeabi-v7a - 1 - - - - - library\lib\mips - 1 - - - library\lib\mips - 1 - - - - - library\lib\armeabi-v7a - 1 - - - library\lib\arm64-v8a - 1 - - - - - library\lib\armeabi-v7a - 1 - - - - - res\drawable - 1 - - - res\drawable - 1 - - - - - res\values - 1 - - - res\values - 1 - - - - - res\values-v21 - 1 - - - res\values-v21 - 1 - - - - - res\values - 1 - - - res\values - 1 - - - - - res\drawable - 1 - - - res\drawable - 1 - - - - - res\drawable-xxhdpi - 1 - - - res\drawable-xxhdpi - 1 - - - - - res\drawable-xxxhdpi - 1 - - - res\drawable-xxxhdpi - 1 - - - - - res\drawable-ldpi - 1 - - - res\drawable-ldpi - 1 - - - - - res\drawable-mdpi - 1 - - - res\drawable-mdpi - 1 - - - - - res\drawable-hdpi - 1 - - - res\drawable-hdpi - 1 - - - - - res\drawable-xhdpi - 1 - - - res\drawable-xhdpi - 1 - - - - - res\drawable-mdpi - 1 - - - res\drawable-mdpi - 1 - - - - - res\drawable-hdpi - 1 - - - res\drawable-hdpi - 1 - - - - - res\drawable-xhdpi - 1 - - - res\drawable-xhdpi - 1 - - - - - res\drawable-xxhdpi - 1 - - - res\drawable-xxhdpi - 1 - - - - - res\drawable-xxxhdpi - 1 - - - res\drawable-xxxhdpi - 1 - - - - - res\drawable-small - 1 - - - res\drawable-small - 1 - - - - - res\drawable-normal - 1 - - - res\drawable-normal - 1 - - - - - res\drawable-large - 1 - - - res\drawable-large - 1 - - - - - res\drawable-xlarge - 1 - - - res\drawable-xlarge - 1 - - - - - res\values - 1 - - - res\values - 1 - - - - - 1 - - - 1 - - - 0 - - - - - 1 - .framework - - - 1 - .framework - - - 1 - .framework - - - 0 - - - - - 1 - .dylib - - - 1 - .dylib - - - 1 - .dylib - - - 0 - .dll;.bpl - - - - - 1 - .dylib - - - 1 - .dylib - - - 1 - .dylib - - - 1 - .dylib - - - 1 - .dylib - - - 1 - .dylib - - - 0 - .bpl - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset - 1 - - - - - 1 - - - 1 - - - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF - 1 - - - - - - - - 1 - - - 1 - - - 1 - - - - - - - - Contents\Resources - 1 - - - Contents\Resources - 1 - - - Contents\Resources - 1 - - - - - library\lib\armeabi-v7a - 1 - - - library\lib\arm64-v8a - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 0 - - - - - library\lib\armeabi-v7a - 1 - - - - - 1 - - - 1 - - - - - Assets - 1 - - - Assets - 1 - - - - - Assets - 1 - - - Assets - 1 - - - - - - - - - - - - - - - - - True - True - - - 12 - - - - + + + {7F316173-C96F-45F2-9CDF-8D999F4C4F82} + 19.5 + VCL + FHIRServer.dpr + True + Test + Win64 + 3 + Console + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Cfg_1 + true + true + + + true + Cfg_1 + true + true + + + true + Base + true + + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + + + true + Base + true + + + true + Cfg_3 + true + true + + + true + Cfg_3 + true + true + + + $(BDS)\bin\delphi_PROJECTICON.ico + $(BDS)\bin\delphi_PROJECTICNS.icns + FHIRServer + System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace) + .\$(Platform)\$(Config) + .\$(Platform)\$(Config) + false + false + false + false + false + TESTINSIGHT;$(DCC_Define) + 3081 + 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 + 4 + 1 + false + + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + 1033 + esbpcs_base_db_rt_d17;esbpcs_base_rt_d17;fs17;frx17;bindcompfmx;DBXSqliteDriver;vcldbx;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;TeeDB;bindcomp;inetdb;esbpcs_xtras_db_rt_d17;vclib;inetdbbde;DBXInterBaseDriver;DataSnapClient;DataSnapCommon;DBXOdbcDriver;DataSnapServer;Tee;esbpcs_calcs_rt_d17;esbpcs_dates_rt_d17;DataSnapProviderClient;xmlrtl;svnui;ibxpress;DbxCommonDriver;DBXSybaseASEDriver;vclimg;esbpcs_stats_rt_d17;IndyProtocols;dbxcds;DBXMySQLDriver;DatasnapConnectorsFreePascal;MetropolisUILiveTile;esbpcs_calcs_db_rt_d17;esbpcs_xtras_rt_d17;vclactnband;bindengine;vcldb;soaprtl;bindcompdbx;vcldsnap;bindcompvcl;FMXTee;TeeUI;vclie;vcltouch;DBXDb2Driver;websnap;DBXOracleDriver;CustomIPTransport;vclribbon;VclSmp;dsnap;IndyIPServer;DBXInformixDriver;Intraweb;fmxase;vcl;IndyCore;DataSnapConnectors;esbpcs_stats_db_rt_d17;IndyIPCommon;CloudService;DBXMSSQLDriver;dsnapcon;DBXFirebirdDriver;FmxTeeUI;inet;fsDB17;fmxobj;frxDB17;CodeSiteExpressPkg;esbpcs_dates_db_rt_d17;vclx;frxe17;inetdbxpress;webdsnap;svn;DBXSybaseASADriver;fmxdae;bdertl;dbexpress;adortl;DataSnapIndy10ServerTransport;IndyIPClient;$(DCC_UsePackage) + ..\..\server\dependencies\Indy10\System;..\..\server\dependencies\Indy10\Core;..\..\server\dependencies\Indy10\Protocols;..\..\server\dependencies\jcl;..\..\server\dependencies\d64\debug;..\..\server\library;..\..\server\dependencies\qrcode;$(DCC_UnitSearchPath) + (None) + USE_VCL_BITMAP;$(DCC_Define) + + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + 1033 + bindcompfmx;DBXSqliteDriver;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;bindcomp;inetdb;DBXInterBaseDriver;DataSnapClient;DataSnapCommon;DBXOdbcDriver;DataSnapServer;DataSnapProviderClient;xmlrtl;DbxCommonDriver;DBXSybaseASEDriver;vclimg;IndyProtocols;dbxcds;DBXMySQLDriver;vclactnband;bindengine;vcldb;soaprtl;bindcompdbx;vcldsnap;bindcompvcl;vclie;vcltouch;DBXDb2Driver;websnap;DBXOracleDriver;CustomIPTransport;VclSmp;dsnap;IndyIPServer;DBXInformixDriver;fmxase;vcl;IndyCore;IndyIPCommon;DBXMSSQLDriver;dsnapcon;DBXFirebirdDriver;inet;fmxobj;vclx;inetdbxpress;webdsnap;DBXSybaseASADriver;fmxdae;dbexpress;DataSnapIndy10ServerTransport;IndyIPClient;$(DCC_UsePackage) + ..\..\server\dependencies\Indy10\System;..\..\server\dependencies\Indy10\Core;..\..\server\dependencies\Indy10\Protocols;..\..\server\dependencies\jcl;..\..\server\library;..\..\server\dependencies\Indy10\OpenSSL;..\..\server\dependencies\Indy10\OpenSSL\static;..\..\server\dependencies\Indy10;..\..\source\ZXing.Delphi\Lib\Classes\Common;..\..\source\ZXing.Delphi\Lib\Classes\1D Barcodes;..\..\source\ZXing.Delphi\Lib\Classes\2D Barcodes;..\..\source\ZXing.Delphi\Lib\Classes\Common\ReedSolomon;..\..\source\ZXing.Delphi\Lib\Classes\Common\Detector;..\..\source\ZXing.Delphi\Lib\Classes\Filtering;..\..\source\ZXing.Delphi\Lib\Classes;..\..\source\ZXing.Delphi\Lib\Classes\2D Barcodes\Decoder;..\..\source\ZXing.Delphi\Lib\Classes\2D Barcodes\Detector;$(DCC_UnitSearchPath) + (None) + USE_VCL_BITMAP;$(DCC_Define) + -cmd exec -cfg https://storage.googleapis.com/tx-fhir-org -local c:\temp\zero + + + DEBUG;$(DCC_Define) + true + false + true + true + true + 3081 + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) + + + false + fhir.ico + -cmd exec -load -ini ..\..\server\Exec\fhir.dev.local.ini -password gg -endpoint r5 -packages hl7.fhir.r5.core + true + true + true + ..\..\server\dependencies\d32\debug;$(DCC_UnitSearchPath) + INDY_V10;$(DCC_Define) + 1033 + None + ..\..\server\tmp\units\32\ + false + CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName) + ..\..\server\Exec\32\ + + + false + false + false + -cmd exec -cfg Z:\work\server\exec\fhirserver.cfg -local c:\temp\zero + ..\..\server\tmp\units\64\ + ..\..\server\exec\64 + 3 + true + off + false + 1033 + None + true + error + false + error + error + error + error + error + false + error + ..\..\server\exec\64 + ..\exec\icons\fhir-server.ico + true + true + false + 3 + 1 + none + 4 + false + + + false + RELEASE;$(DCC_Define) + 0 + 0 + + + C:\HL7Connect\indysoap\source;$(DCC_UnitSearchPath) + -debug -ini ..\..\server\Exec\fhir.local.ini -xsnomed-rf2 "C:\Data\terminologies\snomed-ct au\20130530\RF2 Release\Snapshot" -xremount -xtests -xloinc C:\Data\terminologies\FHIR.Loinc.Base\LOINCDB.MDB + None + 1033 + false + fhir.ico + + + true + 1033 + None + true + false + true + -tests -ini ..\..\server\Exec\fhir.local.ini + 1 + 3 + none + + + C:\Program Files (x86)\Embarcadero\Studio\21.0\source\DunitX;$(DCC_UnitSearchPath) + ..\..\server\exec\32\ + 1033 + + + -cmd exec -cfg https://storage.googleapis.com/tx-fhir-org -local c:\temp\zero -xtestinsight -version * + 1033 + ..\..\server\exec\64\ + ..\..\server\tmp\units\64\ + error + false + false + false + true + true + ..\exec\icons\fhir-server.ico + 1 + 3 + false + true + true + none + + + + MainSource + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ServerGUI
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Base + + + Cfg_1 + Base + + + Cfg_2 + Base + + + Cfg_3 + Base + + + + Delphi.Personality.12 + + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 3081 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + + + + + + + + + FHIRServer.dpr + + + Embarcadero C++Builder Office 2000 Servers Package + Embarcadero C++Builder Office XP Servers Package + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components + + + + + + + + fhirserver.exe + true + + + + + + 1 + + + 0 + + + + + classes + 64 + + + classes + 64 + + + + + res\xml + 1 + + + res\xml + 1 + + + + + library\lib\armeabi-v7a + 1 + + + + + library\lib\armeabi + 1 + + + library\lib\armeabi + 1 + + + + + library\lib\armeabi-v7a + 1 + + + + + library\lib\mips + 1 + + + library\lib\mips + 1 + + + + + library\lib\armeabi-v7a + 1 + + + library\lib\arm64-v8a + 1 + + + + + library\lib\armeabi-v7a + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\values + 1 + + + res\values + 1 + + + + + res\values-v21 + 1 + + + res\values-v21 + 1 + + + + + res\values + 1 + + + res\values + 1 + + + + + res\drawable + 1 + + + res\drawable + 1 + + + + + res\drawable-xxhdpi + 1 + + + res\drawable-xxhdpi + 1 + + + + + res\drawable-xxxhdpi + 1 + + + res\drawable-xxxhdpi + 1 + + + + + res\drawable-ldpi + 1 + + + res\drawable-ldpi + 1 + + + + + res\drawable-mdpi + 1 + + + res\drawable-mdpi + 1 + + + + + res\drawable-hdpi + 1 + + + res\drawable-hdpi + 1 + + + + + res\drawable-xhdpi + 1 + + + res\drawable-xhdpi + 1 + + + + + res\drawable-mdpi + 1 + + + res\drawable-mdpi + 1 + + + + + res\drawable-hdpi + 1 + + + res\drawable-hdpi + 1 + + + + + res\drawable-xhdpi + 1 + + + res\drawable-xhdpi + 1 + + + + + res\drawable-xxhdpi + 1 + + + res\drawable-xxhdpi + 1 + + + + + res\drawable-xxxhdpi + 1 + + + res\drawable-xxxhdpi + 1 + + + + + res\drawable-small + 1 + + + res\drawable-small + 1 + + + + + res\drawable-normal + 1 + + + res\drawable-normal + 1 + + + + + res\drawable-large + 1 + + + res\drawable-large + 1 + + + + + res\drawable-xlarge + 1 + + + res\drawable-xlarge + 1 + + + + + res\values + 1 + + + res\values + 1 + + + + + 1 + + + 1 + + + 0 + + + + + 1 + .framework + + + 1 + .framework + + + 1 + .framework + + + 0 + + + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 0 + .dll;.bpl + + + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 0 + .bpl + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + ..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset + 1 + + + + + 1 + + + 1 + + + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + + + + + + 1 + + + 1 + + + 1 + + + + + + + + Contents\Resources + 1 + + + Contents\Resources + 1 + + + Contents\Resources + 1 + + + + + library\lib\armeabi-v7a + 1 + + + library\lib\arm64-v8a + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 0 + + + + + library\lib\armeabi-v7a + 1 + + + + + 1 + + + 1 + + + + + Assets + 1 + + + Assets + 1 + + + + + Assets + 1 + + + Assets + 1 + + + + + + + + + + + + + + + + + True + True + + + 12 + + + + diff --git a/server/fhirserver.lpi b/server/fhirserver.lpi index 702b4e01d..e6fbc108f 100644 --- a/server/fhirserver.lpi +++ b/server/fhirserver.lpi @@ -1,4 +1,3 @@ - @@ -19,8 +18,9 @@ - - + + + @@ -1032,7 +1032,7 @@ - + diff --git a/server/kernel.pas b/server/kernel.pas index dfe231eaa..966d90d62 100644 --- a/server/kernel.pas +++ b/server/kernel.pas @@ -702,7 +702,7 @@ procedure ExecuteFhirServer(params : TCommandLineParameters; ini : TFHIRServerCo {$IFDEF DELPHI} if JclExceptionTrackingActive then - logMsg := !'Using Configuration file '+ini.FileName+' (+stack dumps)' + logMsg := 'Using Configuration file '+ini.FileName+' (+stack dumps)' else {$ENDIF} logMsg := 'Using Configuration file '+ini.FileName; diff --git a/server/tx/tx_icd11.pas b/server/tx/tx_icd11.pas index e41e2010a..b4fa9d7e9 100644 --- a/server/tx/tx_icd11.pas +++ b/server/tx/tx_icd11.pas @@ -34,7 +34,7 @@ interface uses SysUtils, Classes, Generics.Collections, - fsl_base, fsl_http, fsl_lang, fsl_utilities, + fsl_base, fsl_http, fsl_lang, fsl_utilities, fsl_i18n, fhir_objects, fhir_common, fhir_factory, fhir_features, fhir_cdshooks, ftx_service; @@ -59,7 +59,7 @@ TICD11Provider = class (TCodeSystemProvider) protected function sizeInBytesV(magic : integer) : cardinal; override; public - constructor Create(languages : TIETFLanguageDefinitions); + constructor Create(languages : TIETFLanguageDefinitions; i18n : TI18nSupport); destructor Destroy; override; function link : TICD11Provider; overload; @@ -112,9 +112,9 @@ implementation { TICD11Provider } -constructor TICD11Provider.Create(languages: TIETFLanguageDefinitions); +constructor TICD11Provider.Create(languages: TIETFLanguageDefinitions; i18n : TI18nSupport); begin - inherited Create(languages); + inherited Create(languages, i18n); end; destructor TICD11Provider.Destroy; diff --git a/server/tx_manager.pas b/server/tx_manager.pas index 71d6e17fd..fc4fdf86b 100644 --- a/server/tx_manager.pas +++ b/server/tx_manager.pas @@ -1300,7 +1300,7 @@ procedure TTerminologyServerStore.checkCSLoaded(codesystem: TFHIRCodeSystemEntry FLock.Unlock; end; if (msg <> '') then - raise ETerminologyError.create(msg); + raise ETerminologyError.create(msg, itException); end; end; 2: @@ -1310,17 +1310,17 @@ procedure TTerminologyServerStore.checkCSLoaded(codesystem: TFHIRCodeSystemEntry FLock.Lock; try case codesystem.LoadingState of - cseNotLoaded: raise ETerminologyError.create('Impossible State NotLoaded'); + cseNotLoaded: raise ETerminologyError.create('Impossible State NotLoaded', itException); cseLoading : state := 0; cseLoaded: state := 1; - cseLoadingFailed:raise ETerminologyError.create(codesystem.LoadingFailMessage); + cseLoadingFailed:raise ETerminologyError.create(codesystem.LoadingFailMessage, itException); end; finally FLock.Unlock; end; until state = 1; end; - 3: raise ETerminologyError.create(msg); + 3: raise ETerminologyError.create(msg, itException); end; end; diff --git a/toolkit2/fhirtoolkit.lpi b/toolkit2/fhirtoolkit.lpi index 2f78e9e6e..351373b53 100644 --- a/toolkit2/fhirtoolkit.lpi +++ b/toolkit2/fhirtoolkit.lpi @@ -1,4 +1,3 @@ - @@ -17,8 +16,9 @@ - - + + + @@ -232,10 +232,7 @@ - +