Merge branch 'HealthIntersections-master' into linuxscripts

HealthIntersections · Jan 5, 2024 · f3ca42f · f3ca42f
2 parents 44fc581 + 2e0a5fb
commit f3ca42f
Show file tree

Hide file tree

Showing 4 changed files with 189 additions and 190 deletions.
diff --git a/library/fsl/fsl_gzip.pas b/library/fsl/fsl_gzip.pas
@@ -47,7 +47,7 @@ function gzcompress(bytes : TBytes; header : boolean; level: dword=9) : TBytes;
 
 function gzuncompress(bytes : TBytes) : TBytes;
 begin
-  result := zflate.gzuncompress(bytes);
+  result := zflate.gzuncompress(readZLibHeader(bytes));
   if length(result) = 0 then
     raise EFslException.create('Failed to read compressed content: '+zflatetranslatecode(zlasterror));
   //BytesToFile(bytes, '/Users/grahamegrieve/temp/test.tgz');

diff --git a/library/web/fsl_npm_cache.pas b/library/web/fsl_npm_cache.pas
@@ -733,7 +733,6 @@ function TFHIRPackageManager.loadArchive(content: TBytes): TDictionary<String, T
   b : TBytes;
 begin
   Logging.log('Loading Package ('+DescribeBytes(length(content))+')');
-  BytesToFile(content, '/Users/grahamegrieve/temp/package.bin');
   work(0, false, 'Loading Package ('+DescribeBytes(length(content))+')');
   try
     result := TDictionary<String, TBytes>.Create;

diff --git a/server/fhirserver.lpi b/server/fhirserver.lpi
@@ -778,7 +778,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir);../library"/>
-      <Libraries Value="/usr/local/lib64/"/>
+      <Libraries Value="/usr/local/lib64"/>
       <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;tests;admin;../library/fcomp/tests;tx"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>