Performance Improvements for non-heirarchical value set expansion

Author: Grahame Grieve

library/ftx/fhir_codesystem_service.pas

@@ -197,6 +197,7 @@   TFhirCodeSystemProvider = class (TCodeSystemProvider)
   private
     FCs : TFhirCodeSystemEntry;
     FFactory : TFHIRFactory;
+    FHasHeirarchy : boolean;
 
     function LocateCode(code : String; altOpt : TAlternateCodeOptions) : TFhirCodeSystemConceptW;
     function doLocate(code : String; altOpt : TAlternateCodeOptions) : TFhirCodeSystemProviderContext; overload;
@@ -601,12 +602,20 @@ function TFHIRCodeSystemCodeEntry.hasParents: boolean;
 { TFhirCodeSystemProvider }
 
 constructor TFhirCodeSystemProvider.Create(languages: TIETFLanguageDefinitions; i18n : TI18nSupport; factory: TFHIRFactory; cs: TFhirCodeSystemEntry);
+var
+  cc : TFhirCodeSystemConceptW;
 begin
   Create(languages, i18n);
   FCs := cs;
   FFactory := factory;
   if FCs.CodeSystem.language <> '' then
     setDefLang(FLanguages.parse(FCs.CodeSystem.language));
+  for cc in FCs.CodeSystem.conceptList do
+    if cc.hasConcepts then
+    begin
+      FHasHeirarchy := true;
+      break;
+    end;
 end;
 
 procedure TFhirCodeSystemProvider.defineFeatures(opContext : TTxOperationContext; features: TFslList<TFHIRFeature>);
@@ -761,7 +770,7 @@ function TFhirCodeSystemProvider.listCodes(opContext : TTxOperationContext; ctxt
 
 function TFhirCodeSystemProvider.canParent: boolean;
 begin
-  Result := true;
+  Result := FHasHeirarchy;
 end;
 
 function TFhirCodeSystemProvider.hasAnyDisplays(langs: THTTPLanguageList): boolean;

release-notes.md

@@ -1,7 +1,7 @@
 ## Change Notes for {ver}:
 
-* 
+* Performance Improvements for non-heirarchical value set expansion
 
 ## Conformance Notes:
 
-* 
+* tx.fhir.org passed 305 HL7 terminology service tests (mode 'tx.fhir.org', tests v1.7.7-SNAPSHOT, runner v6.5.14)

server/fhirserver.lpi

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="12"/>
@@ -261,7 +262,7 @@
             <CompilerMessages>
               <IgnoredMessages idx5094="True" idx5093="True" idx5092="True" idx5091="True" idx5090="True" idx5089="True" idx5024="True"/>
             </CompilerMessages>
-            <CustomOptions Value="-dODBC -WM11.0 -XR/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"/>
+            <CustomOptions Value="-dODBC -WM10.15 -XR/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"/>
           </Other>
         </CompilerOptions>
       </Item6>
@@ -1017,7 +1018,7 @@
         <Name Value="EPackageCrawlerException"/>
       </Item50>
       <Item51>
-        <Name Value="&lt;Unknown Class&gt;"/>
+        <Name Value="&lt;Unknown Class>"/>
       </Item51>
       <Item52>
         <Name Value="EDateFormatError"/>

server/server_constants.pas

@@ -33,7 +33,7 @@
 interface
 
 const
-  TX_TESTS_VERSION = '1.7.6';
+  TX_TESTS_VERSION = '1.7.7';
 
   {$i version.inc}
   SERVER_FULL_VERSION = FHIR_CODE_FULL_VERSION;