fix bugs in processing current packages for xig

This commit is contained in:
Grahame Grieve 2023-10-16 23:08:28 +11:00
parent a31120f15f
commit fd769472fe
1 changed files with 10 additions and 2 deletions

View File

@ -155,7 +155,7 @@ public class PackageVisitor {
System.out.println("Go: "+cpidMap.size()+" current packages"); System.out.println("Go: "+cpidMap.size()+" current packages");
int i = 0; int i = 0;
for (String s : cpidMap.keySet()) { for (String s : cpidMap.keySet()) {
processCurrentPackage(s, cpidMap.get(s), cpidSet, i, cpidMap.size()); processCurrentPackage(cpidMap.get(s), s, cpidSet, i, cpidMap.size());
i++; i++;
} }
@ -266,12 +266,20 @@ public class PackageVisitor {
} }
private Map<String, String> getAllCIPackages() throws IOException { private Map<String, String> getAllCIPackages() throws IOException {
System.out.println("Fetch https://build.fhir.org/ig/qas.json");
Map<String, String> res = new HashMap<>(); Map<String, String> res = new HashMap<>();
if (current) { if (current) {
JsonArray json = (JsonArray) JsonParser.parseFromUrl("https://build.fhir.org/ig/qas.json"); JsonArray json = (JsonArray) JsonParser.parseFromUrl("https://build.fhir.org/ig/qas.json");
for (JsonObject o : json.asJsonObjects()) { for (JsonObject o : json.asJsonObjects()) {
String url = o.asString("repo"); String url = o.asString("repo");
res.put(url, o.asString("package-id")); String pid = o.asString("package-id");
if (url.contains("/branches/master") || url.contains("/branches/main") ) {
if (!res.containsKey(pid)) {
res.put(pid, url);
} else if (!url.equals(res.get(pid))) {
System.out.println("Ignore "+url+" already encountered "+pid +" @ "+res.get(pid));
}
}
} }
} }
return res; return res;