Changeset 7465

Timestamp:

2004-05-27T14:08:15+12:00 (20 years ago)

Author:

cs025

Message:

Changes to cope with better file functionality; also proper handling of
Windows file paths with URLTools

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata

Files:

• METSFile.java (modified) (2 diffs)
• METSFileGroup.java (modified) (1 diff)
• METSFilePos.java (modified) (1 diff)
• METSFileSet.java (modified) (3 diffs)
• METSLocation.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSFile.java

@@ -139 +139 @@
   { String mimeType;
   
-    if (url.toString().startsWith("file://"))
+    if (url.getProtocol().equals("file"))
     { // TODO: Work out the MIME type
       mimeType = URLConnection.getFileNameMap().getContentTypeFor(url.toString().substring(7));
@@ -288 +288 @@
   }
 
+  /**
+   *  Get the location of this file as a URL
+   */
   public URL getURL()
   { return this.location.getLocation();
   }
 
+  /**
+   * 
+   */
+  public long getModifiedDatestamp()
+  { return this.location.getModifiedDatestamp();
+  }
 
   /**

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSFileGroup.java

@@ -37 +37 @@
   }
 
+  /**
+   *  Get the modified datestamp that applies for this file group.  An empty group
+   *  will return <code>0</code>.
+   *
+   *  @return <code>long</code> the date modified as milliseconds from the 1st January 1970
+   */
+  public long getModifiedDatestamp()
+  { long reply = 0; // empty groups reply '0'
+
+    Iterator childIter = children.iterator();
+    while (childIter.hasNext())
+    { METSFile file = (METSFile) childIter.next();
+      long fileStamp = file.getModifiedDatestamp();
+      if (fileStamp > reply) {
+    reply = fileStamp;
+      }
+    }
+
+    childIter = childGroups.iterator();
+    while (childIter.hasNext())
+    { METSFileGroup fileGroup = (METSFileGroup) childIter.next();
+      long fileStamp = fileGroup.getModifiedDatestamp();
+      if (fileStamp > reply) {
+    reply = fileStamp;
+      }
+    }
+
+    return reply;
+  }
+    
   /**
    *  Find all the occurrences of a given file, and place them

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSFilePos.java

@@ -28 +28 @@
   }
 
+  public long getModifiedDatestamp()
+  { return this.location.getModifiedDatestamp();
+  }
+
   public String toString()
   { return this.location.getLocation().toString();

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSFileSet.java

@@ -47 +47 @@
   }
 
+  public long getModifiedDatestamp()
+  { long reply = 0;
+
+    Iterator groupsIter = this.fileGroups.values().iterator();
+    while (groupsIter.hasNext())
+    { METSFileGroup group = (METSFileGroup) groupsIter.next();
+
+      long groupStamp = group.getModifiedDatestamp();
+      if (groupStamp > reply)
+      { reply = groupStamp;
+      }
+    }
+
+    return reply;
+  }
+    
+
   /**
    *  Get a new FileGroup to lie within this fileset.  The group is not initialised with
@@ -92 +109 @@
   }
 
+  /**
+   *  Add a file to the default file group
+   */
   public void addFile(METSFile file)
   { METSFileGroup defaultGroup = (METSFileGroup) this.fileGroups.get("default");
@@ -97 +117 @@
   }
 
+  /**
+   *  Add a file to the default file group
+   *
+   *  @return <code>METSFile</code> an object that wraps the given url into
+   *          a METS file object
+   */
   public METSFile addFile(URL url)
   { METSFile file = METSFile.makeMETSFile(url);

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSLocation.java

@@ -3 +3 @@
 import java.io.File;
 import java.net.URL;
+import java.net.URLConnection;
+
+import org.greenstone.gsdl3.gs3build.util.URLTools;
 
 public class METSLocation
@@ -19 +22 @@
   }
 
-  public METSLocation(File file) throws java.net.MalformedURLException
+  public METSLocation(File file)
   { this.type = "URL";
-    this.location = new URL("file://" + file.toString());
+    this.location = URLTools.getFileURL(file);
   }
 
@@ -32 +35 @@
   }
 
+  public long getModifiedDatestamp()
+  { if (this.location != null) {
+      if (this.location.getProtocol().equals("file")) {
+    File file = new File(this.location.getPath());
+    return file.lastModified();
+      }
+      else {
+    try {
+      URLConnection connection = this.location.openConnection();
+      return connection.getLastModified();
+    }
+    catch (java.io.IOException io)
+    { // TODO: report error
+    }
+      }
+    }
+    return System.currentTimeMillis();
+  }
+
   public String getType()
   { return this.type;