Revision 6469
Added by ben leinfelder over 12 years ago
MNResourceHandler.java | ||
---|---|---|
72 | 72 |
import org.dataone.service.types.v1.Permission; |
73 | 73 |
import org.dataone.service.types.v1.Subject; |
74 | 74 |
import org.dataone.service.types.v1.SystemMetadata; |
75 |
import org.dataone.service.util.DateTimeMarshaller; |
|
75 | 76 |
import org.dataone.service.util.TypeMarshaller; |
76 | 77 |
import org.jibx.runtime.JiBXException; |
77 | 78 |
|
... | ... | |
600 | 601 |
try { |
601 | 602 |
String fromDateS = params.get("fromDate")[0]; |
602 | 603 |
logMetacat.debug("param fromDateS: " + fromDateS); |
603 |
fromDate = parseDateAndConvertToGMT(fromDateS);
|
|
604 |
fromDate = DateTimeMarshaller.deserializeDateToUTC(fromDateS);
|
|
604 | 605 |
} catch (Exception e) { |
605 | 606 |
logMetacat.warn("Could not parse fromDate: " + e.getMessage()); |
606 | 607 |
} |
607 | 608 |
try { |
608 | 609 |
String toDateS = params.get("toDate")[0]; |
609 | 610 |
logMetacat.debug("param toDateS: " + toDateS); |
610 |
toDate = parseDateAndConvertToGMT(toDateS);
|
|
611 |
toDate = DateTimeMarshaller.deserializeDateToUTC(toDateS);
|
|
611 | 612 |
} catch (Exception e) { |
612 | 613 |
logMetacat.warn("Could not parse toDate: " + e.getMessage()); |
613 | 614 |
} |
... | ... | |
712 | 713 |
try |
713 | 714 |
{ |
714 | 715 |
//startTime = dateFormat.parse(value[0]); |
715 |
startTime = parseDateAndConvertToGMT(value[0]); |
|
716 |
startTime = DateTimeMarshaller.deserializeDateToUTC(value[0]); |
|
717 |
//startTime = parseDateAndConvertToGMT(value[0]); |
|
716 | 718 |
} |
717 | 719 |
catch(Exception e) |
718 | 720 |
{ //if we can't parse it, just don't use the startTime param |
... | ... | |
725 | 727 |
try |
726 | 728 |
{ |
727 | 729 |
//endTime = dateFormat.parse(value[0]); |
728 |
endTime = parseDateAndConvertToGMT(value[0]); |
|
730 |
endTime = DateTimeMarshaller.deserializeDateToUTC(value[0]); |
|
731 |
//endTime = parseDateAndConvertToGMT(value[0]); |
|
729 | 732 |
} |
730 | 733 |
catch(Exception e) |
731 | 734 |
{ //if we can't parse it, just don't use the endTime param |
Also available in: Unified diff
use d1_common_java's date serialization utility for parsing parameters