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 bugs in package visitor for XIG

This commit is contained in:
Grahame Grieve 2023-09-18 17:06:19 +10:00
parent 0565b27f02
commit 7c655a7026
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/PackageVisitor.java
View File

@ -135,22 +135,24 @@ public class PackageVisitor {
System.out.println("Go: "+pidList.size()+" published packages"); System.out.println("Go: "+pidList.size()+" published packages");
i = 0; i = 0;
for (String pid : pidList) { for (String pid : pidList) {
if (!cpidSet.contains(pid)) { if (pid != null) {
cpidSet.add(pid); if (!cpidSet.contains(pid)) {
List<String> vList = listVersions(pid); cpidSet.add(pid);
if (oldVersions) { List<String> vList = listVersions(pid);
for (String v : vList) { if (oldVersions) {
processPackage(pid, v, i, pidList.size()); for (String v : vList) {
processPackage(pid, v, i, pidList.size());
}
} else if (vList.isEmpty()) {
System.out.println("No Packages for "+pid);
} else {
processPackage(pid, vList.get(vList.size() - 1), i, pidList.size());
} }
} else if (vList.isEmpty()) {
System.out.println("No Packages for "+pid);
} else {
processPackage(pid, vList.get(vList.size() - 1), i, pidList.size());
} }
} i++;
i++; }
} }
JsonObject json = JsonParser.parseObjectFromUrl("https://raw.githubusercontent.com/FHIR/ig-registry/master/fhir-ig-list.json"); JsonObject json = JsonParser.parseObjectFromUrl("https://raw.githubusercontent.com/FHIR/ig-registry/master/fhir-ig-list.json");
i = 0; i = 0;
List<JsonObject> objects = json.getJsonObjects("guides"); List<JsonObject> objects = json.getJsonObjects("guides");
@ -192,8 +194,8 @@ public class PackageVisitor {
long ms2 = System.currentTimeMillis(); long ms2 = System.currentTimeMillis();
if (corePackages || !corePackage(npm)) { if (corePackages || !corePackage(npm)) {
int c = 0;
if (fv != null && (versions.isEmpty() || versions.contains(fv))) { if (fv != null && (versions.isEmpty() || versions.contains(fv))) {
int c = 0;
for (String type : resourceTypes) { for (String type : resourceTypes) {
for (String s : npm.listResources(type)) { for (String s : npm.listResources(type)) {
c++; c++;
@ -205,8 +207,10 @@ public class PackageVisitor {
} }
} }
} }
} System.out.println("Processed: "+pid+"#current: "+c+" resources ("+i+" of "+t+", "+(ms2-ms1)+"/"+(System.currentTimeMillis()-ms2)+"ms)");
System.out.println("Processed: "+pid+"#current: "+c+" resources ("+i+" of "+t+", "+(ms2-ms1)+"/"+(System.currentTimeMillis()-ms2)+"ms)"); } else {
System.out.println("Ignored: "+pid+"#current: no version");
}
} }
} catch (Exception e) { } catch (Exception e) {
System.out.println("Unable to process: "+pid+"#current: "+e.getMessage()); System.out.println("Unable to process: "+pid+"#current: "+e.getMessage());
@ -262,7 +266,7 @@ public class PackageVisitor {
for (Element channel : XMLUtil.getNamedChildren(xml.getDocumentElement(), "channel")) { for (Element channel : XMLUtil.getNamedChildren(xml.getDocumentElement(), "channel")) {
for (Element item : XMLUtil.getNamedChildren(channel, "item")) { for (Element item : XMLUtil.getNamedChildren(channel, "item")) {
String pid = XMLUtil.getNamedChildText(item, "title"); String pid = XMLUtil.getNamedChildText(item, "title");
if (pid.contains("#")) { if (pid != null && pid.contains("#")) {
list.add(pid.substring(0, pid.indexOf("#"))); list.add(pid.substring(0, pid.indexOf("#")));
} }
} }