diff --git a/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java b/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java index d36f027dc..95eecda73 100644 --- a/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java +++ b/rch/src/main/java/org/motechproject/nms/rch/service/impl/RchWebServiceFacadeImpl.java @@ -139,6 +139,7 @@ public class RchWebServiceFacadeImpl implements RchWebServiceFacade { private static final String LOCAL_RESPONSE_DIR = "rch.local_response_dir"; private static final String REMOTE_RESPONSE_DIR = "rch.remote_response_dir"; private static final String REMOTE_RESPONSE_DIR_CSV = "rch.remote_response_dir_csv"; + private static final String REMOTE_RESPONSE_DIR_XML = "rch.remote_response_dir_xml"; private static final String LOC_UPDATE_DIR_RCH = "rch.loc_update_dir"; private static final String REMOTE_RESPONSE_DIR_LOCATION = "rch.remote_response_dir_locations"; private static final String NULL = "NULL"; @@ -1093,6 +1094,10 @@ private File fileForLocUpdate(String fileName) { return new File(remoteResponseFile(fileName)); } + private File fileForXmlLocUpdate(String fileName) { + return new File(remoteResponseFileForXml(fileName)); + } + public String localResponseFile(String file) { String localFile = settingsFacade.getProperty(LOCAL_RESPONSE_DIR); localFile += localFile.endsWith("/") ? "" : "/"; @@ -1107,6 +1112,13 @@ public String remoteResponseFile(String file) { return remoteFile; } + public String remoteResponseFileForXml(String file) { + String remoteFile = settingsFacade.getProperty(REMOTE_RESPONSE_DIR_XML); + remoteFile += remoteFile.endsWith("/") ? "" : "/"; + remoteFile += file; + return remoteFile; + } + private Long getScpTimeout() { try { return Long.parseLong(settingsFacade.getProperty(SCP_TIMEOUT_SETTING)); @@ -1247,7 +1259,7 @@ public int compare(RchImportFacilitator m1, RchImportFacilitator m2) { for (RchImportFacilitator rchImportFile : rchImportFiles ) { - File remoteResponseFile = fileForLocUpdate(rchImportFile.getFileName()); + File remoteResponseFile = fileForXmlLocUpdate(rchImportFile.getFileName()); if (remoteResponseFile.exists() && !remoteResponseFile.isDirectory()) { diff --git a/rch/src/main/resources/rch.properties b/rch/src/main/resources/rch.properties index c95a3731e..c804d9005 100644 --- a/rch/src/main/resources/rch.properties +++ b/rch/src/main/resources/rch.properties @@ -40,6 +40,9 @@ rch.local_response_dir=/usr/local/RCH/rch-records-local #remote directory where RCH response file should be copied to rch.remote_response_dir=/usr/local/RCH/rch-records-remote +#remote directory where RCH response file should be copied to +rch.remote_response_dir_xml =/usr/local/RCH/rch-records-remote/xml + #remote directory where RCH response file should be copied to rch.remote_response_dir_csv =/usr/local/RCH/rch-records-remote/csv