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 new bug in package manager

This commit is contained in:
Grahame Grieve 2022-12-14 09:59:25 +11:00
parent e9d8400a78
commit 72eae55218
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/spreadsheets/StructureDefinitionSpreadsheetGenerator.java
View File

@ -77,7 +77,7 @@ public class StructureDefinitionSpreadsheetGenerator extends CanonicalSpreadshee
private List<StructureDefinitionMappingComponent> mapKeys = new ArrayList<StructureDefinitionMappingComponent>();
private static String[] titles = {
"Path", "Slice Name", "Alias(s)", "Label", "Min", "Max", "Must Support?", "Is Modifier?", "Is Summary?", "Type(s)", "Short",
"ID", "Path", "Slice Name", "Alias(s)", "Label", "Min", "Max", "Must Support?", "Is Modifier?", "Is Summary?", "Type(s)", "Short",
"Definition", "Comments", "Requirements", "Default Value", "Meaning When Missing", "Fixed Value", "Pattern", "Example",
"Minimum Value", "Maximum Value", "Maximum Length", "Binding Strength", "Binding Description", "Binding Value Set", "Code",
"Slicing Discriminator", "Slicing Description", "Slicing Ordered", "Slicing Rules", "Base Path", "Base Min", "Base Max",
@ -104,7 +104,7 @@ public class StructureDefinitionSpreadsheetGenerator extends CanonicalSpreadshee
int coffset = forMultiple ? 1 : 0;
for (int i = 0; i < titles.length; i++) {
if (forMultiple) {
addCell(headerRow, 0, "ID", styles.get("header"));
addCell(headerRow, 0, "Structure.ID", styles.get("header"));
}
addCell(headerRow, i+coffset, titles[i], styles.get("header"));
}
@ -149,7 +149,8 @@ public class StructureDefinitionSpreadsheetGenerator extends CanonicalSpreadshee
if (forMultiple) {
addCell(row, i++, sd.getId(), styles.get("body"));
}
addCell(row, i++, ed.getPath(), styles.get("body"));
addCell(row, i++, ed.getId(), styles.get("body"));
addCell(row, i++, ed.getPath());
addCell(row, i++, ed.getSliceName());
addCell(row, i++, itemList(ed.getAlias()));
addCell(row, i++, ed.getLabel());

2
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/FilesystemPackageCacheManager.java
View File

@ -444,8 +444,8 @@ public class FilesystemPackageCacheManager extends BasePackageCacheManager imple
npm.getNpm().add("version", v);
}
TextFile.stringToFile(JsonParser.compose(npm.getNpm(), true), Utilities.path(cacheFolder, id + "#" + v, "package", "package.json"), false);
pck = loadPackageInfo(packRoot);
}
pck = loadPackageInfo(packRoot);
} catch (Exception e) {
try {
// don't leave a half extracted package behind