Commit 52b0b9a0 authored by Tony Schaller's avatar Tony Schaller

Reducing execution time for DemoDocConsumer Folder Query by reducing nr of folder queries to 5

Ucum unit fix in CDA-CH-LREP
URL fix for NIST PIX/PDQ test tool
Testing Script fix

git-svn-id: https://svn.code.sf.net/p/ehealthconnector/code/trunk@1701 e99adb7c-5e35-42fd-8d1b-cdb378af05e8
parent d9f28641
......@@ -362,7 +362,7 @@ namespace eHealthConnectorDemo
outStr2.append("\nQuery for folders references. Response status: "
+ qr2.getStatus().getName());
outStr2.append(". Returned " + qr2.getFolderResponses().size() + " folder.");
outStr2.append(". Returned " + qr2.getFolderResponses().size() + " folder references.");
if (qr2.getFolderResponses().size() < 1)
{
outStr2.append("\nNo Documents found for patient '"
......@@ -378,19 +378,28 @@ namespace eHealthConnectorDemo
+ "/" + DemoDocCommon.NIST_PATIENT_ID.getExtension() + "' in registry: "
+ nistADUnsecure.getRegistryDestination().getUri());
java.util.List folders = qr2.getFolderResponses();
foreach (FolderResponseType folder in EnumerableCollection.toEnumerable(folders))
int numberOfFolderQuery = 5;
if (folders.size() < numberOfFolderQuery)
numberOfFolderQuery = folders.size();
outStr2.append(
"\nQuerying for " + java.lang.Integer.toString(numberOfFolderQuery) + " folders...");
for (int i = 0; i < numberOfFolderQuery; i++)
{
FolderResponseType folder = (FolderResponseType)folders.get(i);
if (folder.getFolder() != null)
{
outStr2.append("\n Folder UUID: " + folder.getFolder().getEntryUUID());
org.ehealth_connector.communication.xd.storedquery.GetFolderAndContentsQuery folderStoredQuery = new org.ehealth_connector.communication.xd.storedquery.GetFolderAndContentsQuery(
folder.getFolder().getEntryUUID(), true, null, null);
GetFolderAndContentsQuery folderStoredQuery = new GetFolderAndContentsQuery(
folder.getFolder().getEntryUUID(), true, null, null);
XDSQueryResponseType qr21 = conCom2.queryDocuments(folderStoredQuery);
if (qr21 != null)
{
outStr2.append("\n\tQuery for folder. Response status: "
+ qr21.getStatus().getName());
+ qr21.getStatus().getName());
outStr2.append(
"\n\tHas " + qr21.getAssociations().size() + " associations");
outStr2.append("\n\tHas " + qr21.getDocumentEntryResponses().size()
......@@ -443,7 +452,7 @@ namespace eHealthConnectorDemo
outStr3.append("\nQuery for folders references. Response status: "
+ qr2.getStatus().getName());
outStr3.append(". Returned " + qr2.getFolderResponses().size() + " references.");
outStr3.append(". Returned " + qr2.getFolderResponses().size() + " folder references.");
if (qr2.getFolderResponses().size() < 1)
{
outStr3.append("\nNo Folders found for patient '"
......@@ -459,8 +468,17 @@ namespace eHealthConnectorDemo
+ "/" + DemoDocCommon.NIST_PATIENT_ID.getExtension() + "' in registry: "
+ nistADSecure.getRegistryDestination().getUri());
java.util.List folders = qr2.getFolderResponses();
foreach (FolderResponseType folder in EnumerableCollection.toEnumerable(folders))
int numberOfFolderQuery = 5;
if (folders.size() < numberOfFolderQuery)
numberOfFolderQuery = folders.size();
outStr3.append(
"\nQuerying for " + java.lang.Integer.toString(numberOfFolderQuery) + " folders...");
for (int i = 0; i < numberOfFolderQuery; i++)
{
FolderResponseType folder = (FolderResponseType)folders.get(i);
if (folder.getFolder() != null)
{
outStr3.append("\n Folder UUID: " + folder.getFolder().getEntryUUID());
......
......@@ -961,8 +961,16 @@ public class DemoLrep
value.setUcumUnit("1");
obs.addValue(value);
value = new Value(new BigDecimal(0.5), new BigDecimal(8));
// This is just to get the CDA valid against the Schematron rules
// TODO
// This is just to get the CDA valid against the Schematron rules. The
// Schematron currently force a value of unit, even when its default is
// 1. MDHT CDA code does not serialize default attributes, so we have a
// problem, here. This has been reported to eHealth Suisse and as soon
// as the Schematron are corrected, the Unit can be set to 1 (or the
// following line can be deleted).
value.setUcumUnit("dummy");
refRange = new ReferenceRange(value, ObservationInterpretation.NORMAL);
obs.setReferenceRange(refRange);
battery.addLaboratoryObservation(obs);
......@@ -1389,11 +1397,33 @@ public class DemoLrep
"Varizella-Zoster-Virus, Ig oder IgG, qn"));
code.setOriginalText("Varizellen Zoster IgG");
obs.setCode(code);
// Note: unit definition in the Schema: use="optional" default="1"
// the setUcumUnit("1") call does therefore have no impact on the
// serialized CDA. This is ok!
value = new Value(new BigDecimal(150));
value.setUcumUnit("TODO");
// TODO
// This is just to get the CDA valid against the Schematron rules. The
// Schematron currently force a value of unit, even when its default is
// 1. MDHT CDA code does not serialize default attributes, so we have a
// problem, here. This has been reported to eHealth Suisse and as soon
// as the Schematron are corrected, the Unit can be set to 1 (or the
// following line can be deleted).
value.setUcumUnit("dummy");
obs.addValue(value);
value = new Value(new BigDecimal(0), new BigDecimal(135));
value.setUcumUnit("TODO");
// TODO
// This is just to get the CDA valid against the Schematron rules. The
// Schematron currently force a value of unit, even when its default is
// 1. MDHT CDA code does not serialize default attributes, so we have a
// problem, here. This has been reported to eHealth Suisse and as soon
// as the Schematron are corrected, the Unit can be set to 1 (or the
// following line can be deleted).
value.setUcumUnit("dummy");
refRange = new ReferenceRange(value, ObservationInterpretation.NORMAL);
obs.setReferenceRange(refRange);
battery.addLaboratoryObservation(obs);
......
......@@ -1135,7 +1135,7 @@ namespace eHealthConnectorDemo
this.labPixPdqTestTool.Size = new System.Drawing.Size(240, 17);
this.labPixPdqTestTool.TabIndex = 6;
this.labPixPdqTestTool.TabStop = true;
this.labPixPdqTestTool.Text = "http://pixpdqtests.nist.gov/pixpdqtool/";
this.labPixPdqTestTool.Text = "https://pixpdqtests.nist.gov/pixpdqtool/";
this.labPixPdqTestTool.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.labPixPdqTestTool_LinkClicked);
//
// label1
......
......@@ -452,7 +452,7 @@ namespace eHealthConnectorDemo
}
else
{
MessageBox.Show("State Application Name and IP Address first, please\r\nSee http://pixpdqtests.nist.gov/pixpdqtool/\r\n\r\nGet Application Name and IP Addrress from the Configuration Information there", "Configuration error", MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show("State Application Name and IP Address first, please\r\nSee "+ this.labPixPdqTestTool.Text + "\r\n\r\nGet Application Name and IP Addrress from the Configuration Information there", "Configuration error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
catch (Exception ex)
......@@ -616,7 +616,7 @@ namespace eHealthConnectorDemo
}
else
{
MessageBox.Show("State Application Name and IP Address first, please\r\nSee http://pixpdqtests.nist.gov/pixpdqtool/\r\n\r\nGet Application Name and IP Addrress from the Configuration Information there", "Configuration error", MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show("State Application Name and IP Address first, please\r\nSee " + this.labPixPdqTestTool.Text + "\r\n\r\nGet Application Name and IP Addrress from the Configuration Information there", "Configuration error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
catch (Exception ex)
......@@ -1230,6 +1230,11 @@ namespace eHealthConnectorDemo
{
dlg.InitialDirectory = txtAssertionFile.Text;
}
else
{
dlg.InitialDirectory = System.IO.Path.Combine(demoDocSourceRscDir, "security");
// C:\src\ehc - trunk\demo\dotnet\eHealthConnectorDemo\bin\x64\Debug\rsc\demoDocSource\security
}
if (File.Exists(txtAssertionFile.Text))
{
dlg.InitialDirectory = Directory.GetParent(txtAssertionFile.Text).FullName;
......
......@@ -955,8 +955,16 @@ public class DemoLrep {
value.setUcumUnit("1");
obs.addValue(value);
value = new Value(new BigDecimal(0.5), new BigDecimal(8));
// This is just to get the CDA valid against the Schematron rules
// TODO
// This is just to get the CDA valid against the Schematron rules. The
// Schematron currently force a value of unit, even when its default is
// 1. MDHT CDA code does not serialize default attributes, so we have a
// problem, here. This has been reported to eHealth Suisse and as soon
// as the Schematron are corrected, the Unit can be set to 1 (or the
// following line can be deleted).
value.setUcumUnit("dummy");
refRange = new ReferenceRange(value, ObservationInterpretation.NORMAL);
obs.setReferenceRange(refRange);
battery.addLaboratoryObservation(obs);
......@@ -1381,15 +1389,35 @@ public class DemoLrep {
"Varizella-Zoster-Virus, Ig oder IgG, qn"));
code.setOriginalText("Varizellen Zoster IgG");
obs.setCode(code);
// Note: unit definition in the Schema: use="optional" default="1"
// the setUcumUnit("1") call does therefore have no impact on the
// serialized CDA. This is ok!
value = new Value(new BigDecimal(150));
value.setUcumUnit("TODO");
// TODO
// This is just to get the CDA valid against the Schematron rules. The
// Schematron currently force a value of unit, even when its default is
// 1. MDHT CDA code does not serialize default attributes, so we have a
// problem, here. This has been reported to eHealth Suisse and as soon
// as the Schematron are corrected, the Unit can be set to 1 (or the
// following line can be deleted).
value.setUcumUnit("dummy");
obs.addValue(value);
value = new Value(new BigDecimal(0), new BigDecimal(135));
value.setUcumUnit("TODO");
// TODO
// This is just to get the CDA valid against the Schematron rules. The
// Schematron currently force a value of unit, even when its default is
// 1. MDHT CDA code does not serialize default attributes, so we have a
// problem, here. This has been reported to eHealth Suisse and as soon
// as the Schematron are corrected, the Unit can be set to 1 (or the
// following line can be deleted).
value.setUcumUnit("dummy");
refRange = new ReferenceRange(value, ObservationInterpretation.NORMAL);
obs.setReferenceRange(refRange);
battery.addLaboratoryObservation(obs);
obs = new LaboratoryObservation();
obs.addAuthor(author, DateUtil.dateAndTime("16.03.2018 15:08"));
obs.addPerformer(performer, DateUtil.dateAndTime("16.03.2018 10:28"));
......
......@@ -47,7 +47,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* See http://pixpdqtests.nist.gov/pixpdqtool/ IHE PIX and PDQ Pre-Connectathon
* See https://pixpdqtests.nist.gov/pixpdqtool/ IHE PIX and PDQ Pre-Connectathon
* Test Tool
*
* Configuration for 2015 Europe
......@@ -72,7 +72,7 @@ public class DemoMpiClientPdqNist {
private final AffinityDomain affinityDomain = new AffinityDomain();
private final String testToolUrl = "http://pixpdqtests.nist.gov/pixpdqtool/";
private final String testToolUrl = "https://pixpdqtests.nist.gov/pixpdqtool/";
private final String SUCCESS = "SUCCESS";
private final String FAIL = "FAIL";
......@@ -111,7 +111,7 @@ public class DemoMpiClientPdqNist {
if (selection.equals("y")) {
System.out.print("Trying to open Web Browser ...");
try {
BrowserOpen.openUrl("http://pixpdqtests.nist.gov/pixpdqtool/");
BrowserOpen.openUrl(testToolUrl);
System.out.print("done\n");
} catch (IOException | URISyntaxException e) {
System.out.print("failed\n");
......
......@@ -45,7 +45,7 @@ import ca.uhn.fhir.context.FhirVersionEnum;
import ca.uhn.fhir.parser.IParser;
/**
* See http://pixpdqtests.nist.gov/pixpdqtool IHE PIX and PDQ Pre-Connectathon
* See https://pixpdqtests.nist.gov/pixpdqtool/ IHE PIX and PDQ Pre-Connectathon
* Test Tool
*
* Configuration for 2015 Europe
......@@ -72,7 +72,7 @@ public class DemoMpiClientPixNist {
private final FhirContext ctx = new FhirContext(FhirVersionEnum.DSTU3);
private final AffinityDomain affinityDomain = new AffinityDomain();
private final String testToolUrl = "http://pixpdqtests.nist.gov/pixpdqtool/";
private final String testToolUrl = "https://pixpdqtests.nist.gov/pixpdqtool/";
private final String SUCCESS = "SUCCESS";
private final String FAIL = "FAIL";
......@@ -104,7 +104,7 @@ public class DemoMpiClientPixNist {
if (selection.equals("y")) {
System.out.print("Trying to open Web Browser ...");
try {
BrowserOpen.openUrl("http://pixpdqtests.nist.gov/pixpdqtool/");
BrowserOpen.openUrl(testToolUrl);
System.out.print("done\n");
} catch (IOException | URISyntaxException e) {
System.out.print("failed\n");
......
......@@ -351,7 +351,7 @@ public class DemoDocConsumer {
outStr2.append("\nQuery for folders references. Response status: "
+ qr2.getStatus().getName());
outStr2.append(". Returned " + qr2.getFolderResponses().size() + " folder.");
outStr2.append(". Returned " + qr2.getFolderResponses().size() + " folder references.");
if (qr2.getFolderResponses().size() < 1) {
outStr2.append("\nNo Documents found for patient '"
+ DemoDocCommon.NIST_PATIENT_ID.getRoot() + "/"
......@@ -364,7 +364,16 @@ public class DemoDocConsumer {
+ "/" + DemoDocCommon.NIST_PATIENT_ID.getExtension() + "' in registry: "
+ nistADUnsecure.getRegistryDestination().getUri());
final List<FolderResponseType> folders = qr2.getFolderResponses();
for (final FolderResponseType folder : folders) {
int numberOfFolderQuery = 5;
if (folders.size() < numberOfFolderQuery)
numberOfFolderQuery = folders.size();
outStr2.append(
"\nQuerying for " + Integer.toString(numberOfFolderQuery) + " folders...");
for (int i = 0; i < numberOfFolderQuery; i++) {
FolderResponseType folder = folders.get(i);
if (folder.getFolder() != null) {
outStr2.append("\n Folder UUID: " + folder.getFolder().getEntryUUID());
......@@ -422,7 +431,7 @@ public class DemoDocConsumer {
outStr3.append("\nQuery for folders references. Response status: "
+ qr2.getStatus().getName());
outStr3.append(". Returned " + qr2.getFolderResponses().size() + " references.");
outStr3.append(". Returned " + qr2.getFolderResponses().size() + " folder references.");
if (qr2.getFolderResponses().size() < 1) {
outStr3.append("\nNo Folders found for patient '"
+ DemoDocCommon.NIST_PATIENT_ID.getRoot() + "/"
......@@ -435,7 +444,16 @@ public class DemoDocConsumer {
+ "/" + DemoDocCommon.NIST_PATIENT_ID.getExtension() + "' in registry: "
+ nistADSecure.getRegistryDestination().getUri());
final List<FolderResponseType> folders = qr2.getFolderResponses();
for (final FolderResponseType folder : folders) {
int numberOfFolderQuery = 5;
if (folders.size() < numberOfFolderQuery)
numberOfFolderQuery = folders.size();
outStr3.append(
"\nQuerying for " + Integer.toString(numberOfFolderQuery) + " folders...");
for (int i = 0; i < numberOfFolderQuery; i++) {
FolderResponseType folder = folders.get(i);
if (folder.getFolder() != null) {
outStr3.append("\n Folder UUID: " + folder.getFolder().getEntryUUID());
......@@ -581,9 +599,9 @@ public class DemoDocConsumer {
final GetDocumentsQuery gdq = new GetDocumentsQuery(docUUIDs, true);
qr = conCom.queryDocuments(gdq);
if (qr != null) {
outStr.append(
"\nQuery for document metadata of the last 10 documents. Response status: "
+ qr.getStatus().getName());
outStr.append("\nQuery for document metadata of the last "
+ Integer.toString(numberOfDocumentMetadataQuery)
+ " documents. Response status: " + qr.getStatus().getName());
outStr.append(
". Returned " + qr.getDocumentEntryResponses().size() + " documents.");
if (qr.getDocumentEntryResponses().size() < 1) {
......
......@@ -44,7 +44,7 @@ import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.context.FhirVersionEnum;
/**
* See http://pixpdqtests.nist.gov/pixpdqtool/ IHE PIX and PDQ Pre-Connectathon
* See https://pixpdqtests.nist.gov/pixpdqtool/ IHE PIX and PDQ Pre-Connectathon
* Test Tool
*
* Configuration for 2015 Europe
......
......@@ -33,9 +33,6 @@ SET eHCTempPath=%ehc_testing_my_out_dir_cur%
rem =============================
rem Java edition
rem =============================
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_nistcda_Java.zip" DEL "%ehc_testing_my_out_dir_cur%\fhirtransaction_nistcda_Java.zip"
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_nistcda_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\fhirtransaction_nistcda_Java"
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_nistcda_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\fhirtransaction_nistcda_Java_prev"
SET ehc_testing_my_test=FHIRTransaction_NistCda
SET ehc_testing_my_out_file=DemoDocSourceXdsFhirNistCda_Java.txt
set EHC_COMMAND=java -Dehc_testing_my_logPath=%ehc_testing_my_log_dir:\=/% -Dlog4j.configuration=%ehc_testing_my_scriptBase%\testing\rsc\log4jConfigs\log4j.xml -jar %ehc_testing_my_eHCDemoJar% DemoDocSource xdsonly "%ehc_testing_my_rsc_dir%\demoDocSource\%ehc_testing_my_test%.xml"
......@@ -46,8 +43,6 @@ call %ehc_testing_my_CompareComand% %ehc_testing_my_logBehavior% "%ehc_testing_m
rem =============================
rem Dotnet edition
rem =============================
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_nistcda_Dotnet.zip" DEL "%ehc_testing_my_out_dir_cur%\fhirtransaction_nistcda_Dotnet.zip"
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_nistcda_Dotnet" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\fhirtransaction_nistcda_Dotnet"
SET ehc_testing_my_test=FHIRTransaction_NistCda
SET ehc_testing_my_out_file=DemoDocSourceXdsFhirNistCda_Dotnet.txt
SET ehc_testing_my_out_file1=DemoDocSourceXdsFhirNistCda_Java.txt
......
......@@ -33,9 +33,6 @@ SET eHCTempPath=%ehc_testing_my_out_dir_cur%
rem =============================
rem Java edition
rem =============================
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_NistPdf_Java.zip" DEL "%ehc_testing_my_out_dir_cur%\fhirtransaction_NistPdf_Java.zip"
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_NistPdf_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\fhirtransaction_NistPdf_Java"
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_NistPdf_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\fhirtransaction_NistPdf_Java_prev"
SET ehc_testing_my_test=FHIRTransaction_NistPdf
SET ehc_testing_my_out_file=DemoDocSourceXdsFhirNistPdf_Java.txt
set EHC_COMMAND=java -Dehc_testing_my_logPath=%ehc_testing_my_log_dir:\=/% -Dlog4j.configuration=%ehc_testing_my_scriptBase%\testing\rsc\log4jConfigs\log4j.xml -jar %ehc_testing_my_eHCDemoJar% DemoDocSource xdsonly "%ehc_testing_my_rsc_dir%\demoDocSource\%ehc_testing_my_test%.xml"
......@@ -46,8 +43,6 @@ call %ehc_testing_my_CompareComand% %ehc_testing_my_logBehavior% "%ehc_testing_m
rem =============================
rem Dotnet edition
rem =============================
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_NistPdf_Dotnet.zip" DEL "%ehc_testing_my_out_dir_cur%\fhirtransaction_NistPdf_Dotnet.zip"
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_NistPdf_Dotnet" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\fhirtransaction_NistPdf_Dotnet"
SET ehc_testing_my_test=FHIRTransaction_NistPdf
SET ehc_testing_my_out_file=DemoDocSourceXdsFhirNistPdf_Dotnet.txt
SET ehc_testing_my_out_file1=DemoDocSourceXdsFhirNistPdf_Java.txt
......
......@@ -33,9 +33,6 @@ SET eHCTempPath=%ehc_testing_my_out_dir_cur%
rem =============================
rem Java edition
rem =============================
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_swisseprcda_Java.zip" DEL "%ehc_testing_my_out_dir_cur%\fhirtransaction_swisseprcda_Java.zip"
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_swisseprcda_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\fhirtransaction_swisseprcda_Java"
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_swisseprcda_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\fhirtransaction_swisseprcda_Java_prev"
SET ehc_testing_my_test=FHIRTransaction_SwissEprCda
SET ehc_testing_my_out_file=DemoDocSourceXdsFhirSwissEprCda_Java.txt
set EHC_COMMAND=java -Dehc_testing_my_logPath=%ehc_testing_my_log_dir:\=/% -Dlog4j.configuration=%ehc_testing_my_scriptBase%\testing\rsc\log4jConfigs\log4j.xml -jar %ehc_testing_my_eHCDemoJar% DemoDocSource xdsonly "%ehc_testing_my_rsc_dir%\demoDocSource\%ehc_testing_my_test%.xml"
......@@ -46,8 +43,6 @@ call %ehc_testing_my_CompareComand% %ehc_testing_my_logBehavior% "%ehc_testing_m
rem =============================
rem Dotnet edition
rem =============================
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_swisseprcda_Dotnet.zip" DEL "%ehc_testing_my_out_dir_cur%\fhirtransaction_swisseprcda_Dotnet.zip"
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_swisseprcda_Dotnet" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\fhirtransaction_swisseprcda_Dotnet"
SET ehc_testing_my_test=FHIRTransaction_SwissEprCda
SET ehc_testing_my_out_file=DemoDocSourceXdsFhirSwissEprCda_Dotnet.txt
SET ehc_testing_my_out_file1=DemoDocSourceXdsFhirSwissEprCda_Java.txt
......
......@@ -33,9 +33,6 @@ SET eHCTempPath=%ehc_testing_my_out_dir_cur%
rem =============================
rem Java edition
rem =============================
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_SwissEprPdf_Java.zip" DEL "%ehc_testing_my_out_dir_cur%\fhirtransaction_SwissEprPdf_Java.zip"
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_SwissEprPdf_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\fhirtransaction_SwissEprPdf_Java"
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_SwissEprPdf_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\fhirtransaction_SwissEprPdf_Java_prev"
SET ehc_testing_my_test=FHIRTransaction_SwissEprPdf
SET ehc_testing_my_out_file=DemoDocSourceXdsFhirSwissEprPdf_Java.txt
set EHC_COMMAND=java -Dehc_testing_my_logPath=%ehc_testing_my_log_dir:\=/% -Dlog4j.configuration=%ehc_testing_my_scriptBase%\testing\rsc\log4jConfigs\log4j.xml -jar %ehc_testing_my_eHCDemoJar% DemoDocSource xdsonly "%ehc_testing_my_rsc_dir%\demoDocSource\%ehc_testing_my_test%.xml"
......@@ -46,8 +43,6 @@ call %ehc_testing_my_CompareComand% %ehc_testing_my_logBehavior% "%ehc_testing_m
rem =============================
rem Dotnet edition
rem =============================
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_SwissEprPdf_Dotnet.zip" DEL "%ehc_testing_my_out_dir_cur%\fhirtransaction_SwissEprPdf_Dotnet.zip"
if exist "%ehc_testing_my_out_dir_cur%\fhirtransaction_SwissEprPdf_Dotnet" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\fhirtransaction_SwissEprPdf_Dotnet"
SET ehc_testing_my_test=FHIRTransaction_SwissEprPdf
SET ehc_testing_my_out_file=DemoDocSourceXdsFhirSwissEprPdf_Dotnet.txt
SET ehc_testing_my_out_file1=DemoDocSourceXdsFhirSwissEprPdf_Java.txt
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment