perfsonar development work

Author: roman
Date: 2009-03-09 06:47:07 -0400 (Mon, 09 Mar 2009)
New Revision: 5041

Modified:
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/TimeDateUtil.java
Log:
support of the following time parameter formats:

1)
      <nmwg:parameter name="startTime">
          <nmtm:time type="ISO" value="2007-08-10T10:40:00Z"/>
      </nmwg:parameter>

2)
      <nmwg:parameter name="startTime">
          <nmtm:time type="ISO">2007-08-10T10:40:00Z</nmtm:time>
      </nmwg:parameter>



Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/TimeDateUtil.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/TimeDateUtil.java
        2009-03-08 23:15:30 UTC (rev 5040)
+++ 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/TimeDateUtil.java
        2009-03-09 10:47:07 UTC (rev 5041)
@@ -63,6 +63,9 @@
         } else if (time.getAttribute("type").trim().equalsIgnoreCase("iso")) 
{
 
             String isoTimeString = time.getText();
+            if (isoTimeString.trim().equals(""))
+                isoTimeString = time.getAttribute("value");
+
             try {
 
                 DateTimeFormatter dtf = ISODateTimeFormat.dateTimeParser();