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 in cache management

This commit is contained in:
Grahame Grieve 2019-09-06 13:47:55 +10:00
parent 50593122be
commit 9024eea94a
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/NPMPackageGenerator.java
View File

@ -100,15 +100,16 @@ public class NPMPackageGenerator {
buildPackageJson(canonical, kind, url, date, ig, fhirVersion);
}
public static NPMPackageGenerator subset(NPMPackageGenerator master, String destFile, String id, String name) throws FHIRException, IOException {
public static NPMPackageGenerator subset(NPMPackageGenerator master, String destFile, String id, String name, Date date) throws FHIRException, IOException {
JsonObject p = master.packageJ.deepCopy();
p.remove("name");
p.addProperty("name", id);
p.remove("type");
p.addProperty("type", PackageType.SUBSET.getCode());
p.remove("title");
p.addProperty("title", name);
return new NPMPackageGenerator(destFile, p);
p.addProperty("title", name);
return new NPMPackageGenerator(destFile, p, date);
}
public NPMPackageGenerator(String destFile, String canonical, String url, PackageType kind, ImplementationGuide ig, Date date, List<String> fhirVersion) throws FHIRException, IOException {
@ -119,9 +120,16 @@ public class NPMPackageGenerator {
buildPackageJson(canonical, kind, url, date, ig, fhirVersion);
}
public NPMPackageGenerator(String destFile, JsonObject npm) throws FHIRException, IOException {
public NPMPackageGenerator(String destFile, JsonObject npm, Date date) throws FHIRException, IOException {
super();
System.out.println("create package file at "+destFile);
String dt = new SimpleDateFormat("yyyyMMddHHmmss").format(date);
packageJ = npm;
packageManifest = new JsonObject();
packageManifest.addProperty("version", npm.get("version").getAsString());
packageManifest.addProperty("date", dt);
npm.addProperty("date", dt);
packageManifest.addProperty("name", npm.get("name").getAsString());
this.destFile = destFile;
start();
Gson gson = new GsonBuilder().setPrettyPrinting().create();
@ -130,7 +138,7 @@ public class NPMPackageGenerator {
addFile(Category.RESOURCE, "package.json", json.getBytes("UTF-8"));
} catch (UnsupportedEncodingException e) {
}
packageJ = npm;
}
private void buildPackageJson(String canonical, PackageType kind, String web, Date date, ImplementationGuide ig, List<String> fhirVersion) throws FHIRException, IOException {

4
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/PackageCacheManager.java vendored
View File

@ -645,8 +645,8 @@ public class PackageCacheManager {
private NpmPackage checkCurrency(String id, NpmPackage p) {
// special case: current versions roll over, and we have to check their currency
try {
String url = getPackageUrl(id);
JsonObject json = fetchJson(Utilities.pathURL(url, "package.version.json"));
String url = ciList.get(id);
JsonObject json = fetchJson(Utilities.pathURL(url, "package.manifest.json"));
String currDate = json.get("date").getAsString();
String packDate = p.date();
if (!currDate.equals(packDate))