Merge branch 'master' of https://github.com/costateixeira/fhirserver …

…into linuxscripts
costateixeira · Jan 6, 2024 · b57e201 · b57e201
2 parents 1ce6781 + 31c42c2
commit b57e201
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 49 deletions.
diff --git a/build/linux-fhirserver.sh b/build/linux-fhirserver.sh
diff --git a/build/windows-toolchain.bat b/build/windows-toolchain.bat
@@ -18,7 +18,7 @@ rem ---- download the installer
 
 md tools
 
-curl -L https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.2.0q/fpclazup-x86_64-win64.exe --output tools\fpclazup.exe
+curl -L https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0a/fpclazup-x86_64-win64.exe --output tools\fpclazup.exe
 curl -L https://github.com/LongDirtyAnimAlf/fpcupdeluxe/releases/download/crosslibs_v1.3/CrossLibsLinuxx64.zip --output tools\CrossLibsLinuxx64.zip
 curl -L https://github.com/LongDirtyAnimAlf/fpcupdeluxe/releases/download/wincrossbins_v1.0/WinCrossBinsLinuxx64.zip --output tools\WinCrossBinsLinuxx64.zip
 

diff --git a/ipsmanager/ipsmanager.lpr b/ipsmanager/ipsmanager.lpr
@@ -30,4 +30,3 @@
   Application.CreateForm(TIPSManagerForm, IPSManagerForm);
   Application.Run;
 end.
-
diff --git a/library/fdb/fdb_fts.pas b/library/fdb/fdb_fts.pas
@@ -161,5 +161,4 @@ function TFDBFullTextSearch.link: TFDBFullTextSearch;
   result := TFDBFullTextSearch(inherited link);
 end;
 
-end.
-
+end.
diff --git a/library/fhir4/fhir4_ips.pas b/library/fhir4/fhir4_ips.pas
@@ -1137,8 +1137,4 @@ function TIPSWrapper.saveToBytes: TBytes;
   end;
  // decode(result);
 end;
-
-
 end.
-
-
diff --git a/packages/fhir.pas b/packages/fhir.pas
@@ -38,4 +38,4 @@ procedure Register;
 
 initialization
   RegisterPackage('fhir', @Register);
-end.
+  end.
diff --git a/packages/fhir4.pas b/packages/fhir4.pas
@@ -28,4 +28,4 @@ procedure Register;
 
 initialization
   RegisterPackage('fhir4', @Register);
-end.
+end.
diff --git a/packages/fhir_fdb.pas b/packages/fhir_fdb.pas
@@ -20,5 +20,5 @@ procedure Register;
 end;
 
 initialization
-  RegisterPackage('fhir_fdb', @Register);
-end.
+   RegisterPackage('fhir_fdb', @Register);
+end.
diff --git a/server/endpoint_xig.pas b/server/endpoint_xig.pas
@@ -1551,5 +1551,4 @@ function TFHIRXIGWebServer.SecureRequest(AContext: TIdContext; ip : String; requ
   countRequest;
   result := doRequest(AContext, request, response, id, true);
 end;
-
-end.
+end.
diff --git a/server/fhirserver.lpi b/server/fhirserver.lpi
@@ -34,10 +34,10 @@
             <Filename Value="..\exec\64\fhirserver"/>
           </Target>
           <SearchPaths>
-            <IncludeFiles Value="$(ProjOutDir);..\dependencies\jcl;..\library"/>
-            <Libraries Value="..\dependencies\openssl\$(TargetOS)-$(TargetCPU)"/>
-            <OtherUnitFiles Value="..\library\fsl\tests;..\library\fhir\tests;..\library\fhir4\tests;..\library\fhir4b\tests;..\library\fhir5\tests;..\library\ftx\tests;..\library\fxver\tests;..\library\cda\tests;..\library\v2\tests;..\library\fdb\tests;modules;..\dependencies\jcl;tests;admin;..\library\fcomp\tests;tx;..\dependencies\FMM"/>
-            <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+            <IncludeFiles Value="$(ProjOutDir);../dependencies/jcl;../library"/>
+            <Libraries Value="../dependencies/openssl/$(TargetOS)-$(TargetCPU)"/>
+            <OtherUnitFiles Value="../library/fsl/tests;../library/fhir/tests;../library/fhir4/tests;../library/fhir4b/tests;../library/fhir5/tests;../library/ftx/tests;../library/fxver/tests;../library/cda/tests;../library/v2/tests;../library/fdb/tests;modules;../dependencies/jcl;tests;admin;../library/fcomp/tests;tx;../dependencies/FMM"/>
+            <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
             <SyntaxOptions>
@@ -614,11 +614,11 @@
         <IsPartOfProject Value="True"/>
       </Unit57>
       <Unit58>
-        <Filename Value="tests\tests_search_syntax.pas"/>
+        <Filename Value="tests/tests_search_syntax.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit58>
       <Unit59>
-        <Filename Value="admin\server_config.pas"/>
+        <Filename Value="admin/server_config.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit59>
       <Unit60>
@@ -662,47 +662,47 @@
         <IsPartOfProject Value="True"/>
       </Unit69>
       <Unit70>
-        <Filename Value="tx\tx_acir.pas"/>
+        <Filename Value="tx/tx_acir.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit70>
       <Unit71>
-        <Filename Value="tx\tx_areacode.pas"/>
+        <Filename Value="tx/tx_areacode.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit71>
       <Unit72>
-        <Filename Value="tx\tx_countrycode.pas"/>
+        <Filename Value="tx/tx_countrycode.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit72>
       <Unit73>
-        <Filename Value="tx\tx_hgvs.pas"/>
+        <Filename Value="tx/tx_hgvs.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit73>
       <Unit74>
-        <Filename Value="tx\tx_iso_4217.pas"/>
+        <Filename Value="tx/tx_iso_4217.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit74>
       <Unit75>
-        <Filename Value="tx\tx_mimetypes.pas"/>
+        <Filename Value="tx/tx_mimetypes.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit75>
       <Unit76>
-        <Filename Value="tx\tx_ndc.pas"/>
+        <Filename Value="tx/tx_ndc.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit76>
       <Unit77>
-        <Filename Value="tx\tx_rxnorm.pas"/>
+        <Filename Value="tx/tx_rxnorm.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit77>
       <Unit78>
-        <Filename Value="tx\tx_unii.pas"/>
+        <Filename Value="tx/tx_unii.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit78>
       <Unit79>
-        <Filename Value="tx\tx_uri.pas"/>
+        <Filename Value="tx/tx_uri.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit79>
       <Unit80>
-        <Filename Value="tx\tx_us_states.pas"/>
+        <Filename Value="tx/tx_us_states.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit80>
       <Unit81>
@@ -726,7 +726,7 @@
         <IsPartOfProject Value="True"/>
       </Unit85>
       <Unit86>
-        <Filename Value="tx\tx_omop.pas"/>
+        <Filename Value="tx/tx_omop.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit86>
       <Unit87>
@@ -750,11 +750,11 @@
         <IsPartOfProject Value="True"/>
       </Unit91>
       <Unit92>
-        <Filename Value="tx\tx_cpt.pas"/>
+        <Filename Value="tx/tx_cpt.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit92>
       <Unit93>
-        <Filename Value="tests\tests_cpt.pas"/>
+        <Filename Value="tests/tests_cpt.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit93>
       <Unit94>
@@ -773,6 +773,7 @@
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="11"/>
+    <PathDelim Value="/"/>
     <Target>
       <Filename Value="../exec/64/fhirserver"/>
     </Target>

diff --git a/server/tests/tests_cpt.pas b/server/tests/tests_cpt.pas
@@ -439,7 +439,4 @@ procedure TCPTTests.TestExpression2;
     ctxt.free;
   end;
 end;
-
-end.
-
-
+end.
diff --git a/server/tx/tx_cpt.pas b/server/tx/tx_cpt.pas
@@ -964,5 +964,4 @@ procedure TCPTServices.defineFeatures(features : TFslList<TFHIRFeature>);
 end;
 
 
-end.
-
+end.
diff --git a/server/tx/tx_omop.pas b/server/tx/tx_omop.pas
@@ -433,6 +433,4 @@ procedure TOMOPServices.defineFeatures(features: TFslList<TFHIRFeature>);
 begin
   raise ETerminologyError.Create('not done yet: defineFeatures');
 end;
-
-end.
-
+end.
diff --git a/server/tx_registry_model.pas b/server/tx_registry_model.pas
@@ -663,7 +663,4 @@ procedure TServerVersionInformation.update(source: TServerVersionInformation);
     FTerminologies.assign(source.Terminologies);
   end;
 end;
-
-
-end.
-
+end.
diff --git a/server/xig_provider.pas b/server/xig_provider.pas
@@ -230,5 +230,4 @@ function TXIGProvider.startLoad(types: TStringArray): TXigLoader;
   end;
 end;
 
-end.
-
+end.
diff --git a/utilities/codescan/codescan.lpi b/utilities/codescan/codescan.lpi
@@ -53,6 +53,9 @@
             <TargetCPU Value="x86_64"/>
             <TargetOS Value="linux"/>
           </CodeGeneration>
+          <Other>
+            <Compiler>-O2 -Xs</Compiler>
+          </Other>
         </CompilerOptions>
       </Item>
       <Item Name="osx">
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,4 +30,3 @@
		Application.CreateForm(TIPSManagerForm, IPSManagerForm);
		Application.Run;
		end.
-Original file line number
+Diff line change
@@ Expand Up / @@ -161,5 +161,4 @@ function TFDBFullTextSearch.link: TFDBFullTextSearch; @@
       result := TFDBFullTextSearch(inherited link);
     end;
-    end.
+    end.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -964,5 +964,4 @@ procedure TCPTServices.defineFeatures(features : TFslList<TFHIRFeature>);
		end;


		end.

		end.