honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

quick hack to pass unit test (handle files located in subdirectories of zipfile)

This commit is contained in:
Joel Schneider 2019-06-28 11:20:44 -05:00 committed by James Agnew
parent 557c9b66c2
commit 5c55133275
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcImpl.java
View File

@ -285,13 +285,13 @@ public class TerminologyLoaderSvcImpl implements IHapiTerminologyLoaderSvc {
for (FileDescriptor nextZipBytes : theDescriptors.getUncompressedFileDescriptors()) {
String nextFilename = nextZipBytes.getFilename();
if(!IMGTHLA_HLA_NOM_TXT.equals(nextFilename)
&& !IMGTHLA_HLA_XML.equals(nextFilename)) {
if(!IMGTHLA_HLA_NOM_TXT.equals(nextFilename) && !nextFilename.endsWith("/" + IMGTHLA_HLA_NOM_TXT)
&& !IMGTHLA_HLA_XML.equals(nextFilename) && !nextFilename.endsWith("/" + IMGTHLA_HLA_XML)) {
ourLog.info("Skipping unexpected file {}", nextFilename);
continue;
}
if(IMGTHLA_HLA_NOM_TXT.equals(nextFilename)) {
if(IMGTHLA_HLA_NOM_TXT.equals(nextFilename) || nextFilename.endsWith("/" + IMGTHLA_HLA_NOM_TXT)) {
// process colon-delimited hla_nom.txt file
ourLog.info("Processing file {}", nextFilename);
@ -322,7 +322,7 @@ public class TerminologyLoaderSvcImpl implements IHapiTerminologyLoaderSvc {
foundHlaNom = true;
}
if(IMGTHLA_HLA_XML.equals(nextFilename)) {
if(IMGTHLA_HLA_XML.equals(nextFilename) || nextFilename.endsWith("/" + IMGTHLA_HLA_XML)) {
// process hla.xml file
ourLog.info("Processing file {}", nextFilename);