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 github.com:hapifhir/org.hl7.fhir.core

This commit is contained in:
jamesagnew 2019-11-12 16:12:16 -05:00
parent 15c4118d34 3de429ae6a
commit 5432ad809f
6 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/importers/Mimic14Importer.java
View File

@ -80,6 +80,7 @@ import org.hl7.fhir.dstu3.model.Reference;
import org.hl7.fhir.dstu3.model.Type; import org.hl7.fhir.dstu3.model.Type;
import org.hl7.fhir.utilities.CSVReader; import org.hl7.fhir.utilities.CSVReader;
import org.hl7.fhir.utilities.IniFile; import org.hl7.fhir.utilities.IniFile;
import org.hl7.fhir.utilities.TextFile;
import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.Utilities;
public class Mimic14Importer { public class Mimic14Importer {
@ -561,7 +562,7 @@ public class Mimic14Importer {
} else { } else {
throw new FHIRException("Unhandled Note type '"+cat+"'/'"+desc+"'"); throw new FHIRException("Unhandled Note type '"+cat+"'/'"+desc+"'");
} }
dr.addContent().getAttachment().setContentType("text/plain; charset=UTF-8").setData(csv.cell("text").getBytes(Charset.forName("UTF-8"))); dr.addContent().getAttachment().setContentType("text/plain; charset=UTF-8").setData(TextFile.stringToBytes(csv.cell("text"), false));
bnd.addEntry().setResource(dr); bnd.addEntry().setResource(dr);
} }
System.out.println(Integer.toString(t)+" found"); System.out.println(Integer.toString(t)+" found");

3
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/importers/Mimic14Importer.java
View File

@ -76,6 +76,7 @@ import org.hl7.fhir.r4.model.Reference;
import org.hl7.fhir.r4.model.Type; import org.hl7.fhir.r4.model.Type;
import org.hl7.fhir.utilities.CSVReader; import org.hl7.fhir.utilities.CSVReader;
import org.hl7.fhir.utilities.IniFile; import org.hl7.fhir.utilities.IniFile;
import org.hl7.fhir.utilities.TextFile;
import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.Utilities;
public class Mimic14Importer { public class Mimic14Importer {
@ -561,7 +562,7 @@ public class Mimic14Importer {
} else { } else {
throw new FHIRException("Unhandled Note type '"+cat+"'/'"+desc+"'"); throw new FHIRException("Unhandled Note type '"+cat+"'/'"+desc+"'");
} }
dr.addContent().getAttachment().setContentType("text/plain; charset=UTF-8").setData(csv.cell("text").getBytes(Charset.forName("UTF-8"))); dr.addContent().getAttachment().setContentType("text/plain; charset=UTF-8").setData(TextFile.stringToBytes(csv.cell("text"), false));
bnd.addEntry().setResource(dr); bnd.addEntry().setResource(dr);
} }
System.out.println(Integer.toString(t)+" found"); System.out.println(Integer.toString(t)+" found");

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

@ -324,7 +324,7 @@ public class NPMPackageGenerator {
} }
private void buildIndexJson() throws IOException { private void buildIndexJson() throws IOException {
byte[] content = indexer.build().getBytes(Charset.forName("UTF-8")); byte[] content = TextFile.stringToBytes(indexer.build(), false);
addFile(Category.RESOURCE, ".index.json", content); addFile(Category.RESOURCE, ".index.json", content);
} }

16
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java vendored
View File

@ -182,10 +182,18 @@ public class NpmPackage {
indexer.seeFile(n.substring(8), res.content.get(n)); indexer.seeFile(n.substring(8), res.content.get(n));
} }
} }
res.content.put("package/.index.json", indexer.build().getBytes(Charsets.UTF_8)); res.content.put("package/.index.json", TextFile.stringToBytes(indexer.build(), false));
}
try {
res.npm = JsonTrackingParser.parseJson(res.content.get("package/package.json"));
} catch (Exception e) {
throw new IOException("Error parsing package/package.json: "+e.getMessage(), e);
}
try {
res.readIndexFile((JsonObject) JsonTrackingParser.parseJson(new String(res.content.get("package/.index.json"))));
} catch (Exception e) {
throw new IOException("Error parsing package/.index.json: "+e.getMessage(), e);
} }
res.npm = JsonTrackingParser.parseJson(res.content.get("package/package.json"));
res.readIndexFile((JsonObject) new com.google.gson.JsonParser().parse(new String(res.content.get("package/.index.json"))));
return res; return res;
} }
@ -518,7 +526,7 @@ public class NpmPackage {
tar.closeArchiveEntry(); tar.closeArchiveEntry();
} }
} }
byte[] cnt = new GsonBuilder().setPrettyPrinting().create().toJson(npm).getBytes(Charset.forName("UTF-8")); byte[] cnt = TextFile.stringToBytes(new GsonBuilder().setPrettyPrinting().create().toJson(npm), false);
TarArchiveEntry entry = new TarArchiveEntry("package/package.json"); TarArchiveEntry entry = new TarArchiveEntry("package/package.json");
entry.setSize(cnt.length); entry.setSize(cnt.length);
tar.putArchiveEntry(entry); tar.putArchiveEntry(entry);

2
pom.xml
View File

@ -17,7 +17,7 @@
<properties> <properties>
<hapi_fhir_version>4.1.0</hapi_fhir_version> <hapi_fhir_version>4.1.0</hapi_fhir_version>
<validator_test_case_version>1.0.5-SNAPSHOT</validator_test_case_version> <validator_test_case_version>1.0.6-SNAPSHOT</validator_test_case_version>
</properties> </properties>
<artifactId>org.hl7.fhir.core</artifactId> <artifactId>org.hl7.fhir.core</artifactId>

4
release.bat
View File

@ -1,7 +1,7 @@
@echo off @echo off
set oldver=4.0.34 set oldver=4.0.35
set newver=4.0.35 set newver=4.0.36
echo .. echo ..
echo ===================================================================== echo =====================================================================