Merge branch 'HealthIntersections:master' into master

build/windows-fhirserver.bat

@@ -51,7 +51,7 @@ echo ## compile packages/fhir_xver.lpk
 echo ## compile packages/fhir_fui.lpk
 %tmp%\tools\lazarus\lazbuild.exe packages/fhir_fui.lpk -q -q
 
-echo ## compile console
+echo ## compile code tools
 %tmp%\tools\lazarus\lazbuild.exe utilities/codescan/codescan.lpi --build-mode=win64 -q -q
 
 echo ## compile console
@@ -63,4 +63,22 @@ echo ## compile server
 echo ## compile toolkit
 %tmp%\tools\lazarus\lazbuild.exe toolkit2/fhirtoolkit.lpr --build-mode=win64 -q -q
 
+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 
+
+echo ## compile console
+%tmp%\tools\lazarus\lazbuild.exe server/fhirconsole.lpi --build-mode=win64-release -q -q
+
+echo ## compile server
+%tmp%\tools\lazarus\lazbuild.exe server/fhirserver.lpr --build-mode=win64-release -q -q
+
+echo ## compile toolkit
+%tmp%\tools\lazarus\lazbuild.exe toolkit2/fhirtoolkit.lpr --build-mode=win64-release -q -q
+
+	// C:\Users\graha\Health Intersections Dropbox\Health Intersections Team Folder\executables
+
 chdir /d %FSDIR% 

exec/pack/Messages_de.properties

@@ -701,7 +701,6 @@ SD_MUST_HAVE_DERIVATION=StructureDefinition {0} muss eine Ableitung haben, da si
 VALIDATION_VAL_PROFILE_OTHER_VERSION=Profil ist f\u00fcr eine andere Version von FHIR ({0}) und wurde daher ignoriert
 VALIDATION_VAL_PROFILE_THIS_VERSION_OK=Profil f\u00fcr diese Version von FHIR - alles OK
 VALIDATION_VAL_PROFILE_THIS_VERSION_OTHER=Profil ist f\u00fcr diese Version von FHIR, aber ist ein ung\u00fcltiger Typ {0}
-BUNDLE_BUNDLE_ENTRY_MULTIPLE_PROFILES_other={0} Profile f\u00fcr {1} Ressource gefunden. Mehr als eines wird zur Zeit nicht unterst\u00fctzt. (Typ {2}: {3})
 RENDER_BUNDLE_HEADER_ROOT=Bundle {0} vom Typ {1}
 RENDER_BUNDLE_HEADER_ENTRY=Entry {0}
 RENDER_BUNDLE_HEADER_ENTRY_URL=Entry {0} - fullUrl = {1}

exec/pack/Messages_es.properties

@@ -653,10 +653,6 @@ SD_MUST_HAVE_DERIVATION = El recurso StructureDefinition {0} debe tener una deri
 VALIDATION_VAL_PROFILE_OTHER_VERSION = El perfil es para una versión diferente de FHIR ({0}) así que fue ignorado
 VALIDATION_VAL_PROFILE_THIS_VERSION_OK = El perfil es para esta versión de FHIR- Todo OK
 VALIDATION_VAL_PROFILE_THIS_VERSION_OTHER = El perfil es para esta versión de FHIR, pero es de tipo inválido {0}
-#The following error cannot occur for a single item. _one case left intentionally blank.
-BUNDLE_BUNDLE_ENTRY_MULTIPLE_PROFILES_one =
-BUNDLE_BUNDLE_ENTRY_MULTIPLE_PROFILES_many = {0} perfiles encontrados para el recurso {1}. No hay soporte para más de uno por el monmento. (Type {2}: {3})
-BUNDLE_BUNDLE_ENTRY_MULTIPLE_PROFILES_other = {0} perfiles encontrados para el recurso {1}. No hay soporte para más de uno por el monmento. (Type {2}: {3})
 RENDER_BUNDLE_HEADER_ROOT = Bundle {0} De tipo {1}
 RENDER_BUNDLE_HEADER_ENTRY = Entry {0}
 RENDER_BUNDLE_HEADER_ENTRY_URL = Entry {0} - FullURL = {1}
@@ -841,3 +837,6 @@ SD_ED_TYPE_PROFILE_WRONG_TYPE_other =
 VALUESET_SUPPLEMENT_MISSING_one = 
 VALUESET_SUPPLEMENT_MISSING_many = 
 VALUESET_SUPPLEMENT_MISSING_other =
+BUNDLE_BUNDLE_ENTRY_NOTFOUND_APPARENT_one = 
+BUNDLE_BUNDLE_ENTRY_NOTFOUND_APPARENT_many = 
+BUNDLE_BUNDLE_ENTRY_NOTFOUND_APPARENT_other =

exec/pack/Messages_nl.properties

@@ -643,9 +643,6 @@ SD_MUST_HAVE_DERIVATION = StructureDefinition {0} moet een derivation bevatten,
 VALIDATION_VAL_PROFILE_OTHER_VERSION = Profiel is voor een andere versie van FHIR ({0}) dus wordt genegeerd
 VALIDATION_VAL_PROFILE_THIS_VERSION_OK = Profiel voor deze versie van FHIR - alles in orde
 VALIDATION_VAL_PROFILE_THIS_VERSION_OTHER = Profiel is voor deze versie van FHIR, maar heeft een onjuist type {0}
-#The following error cannot occur for a single item. _one case left intentionally blank.
-BUNDLE_BUNDLE_ENTRY_MULTIPLE_PROFILES_one =
-BUNDLE_BUNDLE_ENTRY_MULTIPLE_PROFILES_other = {0} profielen gevonden voor {1} resource. Meer dan een wordt momenteel niet ondersteund. (Type {2}: {3})
 RENDER_BUNDLE_HEADER_ROOT = Bundle {0} van type {1}
 RENDER_BUNDLE_HEADER_ENTRY = Entry {0}
 RENDER_BUNDLE_HEADER_ENTRY_URL = Entry {0} - Full URL = {1}

library/fsl/fsl_base.pas

@@ -1126,7 +1126,7 @@ procedure TFslObject.AfterConstruction;
 
 procedure TFslObject.BeforeDestruction;
 Begin
-  // TODO: really should always be -1, but SysUtils.FreeAndNil may bypass the correct Free method.
+  // Really should always be -1, but SysUtils.FreeAndNil may bypass the correct Free method.
   Assert(CheckCondition(FFslObjectReferenceCount <= 0, 'BeforeDestruction', 'Attempted to destroy object before all references are released (possibly freed while cast as a TObject).'));
 
   Inherited;
@@ -1169,9 +1169,6 @@         clsName := className;
     end;
 
     Assert(Invariants('Free', TFslObject));
-
-    if ClassName = 'TFHIRServerWorkerContextR4' then
-      inc(GCounter);
 
     if ObjectCrossesThreads then
       done := (InterlockedDecrement(FFslObjectReferenceCount) < 0)
@@ -1291,8 +1288,6 @@ function TFslObject.Link: TFslObject;
 
   If Assigned(Self) Then
   Begin
-    if ClassName = 'TFHIRServerWorkerContextR4' then
-      inc(GCounter);
     Assert(Invariants('Link', TFslObject));
 
     if ObjectCrossesThreads then

library/ftx/fhir_valuesets.pas

@@ -1185,7 +1185,7 @@ function TValueSetChecker.check(path, system, version, code: String; abstractOk,
             if (displays <> nil) then
               listDisplays(displays, cs, ctxt);
           finally
-            ctxt.free;;
+            ctxt.free;
           end;
         end;
       end;
@@ -1262,7 +1262,7 @@ function TValueSetChecker.check(path, system, version, code: String; abstractOk,
             end;
             listDisplays(displays, cs, ctxt);
           finally
-            ctxt.free;;
+            ctxt.free;
           end;
         end;
       end;
@@ -1621,7 +1621,7 @@ function TValueSetChecker.check(issuePath : String; code: TFhirCodeableConceptW;
   op : TFhirOperationOutcomeW;
   log : String;
   tl : TIETFLang;
-  psys, pver, pdisp, pcode, us, baseMsg : String;
+  psys, pver, pdisp, pcode, us, baseMsg, p : String;
   dc, i : integer;
   a : TStringArray;
   unknownSystems : TStringList;
@@ -1666,7 +1666,7 @@ function TValueSetChecker.check(issuePath : String; code: TFhirCodeableConceptW;
           if (issuePath = 'CodeableConcept') then
             path := addToPath(issuePath, 'coding['+inttostr(i)+']')
           else
-            path := issuePath;;
+            path := issuePath;
           list.clear;
           v := check(path, c.systemUri, c.version, c.code, abstractOk, inferSystem, list, unknownSystems, message, ver, inactive, vstatus, cause, op, vcc, result, contentMode, impliedSystem);
           if (v <> bTrue) and (message <> '') then
@@ -1726,6 +1726,8 @@ function TValueSetChecker.check(issuePath : String; code: TFhirCodeableConceptW;
             pd := list.preferredDisplay(FParams.languages);
             if pd <> '' then
               pdisp := pd;
+            if (pdisp = '') then
+              pdisp := list.preferredDisplay;
           end
           else if (FParams.valueSetMode <> vsvmMembershipOnly) then
           begin
@@ -1810,7 +1812,7 @@ function TValueSetChecker.check(issuePath : String; code: TFhirCodeableConceptW;
                      result.addParamStr('version', prov.version(nil));
                  end;
                finally
-                 ctxt.free;;
+                 ctxt.free;
                end;
              end;
             finally
@@ -1826,7 +1828,15 @@ function TValueSetChecker.check(issuePath : String; code: TFhirCodeableConceptW;
           else
             m := FI18n.translate('None_of_the_provided_codes_are_in_the_value_set_other', FParams.languages, ['', FValueSet.vurl, codelist]);
           msg(m);
-          op.addIssue(isError, itCodeInvalid, issuePath, m);
+
+          if (issuePath <> 'CodeableConcept') then
+            p := issuePath + '.code'
+          else if code.codingCount = 1 then
+            p := issuePath + '.coding[0].code'
+          else
+            p := issuePath;
+
+          op.addIssue(isError, itCodeInvalid, p, m);
           if cause = itNull then
             cause := itUnknown;
         end;
@@ -1953,14 +1963,14 @@ function TValueSetChecker.check(issuePath, system, version, code: String; inferS
 begin
   result := ctxt <> nil;
   if result then
-    ctxt.free;;
+    ctxt.free;
 end;
 
 Function FreeAsBoolean(cs : TCodeSystemProvider; ctxt : TCodeSystemProviderFilterContext) : boolean; overload;
 begin
   result := ctxt <> nil;
   if result then
-    ctxt.free;;
+    ctxt.free;
 end;
 
 function TValueSetChecker.checkConceptSet(path : String; cs: TCodeSystemProvider; cset : TFhirValueSetComposeIncludeW; code: String; abstractOk : boolean; displays : TConceptDesignations; vs : TFHIRValueSetW; var message : String; var inactive : boolean; var vstatus : String; op : TFHIROperationOutcomeW; vcc : TFHIRCodeableConceptW): boolean;
@@ -2337,8 +2347,8 @@ function TFHIRValueSetExpander.expand(source: TFHIRValueSetW;
   if (source.url <> '') then
     dependencies.Add(source.url);
 
-  if FParams.hasLanguages then
-    result.language := FParams.Languages.prefLang;
+//  if FParams.hasLanguages then
+//    result.language := FParams.Languages.prefLang;
 
   filter := TSearchFilterText.create(textFilter);
 
@@ -3384,7 +3394,7 @@ procedure TFHIRValueSetExpander.processCodes(doDelete : boolean; cset: TFhirValu
                     end;
                   end;
                 finally
-                  ctxt.free;;
+                  ctxt.free;
                 end;
               finally
                 prep.free;

server/fhirserver.lpi

@@ -379,7 +379,7 @@
         <PackageName Value="LCL"/>
       </Item18>
     </RequiredPackages>
-    <Units Count="96">
+    <Units Count="97">
       <Unit0>
         <Filename Value="fhirserver.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -767,6 +767,10 @@
         <Filename Value="endpoint_xig.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit95>
+      <Unit96>
+        <Filename Value="web_server.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit96>
     </Units>
   </ProjectOptions>
   <CompilerOptions>

server/fhirserver.lpr

@@ -49,7 +49,7 @@
 
   kernel, server_testing, server_stats, remote_config, telnet_server, package_spider,
   tx_registry_spider, tx_omop, tx_registry_model, endpoint_txregistry,
-  endpoint_icao, tests_cpt, tx_cpt, xig_provider, endpoint_xig;
+  endpoint_icao, tests_cpt, tx_cpt, xig_provider, endpoint_xig, web_server;
 
 {$R *.res}