Commit emails of the iDok project

["AFS account Roman Geus" <geus AT savannah.psi.ch>]

Author: geus
Date: Wed Mar  5 12:13:24 2008
New Revision: 20

Log:
Fixed sending of last modified date over CORBA in clienthandler interface

Modified:
   trunk/corba/clienthandler.idl
   trunk/corba/common.idl
   
trunk/java/ch/idok/service/client/clienthandler/corba/ClientHandlerServiceImpl.java
   
trunk/java/ch/idok/service/server/clienthandler/corba/CorbaClientHandler.java

Modified: trunk/corba/clienthandler.idl
==============================================================================
--- trunk/corba/clienthandler.idl       (original)
+++ trunk/corba/clienthandler.idl       Wed Mar  5 12:13:24 2008
@@ -52,7 +52,8 @@
 
                /**
                 * Returns the last modified date of the file or directory 
denoted by
-                * this pathname as a string in "yyyy-MM-dd hh:mm:ss" format.
+                * this pathname as a string in 
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'") 
+                * format in GMT time zone.
                 *
                 * Example:
                 */

Modified: trunk/corba/common.idl
==============================================================================
--- trunk/corba/common.idl      (original)
+++ trunk/corba/common.idl      Wed Mar  5 12:13:24 2008
@@ -69,7 +69,7 @@
                /** File size */
                long long fileSize;
                
-       /** Modification date. */
+       /** Modification date in SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'") 
format in GMT time zone */
        string modificationDate;
        };
        
@@ -107,4 +107,4 @@
        void close() raises (ServiceException);
        };
        
-};
\ No newline at end of file
+};

Modified: 
trunk/java/ch/idok/service/client/clienthandler/corba/ClientHandlerServiceImpl.java
==============================================================================
--- 
trunk/java/ch/idok/service/client/clienthandler/corba/ClientHandlerServiceImpl.java
 (original)
+++ 
trunk/java/ch/idok/service/client/clienthandler/corba/ClientHandlerServiceImpl.java
 Wed Mar  5 12:13:24 2008
@@ -22,10 +22,10 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.net.URI;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.TimeZone;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -135,9 +135,8 @@
             FileReadIteratorHolder contents, MetadataTypeHolder metadata)
             throws ServiceException {
         File file = new File(filePath);
-        Date date = new Date(file.lastModified());
         long size = file.length();
-        metadata.value = new MetadataType(size, date.toString());
+        metadata.value = new MetadataType(size, getLastModified(filePath));
 
         FileReadIteratorImpl it;
         try {
@@ -178,8 +177,10 @@
      * @see 
ch.idok.service.client.corba.obj.ClientHandlerServiceOperations#getLastModified(java.lang.String)
      */
     public String getLastModified(String pathname) throws ServiceException {
-        DateFormat df = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-        return df.format(new Date(new File(pathname).lastModified()));
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+        df.setTimeZone(TimeZone.getTimeZone("GMT"));
+        String date_string = df.format(new Date(new 
File(pathname).lastModified()));
+        return date_string;
     }
 
     /**

Modified: 
trunk/java/ch/idok/service/server/clienthandler/corba/CorbaClientHandler.java
==============================================================================
--- 
trunk/java/ch/idok/service/server/clienthandler/corba/CorbaClientHandler.java 
      (original)
+++ 
trunk/java/ch/idok/service/server/clienthandler/corba/CorbaClientHandler.java 
      Wed Mar  5 12:13:24 2008
@@ -26,6 +26,7 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.TimeZone;
 
 import ch.idok.common.client.ClientHandler;
 import ch.idok.common.errorhandling.DmsException;
@@ -102,6 +103,7 @@
         try {
             FileReadIteratorHolder itHolder = new FileReadIteratorHolder();
             MetadataTypeHolder metadata = new MetadataTypeHolder();
+            // metadata is not used!
             service_.getFileReadIterator(pathname, itHolder, metadata);
             return new CorbaFileInputStream(itHolder.value);
         } catch (ServiceException e) {
@@ -134,9 +136,11 @@
      * @see 
ch.idok.common.client.ClientHandler#getLastModified(java.lang.String)
      */
     public Date getLastModified(String pathname) throws DmsException {
-        DateFormat df = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+        df.setTimeZone(TimeZone.getTimeZone("GMT"));
         try {
-            return df.parse(service_.getLastModified(pathname));
+            Date date = df.parse(service_.getLastModified(pathname));
+            return date;
         } catch (ServiceException e) {
             throw convertException(this, e);
         } catch (ParseException e) {