Make tx-reg master server configurable

Author: Grahame Grieve

server/endpoint_txregistry.pas

@@ -76,7 +76,6 @@   TFHIRTxRegistryWebServer = class (TFhirWebServerEndpoint)
     FNextScan : TDateTIme;
     FScanning: boolean;
     FInfo : TServerRegistries; 
-    FAddress : String;
 
     procedure populate(json: TJsonObject; srvr: TServerInformation; ver: TServerVersionInformation);
     function status : String;
@@ -147,7 +146,7 @@ constructor TTxRegistryServerEndPoint.Create(config : TFHIRServerConfigSection;
   s : String;
 begin
   inherited Create(config, settings, nil, common, nil, i18n);
-  s := config['folder'].value;
+  s := settings.Ini.admin['tx-reg'].value;
   FAddress := s;
   if (FAddress = '') then
     FAddress := MASTER_URL;

server/tx_registry_spider.pas

@@ -45,8 +45,8 @@ interface
   server_config;
 
 const                                                        
-  //MASTER_URL = 'https://fhir.github.io/ig-registry/tx-servers.json';
-  MASTER_URL = 'file:/Users/grahamegrieve/work/ig-registry/tx-servers.json';
+  MASTER_URL = 'https://fhir.github.io/ig-registry/tx-servers.json';
+  //MASTER_URL = 'file:/Users/grahamegrieve/work/ig-registry/tx-servers.json';
   EMAIL_DAYS_LIMIT = 7;
 
 Type
@@ -123,7 +123,10 @@ constructor TTxRegistryScanner.Create(zulip: TZulipTracker; admin : TFHIRServerC
 begin
   inherited Create;
   FZulip := zulip;
-  FAddress := MASTER_URL;
+  if (admin['tx-reg'].value <> '') then
+    FAddress := admin['tx-reg'].value
+  else
+    FAddress := MASTER_URL;
   FLogFileName := FilePath(['[tmp]', 'tx-registry-spider.log']);
   FAdmin := admin;
 end;

server/zero_config.pas

@@ -247,6 +247,7 @@ procedure TConfigurationBuilder.buildConfig(fn: String; local : TCustomIniFile);
     cfg.web['telnet-password'].value := def(local.ReadString('config', 'telnet-pword', NewGuidId), cfg.web['telnet-password'].value, '');
     cfg.web['robots.txt'].value := def(local.ReadString('web', 'robots.txt', ''), cfg.web['robots.txt'].value, '');
     cfg.admin['log-folder'].value := def(local.ReadString('web', 'logFolder', ''), cfg.admin['log-folder'].value, '');
+    cfg.admin['tx-reg'].value := def(local.ReadString('web', 'tx-reg', ''), cfg.admin['tx-reg'].value, '');
     cfg.admin['email'].value := def(local.ReadString('config', 'email', ''), cfg.admin['email'].value, '[email protected]');
     cfg.admin['ownername'].value := def(local.ReadString('config', 'user', ''), cfg.admin['ownername'].value, 'Local User');
     cfg.service['max-memory'].value := def(local.ReadString('config', 'max-memory', ''), cfg.service['max-memory'].value, '0');