From 2ab02e2e0b2dd1393aa8ed3c84bdb8b1e972ee37 Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.com>
Date: Thu, 25 Apr 2019 10:13:28 +1000
Subject: [PATCH] fix validation problem for current version

---
 .../org/hl7/fhir/utilities/cache/NpmPackage.java     | 12 ++++++------
 .../java/org/hl7/fhir/r5/validation/Validator.java   |  2 +-
 .../test/resources/validation-examples/manifest.json |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java
index e8fc923e5..bc2bf795f 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java
@@ -350,22 +350,22 @@ import com.google.gson.JsonObject;
       return content;
     }
 
-    public static NpmPackage fromFolder(String folder) throws IOException {
-      return fromFolder(folder, null);
+    public static NpmPackage fromFolder(String folder, String... exemptions) throws IOException {
+      return fromFolder(folder, null, exemptions);
     }
     
-    public static NpmPackage fromFolder(String folder, PackageType defType) throws IOException {
+    public static NpmPackage fromFolder(String folder, PackageType defType, String... exemptions) throws IOException {
       NpmPackage res = new NpmPackage(null);
-      loadFiles(res, folder, new File(folder));
+      loadFiles(res, folder, new File(folder), exemptions);
       if (!res.content.containsKey("package/package.json") && defType != null)
         res.content.put("package/package.json", TextFile.stringToBytes("{ \"type\" : \""+defType.getCode()+"\"}", false));
       res.npm = (JsonObject) new com.google.gson.JsonParser().parse(new String(res.content.get("package/package.json")));
       return res;
     }
 
-    private static void loadFiles(NpmPackage res, String base, File folder) throws FileNotFoundException, IOException {
+    private static void loadFiles(NpmPackage res, String base, File folder, String... exemptions) throws FileNotFoundException, IOException {
       for (File f : folder.listFiles()) {
-        if (!f.getName().equals(".git")) {
+        if (!f.getName().equals(".git") || !Utilities.existsInList(f.getName(), exemptions)) {
           if (f.isDirectory()) 
             loadFiles(res, base, f);
           else {
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/Validator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/Validator.java
index f074519a7..9874eb988 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/Validator.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/Validator.java
@@ -251,7 +251,7 @@ public class Validator {
         System.out.print(s.contains(" ") ? " \""+s+"\"" : " "+s);
       System.out.println();
         
-      String definitions = "hl7.fhir.core#"+Constants.VERSION;
+      String definitions = "hl7.fhir.core#current";
       String map = null;
       List<String> igs = new ArrayList<String>();
       List<String> questionnaires = new ArrayList<String>();
diff --git a/org.hl7.fhir.validation/src/test/resources/validation-examples/manifest.json b/org.hl7.fhir.validation/src/test/resources/validation-examples/manifest.json
index b869d73ae..9cf72caba 100644
--- a/org.hl7.fhir.validation/src/test/resources/validation-examples/manifest.json
+++ b/org.hl7.fhir.validation/src/test/resources/validation-examples/manifest.json
@@ -150,7 +150,7 @@
 				"errorCount": 0
       },
       "primitive-bad.xml" : {
-				"errorCount": 49
+				"errorCount": 47
       },
       "primitive-bad-empty.xml" : {
 				"errorCount": 3