honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug with jurisdiction locale in validator

This commit is contained in:
Grahame Grieve 2022-11-06 10:12:36 +11:00
parent c01d434b33
commit 4b0c42c832
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/JurisdictionUtilities.java
View File

@ -11,6 +11,9 @@ public class JurisdictionUtilities {
}
public static String getJurisdictionFromLocale(String s) {
if (s == null) {
return null;
}
if (Utilities.existsInList(s.toUpperCase(),
"AD", "AE", "AF", "AG", "AI", "AL", "AM", "AO", "AQ",
"AR", "AS", "AT", "AU", "AW", "AX", "AZ", "BA", "BB",

7
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java
View File

@ -5,6 +5,7 @@ import java.net.Authenticator;
import java.net.PasswordAuthentication;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
/*
Copyright (c) 2011+, HL7, Inc.
@ -255,7 +256,11 @@ public class ValidatorCli {
if (cliContext.getSv() == null) {
cliContext.setSv(validationService.determineVersion(cliContext));
}
System.out.println(" Jurisdiction: "+JurisdictionUtilities.displayJurisdiction(cliContext.getJurisdiction()));
if (cliContext.getJurisdiction() == null) {
System.out.println(" Jurisdiction: None specified (locale = "+Locale.getDefault().getCountry()+")");
} else {
System.out.println(" Jurisdiction: "+JurisdictionUtilities.displayJurisdiction(cliContext.getJurisdiction()));
}
System.out.println("Loading");
// Comment this out because definitions filename doesn't necessarily contain version (and many not even be 14 characters long).