Auto stash before merge of "master" and "origin/master"

HealthIntersections · Jan 26, 2025 · aba1f6f · aba1f6f
1 parent 5134aca
commit aba1f6f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/library/fhir/fhir_client_http.pas b/library/fhir/fhir_client_http.pas
@@ -408,8 +408,10 @@ function TFHIRHTTPCommunicator.exchangeIndy(url : String; verb : TFhirHTTPClient
 var
   comp : TFHIRParser;
   ok : boolean;
-  cnt : String;
-  op : TFHIROperationOutcomeW;
+  cnt: String;
+  sText : String;
+  ecode : integer;
+  op, olink : TFHIROperationOutcomeW;
   iss : TFhirOperationOutcomeIssueW;
 begin
   if verb in [httpPost, httpPut] then
@@ -484,6 +486,7 @@ function TFHIRHTTPCommunicator.exchangeIndy(url : String; verb : TFhirHTTPClient
         cnt := e.ErrorMessage;
         if cnt = '' then
           cnt := e.message;
+        ecode := e.ErrorCode;
         FClient.Logger.logExchange(CODES_TFhirHTTPClientHTTPVerb[verb], url, indy.ResponseText, indy.Request.RawHeaders.Text, indy.Response.RawHeaders.Text, streamToBytes(source), StringAsBytes(cnt));
         FHeaders.contentType := indy.Response.ContentType;
         FHeaders.location := indy.Response.Location;
@@ -505,7 +508,11 @@ function TFHIRHTTPCommunicator.exchangeIndy(url : String; verb : TFhirHTTPClient
               op := opWrapper.Create(comp.resource.Link);
               try
                 if (op.hasText) then
-                  Raise EFHIRClientException.Create(e.ErrorCode, op.text, op.link)
+                begin
+                  stext := op.text+' (from server '+url+')';
+                  olink  := op.link;
+                  Raise EFHIRClientException.Create(ecode, stext, olink)
+                end
                 else if (op.issueCount > 0) then
                   for iss in op.issues.forEnum do
                     Raise EFHIRClientException.Create(e.ErrorCode, iss.display, op.link)

diff --git a/server/fhirserver.lpi b/server/fhirserver.lpi
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="12"/>
@@ -19,8 +20,7 @@
       <UseVersionInfo Value="True"/>
       <MajorVersionNr Value="3"/>
       <MinorVersionNr Value="4"/>
-      <RevisionNr Value="38"/>
-      <Attributes pvaDebug="False"/>
+      <RevisionNr Value="37"/>
     </VersionInfo>
     <BuildModes Count="8">
       <Item1 Name="default" Default="True"/>
@@ -1017,7 +1017,7 @@
         <Name Value="EPackageCrawlerException"/>
       </Item50>
       <Item51>
-        <Name Value="&lt;Unknown Class&gt;"/>
+        <Name Value="&lt;Unknown Class>"/>
       </Item51>
       <Item52>
         <Name Value="EDateFormatError"/>