Changeset 7189 for trunk

Timestamp:

2004-04-06T09:28:28+12:00 (20 years ago)

Author:

cs025

Message:

Fixes and improvements.

Location:

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

Files:

• JPEGDocument.java (modified) (3 diffs)
• JPEGRecogniser.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes/JPEGDocument.java

@@ -13 +13 @@
 public class JPEGDocument extends AbstractDocument
 {
-  public static final String DOCUMENT_JPEG_TYPE = "JPEG";
+  public static final String JPEG_DOCUMENT_TYPE = "JPEG";
+
+  public JPEGDocument(DocumentID id)
+  { super(id);
+  }
   
   public JPEGDocument(URL url)
@@ -20 +24 @@
 
   public String getDocumentType()
-  { return DOCUMENT_JPEG_TYPE;
+  { return JPEG_DOCUMENT_TYPE;
   }
 
@@ -36 +40 @@
   { return true;
   }
-  
-  public DocumentWriter getMETSWriter()
-  { return null;
-  }
 }

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes/JPEGRecogniser.java

@@ -8 +8 @@
 public class JPEGRecogniser implements RecogniserInterface
 {
-    DocumentList listRepository;
+  DocumentList listRepository;
 
-    public JPEGRecogniser(DocumentList listRepository)
-    {   this.listRepository = listRepository;
-    }
+  public JPEGRecogniser(DocumentList listRepository)
+  { this.listRepository = listRepository;
+  }
 
-    public boolean parseDocument(METSFile file)
-    {
-        String MIMEType = file.getMIMEType();
-        if (MIMEType == null || 
-              MIMEType.equals("image/jpeg")) {
-            URL location = file.getLocation();
-            return this.parseDocument(location);
-        }
-        return false;
-    }
+  public boolean parseDocument(METSFile file)
+  {
+    String MIMEType = file.getMIMEType();
+    if (MIMEType == null || 
+    MIMEType.equals("image/jpeg")) {
+      URL location = file.getLocation();
+      return this.parseDocument(location);
+    }
+    return false;
+  }
 
-    public boolean parseDocument(URL url)
-    {   if (url.toString().startsWith("file://")) {
-            String fileName = url.toString().substring(7);
-        
-    
-            if (fileName.endsWith(".jpg") ||
-                    fileName.endsWith(".jpeg"))
-            {   this.listRepository.addDocument(new JPEGDocument(url));
-                // TODO: spawn knowledge of children too...
-                return true;
-            }
-        }
-        else
-        { // TODO: get Mime type remotely, and then proceed if required
-        }
+  public boolean parseDocument(URL url)
+  { if (url.getProtocol().equals("file")) {
+      String fileName = url.getPath();
+      
+      if (fileName != null &&
+      (fileName.endsWith(".jpg") ||
+       fileName.endsWith(".jpeg")))
+      { System.out.println("Posting jpeg document " + url.toString());
+    this.listRepository.addDocument(new JPEGDocument(url));
+    // TODO: spawn knowledge of children too...
+        return true;
+      }
+    }
+    else
+    { // TODO: get Mime type remotely, and then proceed if required
+    }
 
-        return false;
-    }
+    return false;
+  }
         
 }