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

Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core

This commit is contained in:
Grahame Grieve 2019-12-09 17:36:02 +11:00
parent ebb3170a24 a6ccb8d835
commit 250496c9b1
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -415,18 +415,18 @@ public abstract class BaseWorkerContext implements IWorkerContext {
} }
@Override @Override
public ValueSetExpansionOutcome expandVS(ConceptSetComponent inc, boolean heirachical) throws TerminologyServiceException { public ValueSetExpansionOutcome expandVS(ConceptSetComponent inc, boolean hierarchical) throws TerminologyServiceException {
ValueSet vs = new ValueSet(); ValueSet vs = new ValueSet();
vs.setCompose(new ValueSetComposeComponent()); vs.setCompose(new ValueSetComposeComponent());
vs.getCompose().getInclude().add(inc); vs.getCompose().getInclude().add(inc);
CacheToken cacheToken = txCache.generateExpandToken(vs, heirachical); CacheToken cacheToken = txCache.generateExpandToken(vs, hierarchical);
ValueSetExpansionOutcome res; ValueSetExpansionOutcome res;
res = txCache.getExpansion(cacheToken); res = txCache.getExpansion(cacheToken);
if (res != null) if (res != null)
return res; return res;
Parameters p = expParameters.copy(); Parameters p = expParameters.copy();
p.setParameter("includeDefinition", false); p.setParameter("includeDefinition", false);
p.setParameter("excludeNested", !heirachical); p.setParameter("excludeNested", !hierarchical);
if (noTerminologyServer) if (noTerminologyServer)
return new ValueSetExpansionOutcome("Error expanding ValueSet: running without terminology services", TerminologyServiceErrorClass.NOSERVICE); return new ValueSetExpansionOutcome("Error expanding ValueSet: running without terminology services", TerminologyServiceErrorClass.NOSERVICE);

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/IWorkerContext.java
View File

@ -281,7 +281,7 @@ public interface IWorkerContext {
* @return * @return
* @throws FHIRException * @throws FHIRException
*/ */
public ValueSetExpansionOutcome expandVS(ConceptSetComponent inc, boolean heirarchical) throws TerminologyServiceException; public ValueSetExpansionOutcome expandVS(ConceptSetComponent inc, boolean hierarchical) throws TerminologyServiceException;
public class ValidationResult { public class ValidationResult {
private ConceptDefinitionComponent definition; private ConceptDefinitionComponent definition;

3
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/ValidationEngine.java
View File

@ -595,8 +595,7 @@ public class ValidationEngine implements IValidatorResourceFetcher {
private Map<String, byte[]> scanDirectory(File f, boolean recursive) throws FileNotFoundException, IOException { private Map<String, byte[]> scanDirectory(File f, boolean recursive) throws FileNotFoundException, IOException {
Map<String, byte[]> res = new HashMap<>(); Map<String, byte[]> res = new HashMap<>();
for (File ff : f.listFiles()) { for (File ff : f.listFiles()) {
if (ff.isDirectory()){ if (ff.isDirectory() && recursive){
if (recursive)
res.putAll(scanDirectory(ff, true)); res.putAll(scanDirectory(ff, true));
} }
else if (!isIgnoreFile(ff)) { else if (!isIgnoreFile(ff)) {