more tx validation fixes

exec/pack/Messages.properties

@@ -77,7 +77,7 @@ Profile_VAL_MissingElement = Missing element ''{0}'' - required by fixed value a
 Profile_VAL_NotAllowed = The element {0} is present in the instance but not allowed in the applicable {1} specified in profile
 Measure_MR_M_None = No Measure is identified, so no validation can be performed against the Measure
 Measure_MR_M_NotFound = The Measure ''{0}'' could not be resolved, so no validation can be performed against the Measure
-Questionnaire_QR_Item_BadOption = The code provided {1} in the system {0}) is not in the options value set ({2}) in the questionnaire: {3}
+Questionnaire_QR_Item_BadOption = The code ''{1}'' in the system ''{0}'' is not in the options value set ({2}) specified by the questionnaire. Terminology Error: {3}
 QUESTIONNAIRE_QR_ITEM_BADOPTION_CS = The code provided {1} cannot be validated in the options value set ({2}) in the questionnaire because the system {0} could not be found
 Questionnaire_QR_Item_Coding = Error {0} validating Coding against Questionnaire Options
 Questionnaire_QR_Item_CodingNoOptions = Cannot validate Coding option because no option list is provided
@@ -159,8 +159,8 @@ Terminology_TX_Confirm_2_CC = Could not confirm that the codings provided are in
 Terminology_TX_Confirm_3_CC = Could not confirm that the codings provided are in the value set {0} and a coding is recommended to come from this value set (class = {1})
 Terminology_TX_Confirm_4a = The code provided ({2}) was not found in the value set {0}, and a code from this value set is required: {1}
 Terminology_TX_Confirm_4b = The codes provided ({2}) are not in the value set {0}, and a code from this value set is required: {1}
-Terminology_TX_Confirm_5 = Could not confirm that the codes provided are in the value set {0}, and a code should come from this value set unless it has no suitable code (the validator cannot judge what is suitable)
-Terminology_TX_Confirm_6 = Could not confirm that the codes provided are in the value set {0}, and a code is recommended to come from this value set
+Terminology_TX_Confirm_5 = The code provided ({1}) is not in the value set in the value set {0}, and a code should come from this value set unless it has no suitable code (the validator cannot judge what is suitable)
+Terminology_TX_Confirm_6 = The code provided ({1}) is not in the value set in the value set {0}, and a code is recommended to come from this value set
 Terminology_TX_Display_Wrong = Display should be ''{0}''
 Terminology_TX_Error_CodeableConcept = Error {0} validating CodeableConcept
 Terminology_TX_Error_CodeableConcept_Max = Error {0} validating CodeableConcept using maxValueSet
@@ -186,7 +186,7 @@ Terminology_TX_NoValid_7 = None of the codes provided could be validated against
 Terminology_TX_NoValid_8 = None of the codes provided are in the maximum value set {0}, and a code from this value set is required) (codes = {1})
 Terminology_TX_NoValid_9 = The code provided ({2}) could not be validated against the maximum value set {0}, (error = {1})
 Terminology_TX_System_Invalid = Invalid System URI: {0}
-Terminology_TX_System_NotKnown = Code System URI ''{0}'' could not be found so the code cannot be validated
+Terminology_TX_System_NotKnown = A definition for CodeSystem ''{0}'' could not be found, so the code cannot be validated
 TERMINOLOGY_TX_SYSTEM_NOT_USABLE = The definition for the Code System with URI ''{0}'' doesn't provide any codes so the code cannot be validated
 Terminology_TX_System_Relative = Coding.system must be an absolute reference, not a local reference
 Terminology_TX_System_Unknown = Unknown Code System ''{0}''
@@ -494,6 +494,7 @@ Unable_to_resolve_system__value_set_has_multiple_matches = Unable to resolve sys
 Unable_to_resolve_system__value_set_expansion_has_multiple_systems = Unable to resolve system - value set expansion has multiple systems
 Unable_to_resolve_system__value_set_has_no_includes_or_expansion = Unable to resolve system - value set {0} has no includes or expansion
 Unable_to_resolve_system__no_value_set = Unable to resolve system - no value set
+Unable_to_resolve_system__value_set_has_no_matches = Unable to resolve system - value set expansion has no matches for code ''{0}''
 This_base_property_must_be_an_Array_not_ = This base property must be an Array, not {0}
 documentmsg = (document)
 xml_attr_value_invalid = The XML Attribute {0} has an invalid character
@@ -683,7 +684,7 @@ RENDER_BUNDLE_DOCUMENT_CONTENT = Additional Document Content
 RENDER_BUNDLE_HEADER_DOC_ENTRY_URD = {0}. {1} ({2}/{3})
 RENDER_BUNDLE_HEADER_DOC_ENTRY_U = {0}. {1}
 RENDER_BUNDLE_HEADER_DOC_ENTRY_RD = {0}. {2}/{3}
-UNABLE_TO_CHECK_IF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_ = Unable to check whether the code is in the value set {0}
+UNABLE_TO_CHECK_IF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_ = Unable to check whether the code is in the value set {0} because the code system {1} was not found
 TERMINOLOGY_TX_SYSTEM_WRONG_HTML = The code system reference {0} is wrong - the code system reference cannot be to an HTML page. This may be the correct reference: {1}
 TERMINOLOGY_TX_SYSTEM_WRONG_BUILD = The code system reference {0} is wrong - the code system reference cannot be a reference to build.fhir.org. This may be the correct reference: {1}
 FHIRPATH_BAD_DATE = Unable to parse Date {0}
@@ -926,8 +927,8 @@ SM_DEPENDENT_PARAM_TYPE_MISMATCH_DUPLICATE = The group {0} has already been used
 CONCEPTMAP_GROUP_SOURCE_INCOMPLETE = Source Code System {0} doesn''t have all content (content = {1}), so the source codes cannot be checked
 CONCEPTMAP_GROUP_TARGET_INCOMPLETE = Target Code System {0} doesn''t have all content (content = {1}), so the target codes cannot be checked
 SD_NO_TYPE_CODE_ON_CODE = Snapshot for {1} element {0} has type.code without a value
-UNKNOWN_CODESYSTEM = A definition for CodeSystem {0} could not be found, so the code cannot be validated
-UNKNOWN_CODESYSTEM_VERSION = A definition for CodeSystem {0} version {1} could not be found, so the code cannot be validated. Valid versions: {2}          
+UNKNOWN_CODESYSTEM = A definition for CodeSystem ''{0}'' could not be found, so the code cannot be validated
+UNKNOWN_CODESYSTEM_VERSION = A definition for CodeSystem ''{0}'' version ''{1}'' could not be found, so the code cannot be validated. Valid versions: {2}          
 UNABLE_TO_INFER_CODESYSTEM = The System URI could not be determined for the code {0} in the ValueSet {1}
 VALUESET_TOO_COSTLY = The value set {0} has too many codes to display ({1})
 VALUESET_TOO_COSTLY_TIME = The value set {0} took too long to process (>{1}sec)

library/fhir/tests/fhir_tests_icao.pas

@@ -44,11 +44,11 @@ interface
 
   TFHIRICAOTests = Class (TFslTestCase)
   public
-  published
     {$IFDEF WINDOWS}
     // this is labelled as windows only in order to prevent the ci-build failing because the certificate - a real one - isn't in git (todo: sort this out)
     Procedure TestIcaoCertAu;
     {$ENDIF}
+  published
     Procedure TestIcaoCertAuBroken;
     Procedure TestIcaoCertNoStore;
   end;

library/ftx/fhir_valuesets.pas

@@ -1125,7 +1125,7 @@ function TValueSetChecker.check(path, system, version, code: String; abstractOk,
   begin
     msg := FI18n.translate('Coding_has_no_system__cannot_validate', FParams.languages, []);
     messages.add(msg);
-    op.addIssue(isError, itInvalid, path, msg, oicInvalidData);
+    op.addIssue(isWarning, itInvalid, path, msg, oicInvalidData);
     exit(bFalse);
   end;