Merge pull request biojava#685 from pwrose/master

josemduarte · web-flow · commit 84c561764b1f · 2017-07-07T17:13:37.000-07:00
Set release date instead of modification date
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/SimpleMMcifConsumer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/SimpleMMcifConsumer.java
@@ -1467,7 +1467,6 @@ public void newPdbxDatabaseStatus(PdbxDatabaseStatus status) {
 			header = new PDBHeader();
 		}
 
-		// first entry in revision history is the release date
 		try {
 			Date depositionDate = dateFormat.parse(status.getRecvd_initial_deposition_date());
 			header.setDepDate(depositionDate);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
@@ -506,14 +506,13 @@ public void setHeaderInfo(float rFree, float rWork, float resolution, String tit
 		if(releaseDate!=null){
 			try {
 				Date relDate = formatter.parse(releaseDate);
-				pdbHeader.setModDate(relDate);
+				pdbHeader.setRelDate(relDate);
 			} catch (ParseException e) {
-				logger.warn("Could not parse date string '{}', release/modification date will be unavailable", releaseDate);
+				logger.warn("Could not parse date string '{}', release date will be unavailable", releaseDate);
 			}
 		}
 		else{
-			pdbHeader.setModDate(new Date(0));
+			pdbHeader.setRelDate(new Date(0));
 		}
-
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1467,7 +1467,6 @@ public void newPdbxDatabaseStatus(PdbxDatabaseStatus status) {`
`1467`	`1467`	`header = new PDBHeader();`
`1468`	`1468`	`}`
`1469`	`1469`
`1470`		`- // first entry in revision history is the release date`
`1471`	`1470`	`try {`
`1472`	`1471`	`Date depositionDate = dateFormat.parse(status.getRecvd_initial_deposition_date());`
`1473`	`1472`	`header.setDepDate(depositionDate);`
Original file line number	Diff line number	Diff line change
`@@ -506,14 +506,13 @@ public void setHeaderInfo(float rFree, float rWork, float resolution, String tit`
`506`	`506`	`if(releaseDate!=null){`
`507`	`507`	`try {`
`508`	`508`	`Date relDate = formatter.parse(releaseDate);`
`509`		`- pdbHeader.setModDate(relDate);`
	`509`	`+ pdbHeader.setRelDate(relDate);`
`510`	`510`	`} catch (ParseException e) {`
`511`		`- logger.warn("Could not parse date string '{}', release/modification date will be unavailable", releaseDate);`
	`511`	`+ logger.warn("Could not parse date string '{}', release date will be unavailable", releaseDate);`
`512`	`512`	`}`
`513`	`513`	`}`
`514`	`514`	`else{`
`515`		`- pdbHeader.setModDate(new Date(0));`
	`515`	`+ pdbHeader.setRelDate(new Date(0));`
`516`	`516`	`}`
`517`		`-`
`518`	`517`	`}`
`519`	`518`	`}`