Merge pull request #166 from HealthIntersections/gg-202111-lang-valid…

…ation fix bug in language validation + delphi fixes for new release process.
HealthIntersections · Nov 14, 2021 · fed2b01 · fed2b01
2 parents 1ca6a1b + f62af6c
commit fed2b01
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/library/fhir2/fhir2_common.pas b/library/fhir2/fhir2_common.pas
@@ -1508,7 +1508,7 @@ procedure TFHIRCapabilityStatement2.software(name, version, release: String);
     statement.software := TFhirCapabilityStatementSoftware.Create;
   statement.software.name := name;
   statement.software.version := version;
-  statement.software.releaseDate := TFslDateTime.fromXml(release);
+  statement.software.releaseDate := TFslDateTime.fromHL7(release);
 end;
 
 function TFHIRCapabilityStatement2.getDescription : String;

diff --git a/library/fhir3/fhir3_common.pas b/library/fhir3/fhir3_common.pas
@@ -1618,7 +1618,7 @@ procedure TFHIRCapabilityStatement3.software(name, version, release: String);
     statement.software := TFhirCapabilityStatementSoftware.Create;
   statement.software.name := name;
   statement.software.version := version;
-  statement.software.releaseDate := TFslDateTime.fromXml(release);
+  statement.software.releaseDate := TFslDateTime.fromHL7(release);
 end;
 
 function TFHIRCapabilityStatement3.getDescription : String;

diff --git a/library/fhir4/fhir4_common.pas b/library/fhir4/fhir4_common.pas
@@ -1603,7 +1603,7 @@ procedure TFHIRCapabilityStatement4.software(name, version, release: String);
     statement.software := TFhirCapabilityStatementSoftware.Create;
   statement.software.name := name;
   statement.software.version := version;
-  statement.software.releaseDate := TFslDateTime.fromXml(release);
+  statement.software.releaseDate := TFslDateTime.fromHL7(release);
 end;
 
 function TFHIRCapabilityStatement4.getDescription : String;

diff --git a/library/fhir5/fhir5_common.pas b/library/fhir5/fhir5_common.pas
@@ -1670,7 +1670,7 @@ procedure TFHIRCapabilityStatement5.software(name, version, release: String);
     statement.software := TFhirCapabilityStatementSoftware.Create;
   statement.software.name := name;
   statement.software.version := version;
-  statement.software.releaseDate := TFslDateTime.fromXml(release);
+  statement.software.releaseDate := TFslDateTime.fromHL7(release);
 end;
 
 function TFHIRCapabilityStatement5.getDescription : String;
@@ -5964,7 +5964,7 @@ procedure TFHIRCapabilityStatement25.software(name, version, release: String);
     statement.software := TFhirCapabilityStatement2Software.Create;
   statement.software.name := name;
   statement.software.version := version;
-  statement.software.releaseDate := TFslDateTime.fromXml(release);
+  statement.software.releaseDate := TFslDateTime.fromHL7(release);
 end;
 
 function TFHIRCapabilityStatement25.getDescription : String;

diff --git a/library/fsl/fsl_utilities.pas b/library/fsl/fsl_utilities.pas
@@ -3319,7 +3319,7 @@ function DownloadsFolder: String;
     if not FolderExists(result) then
       result := FilePath([UserFolder, 'Downloads']);
     if not FolderExists(result) then
-      result := GetTempDir;
+      result := SystemTemp;
   finally
     reg.free;
   end;
@@ -3328,7 +3328,7 @@ function DownloadsFolder: String;
 begin
   result := FilePath([UserFolder, 'Downloads']);
   if not FolderExists(result) then
-    result := GetTempDir;
+    result := SystemTemp;
 end;
 {$ENDIF}
 

diff --git a/library/ftx/ftx_lang.pas b/library/ftx/ftx_lang.pas
@@ -368,7 +368,7 @@ destructor TIETFLanguageCodeConcept.Destroy;
 
 function TIETFLanguageCodeConcept.Link: TIETFLanguageCodeConcept;
 begin
-  result := TIETFLanguageCodeConcept(inherited create);
+  result := TIETFLanguageCodeConcept(inherited link);
 end;
 
 end.