Revision 6614
Added by ben leinfelder over 12 years ago
ReplicationHandler.java | ||
---|---|---|
48 | 48 |
|
49 | 49 |
import org.apache.log4j.Logger; |
50 | 50 |
import org.dataone.service.types.v1.SystemMetadata; |
51 |
import org.dataone.service.util.DateTimeMarshaller; |
|
51 | 52 |
import org.dataone.service.util.TypeMarshaller; |
52 | 53 |
import org.xml.sax.ContentHandler; |
53 | 54 |
import org.xml.sax.ErrorHandler; |
... | ... | |
399 | 400 |
// dates |
400 | 401 |
String createdDateString = docinfoHash.get("date_created"); |
401 | 402 |
String updatedDateString = docinfoHash.get("date_updated"); |
402 |
Date createdDate = DatatypeConverter.parseDateTime(createdDateString).getTime();
|
|
403 |
Date updatedDate = DatatypeConverter.parseDateTime(updatedDateString).getTime();
|
|
403 |
Date createdDate = DateTimeMarshaller.deserializeDateToUTC(createdDateString);
|
|
404 |
Date updatedDate = DateTimeMarshaller.deserializeDateToUTC(updatedDateString);
|
|
404 | 405 |
|
405 | 406 |
//docid should include rev number too |
406 | 407 |
/*String accnum=docId+util.getProperty("document.accNumSeparator")+ |
... | ... | |
564 | 565 |
String docHomeServer = docinfoHash.get("home_server"); |
565 | 566 |
String createdDateString = docinfoHash.get("date_created"); |
566 | 567 |
String updatedDateString = docinfoHash.get("date_updated"); |
567 |
Date createdDate = DatatypeConverter.parseDateTime(createdDateString).getTime();
|
|
568 |
Date updatedDate = DatatypeConverter.parseDateTime(updatedDateString).getTime();
|
|
568 |
Date createdDate = DateTimeMarshaller.deserializeDateToUTC(createdDateString);
|
|
569 |
Date updatedDate = DateTimeMarshaller.deserializeDateToUTC(updatedDateString);
|
|
569 | 570 |
//docid should include rev number too |
570 | 571 |
/*String accnum=docId+util.getProperty("document.accNumSeparator")+ |
571 | 572 |
(String)docinfoHash.get("rev");*/ |
... | ... | |
777 | 778 |
|
778 | 779 |
// parse the ISO datetime |
779 | 780 |
String datestr = datexml.substring(11, datexml.indexOf('<', 11)); |
780 |
Calendar updated = DatatypeConverter.parseDateTime(datestr);
|
|
781 |
Date updated = DateTimeMarshaller.deserializeDateToUTC(datestr);
|
|
781 | 782 |
|
782 | 783 |
StringBuffer sql = new StringBuffer(); |
783 | 784 |
sql.append("update xml_replication set last_checked = ? "); |
784 | 785 |
sql.append(" where server like ? "); |
785 | 786 |
pstmt = dbConn.prepareStatement(sql.toString()); |
786 |
pstmt.setTimestamp(1, new Timestamp(updated.getTimeInMillis()));
|
|
787 |
pstmt.setTimestamp(1, new Timestamp(updated.getTime())); |
|
787 | 788 |
pstmt.setString(2, server); |
788 | 789 |
|
789 | 790 |
pstmt.executeUpdate(); |
Also available in: Unified diff
use DateTimeMarshaller for all replication date transfers