missed code

Author: Grahame Grieve

server/kernel.pas

@@ -876,7 +876,10 @@ procedure ExecuteFhirServerInner(params : TCommandLineParameters);
   if (params.get('cfg', fn)) then
     localConfig := TIniFile.Create(fn)
   else
+  begin
     localConfig := TIniFile.Create(localDir + 'fhirserver.ini');
+    fn := '';
+  end;
   try
     try
       initLogging(params, localConfig);
@@ -887,6 +890,8 @@ procedure ExecuteFhirServerInner(params : TCommandLineParameters);
           cfgName := loadRemoteConfig(params, localConfig.readString('config', 'zero', ''), localConfig)
         else if localConfig.valueExists('config', 'cfgFile') then
           cfgName := localConfig.ReadString('config', 'cfgFile', '')
+        else if fn.EndsWith('.cfg') then
+          cfgName := fn
         else
           cfgName := localDir + 'fhirserver.cfg';
         Logging.Log('Actual config: '+cfgName);

server/storage.pas

@@ -53,8 +53,11 @@ interface
   TOperationMode = (opmRestful, opmUpload, opmInternal, opmCmdLine, opmSweep);
   TOperationLoggingLevel = (ollNone, ollHuman, ollInstaller);
 
+  { TOperationContext }
+
   TOperationContext = class (TFslObject)
   private
+    FGroupId: String;
     FMode : TOperationMode;
     FLogging : TOperationLoggingLevel;
     FCacheResponse : boolean;
@@ -68,6 +71,7 @@   TOperationContext = class (TFslObject)
     property Logging : TOperationLoggingLevel read FLogging write FLogging;
     property CacheResponse : boolean read FCacheResponse write FCacheResponse;
     property inTransaction : boolean read FInTransaction write FInTransaction;
+    property groupId : String read FGroupId write FGroupId;
   end;
 
 const