Merge pull request #405 from olofsvensson/issue_404

Issue #404, ISPyB-91 : Added phasingDirectory to PhasingProgramRun
ispyb · Dec 18, 2018 · ed00319 · ed00319
2 parents 0238db2 + 2d3d3b2
commit ed00319
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/ispyb-ejb/src/main/java/ispyb/server/mx/vos/autoproc/PhasingProgramRun3VO.java b/ispyb-ejb/src/main/java/ispyb/server/mx/vos/autoproc/PhasingProgramRun3VO.java
@@ -81,6 +81,9 @@ public class PhasingProgramRun3VO extends ISPyBValueObject implements Cloneable
 	@Column(name = "phasingEnvironment")
 	protected String phasingEnvironment;
 
+	@Column(name = "phasingDirectory")
+	protected String phasingDirectory;
+
 	@Column(name = "recordTimeStamp")
 	protected Date recordTimeStamp;
 
@@ -177,6 +180,14 @@ public void setPhasingEnvironment(String phasingEnvironment) {
 		this.phasingEnvironment = phasingEnvironment;
 	}
 
+	public String getPhasingDirectory() {
+		return phasingEnvironment;
+	}
+
+	public void setPhasingDirectory(String phasingDirectory) {
+		this.phasingDirectory = phasingDirectory;
+	}
+
 	public Date getRecordTimeStamp() {
 		return recordTimeStamp;
 	}

diff --git a/ispyb-ws/src/main/java/ispyb/ws/soap/mx/ToolsForAutoprocessingWebService.java b/ispyb-ws/src/main/java/ispyb/ws/soap/mx/ToolsForAutoprocessingWebService.java
@@ -943,6 +943,7 @@ public Integer storeOrUpdatePhasingProgramRun(PhasingProgramRun3VO vo) throws Ex
 			phasingProgramRun.setPhasingStartTime(vo.getPhasingStartTime());
 			phasingProgramRun.setPhasingEndTime(vo.getPhasingEndTime());
 			phasingProgramRun.setPhasingEnvironment(vo.getPhasingEnvironment());
+			phasingProgramRun.setPhasingDirectory(vo.getPhasingDirectory());
 			phasingProgramRun.setRecordTimeStamp(StringUtils.getCurrentTimeStamp());
 			if (phasingProgramRunId == null || phasingProgramRunId == 0) {
 				phasingProgramRun.setPhasingProgramRunId(null);