diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImplementationGuide.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImplementationGuide.java index bbe9eab3f..24f9600e1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImplementationGuide.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImplementationGuide.java @@ -16899,6 +16899,26 @@ public class ImplementationGuide extends CanonicalResource { */ public static final ca.uhn.fhir.model.api.Include INCLUDE_RESOURCE = new ca.uhn.fhir.model.api.Include("ImplementationGuide:resource").toLocked(); + public ImplementationGuideDefinitionPageComponent getPageByName(String name) { + if (!hasDefinition() || !getDefinition().hasPage()) { + return null; + } + return getPageByName(getDefinition().getPage(), name); + } + + private ImplementationGuideDefinitionPageComponent getPageByName(ImplementationGuideDefinitionPageComponent page, String name) { + if (name.equals(page.getName())) { + return page; + } + for (ImplementationGuideDefinitionPageComponent t : page.getPage()) { + ImplementationGuideDefinitionPageComponent r = getPageByName(t, name); + if (r != null) { + return r; + } + } + return null; + } + } diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java index 905d56c25..7091cdf16 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java @@ -690,8 +690,9 @@ public class VersionUtilities { } switch (getMajMin(v)) { - case "1.0" : return "http://hl7.org/fhir/DSTU1"; - case "1.4" : return "http://hl7.org/fhir/DSTU2"; + case "0.0" : return "http://hl7.org/fhir/DSTU1"; + case "1.0" : return "http://hl7.org/fhir/DSTU2"; + case "1.4" : return "http://hl7.org/fhir/2016May"; case "3.0" : return "http://hl7.org/fhir/STU3"; case "4.0" : return "http://hl7.org/fhir/R4"; case "4.3" : return "http://hl7.org/fhir/R4B"; diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/POGenerator.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/POGenerator.java index 888fb15ee..42fc749c8 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/POGenerator.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/POGenerator.java @@ -13,9 +13,9 @@ import org.hl7.fhir.utilities.Utilities; public class POGenerator { public static void main(String[] args) throws IOException { - if (true) { - throw new Error("This needs to be rewritten for using existing .po files"); - } +// if (true) { +// throw new Error("This needs to be rewritten for using existing .po files"); +// } new POGenerator().execute(args[0], args[1], args[2], args[3], args.length == 5 ? args[4] : null); }