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 IG publication errors

This commit is contained in:
Grahame Grieve 2019-07-30 10:24:47 +10:00
parent 51ac15da5b
commit a0c245dfdc
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
View File

@ -38,6 +38,7 @@ import org.hl7.fhir.exceptions.TerminologyServiceException;
import org.hl7.fhir.r5.conformance.ProfileUtilities;
import org.hl7.fhir.r5.context.TerminologyCache.CacheToken;
import org.hl7.fhir.r5.model.BooleanType;
import org.hl7.fhir.r5.model.CapabilityStatement;
import org.hl7.fhir.r5.model.CodeSystem;
import org.hl7.fhir.r5.model.CodeSystem.CodeSystemContentMode;
import org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionComponent;
@ -95,6 +96,7 @@ public abstract class BaseWorkerContext implements IWorkerContext {
protected Map<String, StructureMap> transforms = new HashMap<String, StructureMap>();
private Map<String, StructureDefinition> structures = new HashMap<String, StructureDefinition>();
private Map<String, ImplementationGuide> guides = new HashMap<String, ImplementationGuide>();
private Map<String, CapabilityStatement> capstmts = new HashMap<String, CapabilityStatement>();
private Map<String, SearchParameter> searchParameters = new HashMap<String, SearchParameter>();
private Map<String, Questionnaire> questionnaires = new HashMap<String, Questionnaire>();
private Map<String, OperationDefinition> operations = new HashMap<String, OperationDefinition>();
@ -151,6 +153,7 @@ public abstract class BaseWorkerContext implements IWorkerContext {
operations.putAll(other.operations);
systems.addAll(other.systems);
guides.putAll(other.guides);
capstmts.putAll(other.capstmts);
allowLoadingDuplicates = other.allowLoadingDuplicates;
tsServer = other.tsServer;
@ -190,6 +193,8 @@ public abstract class BaseWorkerContext implements IWorkerContext {
seeMetadataResource((CodeSystem) m, codeSystems, false);
else if (r instanceof ImplementationGuide)
seeMetadataResource((ImplementationGuide) m, guides, false);
else if (r instanceof CapabilityStatement)
seeMetadataResource((CapabilityStatement) m, capstmts, false);
else if (r instanceof SearchParameter)
seeMetadataResource((SearchParameter) m, searchParameters, false);
else if (r instanceof PlanDefinition)
@ -697,6 +702,8 @@ public abstract class BaseWorkerContext implements IWorkerContext {
return (T) structures.get(uri);
if (guides.containsKey(uri))
return (T) guides.get(uri);
if (capstmts.containsKey(uri))
return (T) capstmts.get(uri);
if (valueSets.containsKey(uri))
return (T) valueSets.get(uri);
if (codeSystems.containsKey(uri))
@ -716,6 +723,8 @@ public abstract class BaseWorkerContext implements IWorkerContext {
return null;
} else if (class_ == ImplementationGuide.class) {
return (T) guides.get(uri);
} else if (class_ == CapabilityStatement.class) {
return (T) capstmts.get(uri);
} else if (class_ == StructureDefinition.class) {
return (T) structures.get(uri);
} else if (class_ == StructureMap.class) {
@ -896,6 +905,7 @@ public abstract class BaseWorkerContext implements IWorkerContext {
json.addProperty("transforms-count", transforms.size());
json.addProperty("structures-count", structures.size());
json.addProperty("guides-count", guides.size());
json.addProperty("statements-count", capstmts.size());
}
}
@ -919,6 +929,8 @@ public abstract class BaseWorkerContext implements IWorkerContext {
dropMetadataResource(structures, id);
else if (fhirType.equals("ImplementationGuide"))
dropMetadataResource(guides, id);
else if (fhirType.equals("CapabilityStatement"))
dropMetadataResource(capstmts, id);
else if (fhirType.equals("ValueSet"))
dropMetadataResource(valueSets, id);
else if (fhirType.equals("CodeSystem"))
@ -957,6 +969,7 @@ public abstract class BaseWorkerContext implements IWorkerContext {
List<MetadataResource> result = new ArrayList<MetadataResource>();
result.addAll(structures.values());
result.addAll(guides.values());
result.addAll(capstmts.values());
result.addAll(codeSystems.values());
result.addAll(valueSets.values());
result.addAll(maps.values());

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

@ -1097,6 +1097,8 @@ public class Utilities {
String s = p[i];
if (s.contains("[")) {
String si = s.substring(s.indexOf("[")+1, s.length()-1);
if (!Utilities.isInteger(si))
throw new FHIRException("The FHIRPath expression '"+path+"' is not valid");
s = s.substring(0, s.indexOf("["))+"["+Integer.toString(Integer.parseInt(si)+1)+"]";
}
if (i < p.length - 1 && p[i+1].startsWith(".ofType(")) {