Changeset 7466


Ignore:
Timestamp:
2004-05-27T14:10:57+12:00 (20 years ago)
Author:
cs025
Message:

Many changes to support date information, Windows pathnames in Recogniser-
Manager and also better loading of classes through the Manager.

Location:
trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes/AbstractDocument.java

    r6737 r7466  
    126126  public boolean isIndexed()
    127127  { return true;
     128  }
     129
     130  /**
     131   *  Get the date that this file was modified
     132   */
     133  public long getModifiedDatestamp()
     134  { return this.fileSet.getModifiedDatestamp();
    128135  }
    129136

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes/DocumentFactory.java

    r7191 r7466  
    1010  public static AbstractDocument createDocument(String type, DocumentID id)
    1111  {
     12      System.out.println(type + " " + id.toString());
    1213    if (type.equals(HTMLDocument.HTML_DOCUMENT_TYPE))
    1314    { return new HTMLDocument(id);

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes/DocumentInterface.java

    r6737 r7466  
    4949   */
    5050  public boolean isIndexed();
     51
     52  /**
     53   *  Get the date that this file was modified
     54   */
     55  public long getModifiedDatestamp();
    5156
    5257  /**

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes/DocumentLoader.java

    r5944 r7466  
    4949
    5050  public static String getAsString(URL url)
    51   { if (url.toString().startsWith("file://"))
    52     { File file = new File(url.toString().substring(7));
    53       return getAsString(file);
    54     }
    55     else if (url.toString().startsWith("file:/"))
    56     { File file = new File(url.toString().substring(5));
     51  { if (url.getProtocol().equals("file"))
     52    { File file = new File(url.getPath());
    5753      return getAsString(file);
    5854    }

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes/GMLRecogniser.java

    r5944 r7466  
    2626
    2727  public boolean parseDocument(URL url)
    28   { if (url.toString().startsWith("file://")) {
    29       String fileName = url.toString().substring(7);
     28  { if (url.getProtocol().equals("file")) {
     29      String fileName = url.getPath();
    3030      if (fileName.endsWith(".gml"))
    3131      {

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes/HTMLDocument.java

    r6697 r7466  
    5757    HTMLTidy tidyDoc;
    5858    if (url.getProtocol().equals("file"))
    59     {
    60     }
    61     if (url.toString().startsWith("file://"))
    62     { //htmlDoc = new HTMLDoc(url, url.toString().substring(7));
    63       tidyDoc = new HTMLTidy(new File(url.toString().substring(7)));
    64     }
    65     else if (url.toString().startsWith("file:/"))
    66     { //htmlDoc = new HTMLDoc(url, url.toString().substring(5));
    67       tidyDoc = new HTMLTidy(new File( url.toString().substring(5)));
     59    { tidyDoc = new HTMLTidy(new File(url.getPath()));
    6860    }
    6961    else
    … …  
    229221    this.getSectionText("1");
    230222
    231     if (url.toString().startsWith("file://"))
    232     { htmlDoc = new HTMLDoc(url, url.toString().substring(7));
    233     }
    234     else if (url.toString().startsWith("file:/"))
    235     { htmlDoc = new HTMLDoc(url, url.toString().substring(5));
     223    if (url.getProtocol().equals("file"))
     224    { htmlDoc = new HTMLDoc(url, url.getPath());
    236225    }
    237226    else

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes/IndexRecogniser.java

    r5944 r7466  
    2828  { String fileName = null;
    2929
    30     if (url.toString().startsWith("file://"))
    31     { fileName = url.toString().substring(7);
    32     }
    33     else if (url.toString().startsWith("file:/"))
    34     { fileName = url.toString().substring(5);
     30    if (url.getProtocol().equals("file"))
     31    { fileName = url.getPath();
    3532    }
    3633   

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes/METSDocument.java

    r6101 r7466  
    2626  { super(url);
    2727 
    28     if (url.toString().startsWith("file://"))
    29     { this._parseFile(new File(url.toString().substring(7)));
     28    if (url.getProtocol().equals("file"))
     29    { this._parseFile(new File(url.getPath()));
    3030    }
    3131  }

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes/RecogniserManager.java

    r5944 r7466  
    55import java.io.File;
    66import java.net.URL;
     7
     8import org.greenstone.gsdl3.gs3build.util.URLTools;
    79
    810public class RecogniserManager implements FileCrawlObserver
    … …  
    1820  }
    1921
     22  /**
     23   *  Add a recogniser to this manager
     24   */
     25  public void addRecogniser(String documentType)
     26  { ClassLoader loader = ClassLoader.getSystemClassLoader();
     27    java.lang.Class thisClass = null;
     28    try {
     29       thisClass = loader.loadClass("org.greenstone.gsdl3.gs3build.doctypes." + documentType + "Recogniser");
     30    }
     31    catch (ClassNotFoundException ex) {
     32    }
     33
     34    try {
     35      Object instance = thisClass.newInstance();
     36      this.addRecogniser((RecogniserInterface) instance);
     37    }
     38    catch (InstantiationException instEx) {
     39    }
     40    catch (IllegalAccessException accEx) {
     41    }
     42  }
     43
     44  /**
     45   *
     46   */
    2047  public void addRecogniser(RecogniserInterface recogniser)
    2148  { this.ensureCapacity(this.used + 1);
    … …  
    3764  public void processFile(File file)
    3865  { try {
    39       URL url = new URL("file://"+file.toString());
     66      URL url = URLTools.getFileURL(file);
    4067     
    4168      this.processFile(url);

  • trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes/TextRecogniser.java

    r5944 r7466  
    2929  { String fileName = null;
    3030
    31     if (url.toString().startsWith("file://")) {
    32       fileName = url.toString().substring(7);
    33     }
    34     else if (url.toString().startsWith("file:/")) {
    35       fileName = url.toString().substring(5);
     31    if (url.getProtocol().equals("file")) {
     32      fileName = url.getPath();
    3633    }
    3734
Note: See TracChangeset for help on using the changeset viewer.