Changeset 12191 for trunk/greenstone3-extensions/gs3build/src/org/greenstone/gsdl3/gs3build/doctypes/METSDocument.java

Timestamp:

2006-07-13T10:29:55+12:00 (18 years ago)

Author:

kjdon

Message:

committed some changes that I had made ages ago. Not sure if it still compiles - I need to write an ant build file for this, and check compilation. Will do it once I need to - its unclear whether anyone will ever use this again

File:

• trunk/greenstone3-extensions/gs3build/src/org/greenstone/gsdl3/gs3build/doctypes/METSDocument.java (modified) (3 diffs)

trunk/greenstone3-extensions/gs3build/src/org/greenstone/gsdl3/gs3build/doctypes/METSDocument.java

@@ -26 +26 @@
     public static final String METS_DOCUMENT_TYPE = "METS";
     Document domDocument;
+    String original_location;
+    
     public METSDocument(DocumentID id) {
         super(id);
@@ -50 +52 @@
         domDocument = builder.parse(file);
 
-        int filePosition = file.getPath().indexOf("import/")+7;
-        parseFilePath = file.getPath().substring(0, filePosition);
+        //int filePosition = file.getPath().indexOf("import/")+7;
+        //parseFilePath = file.getPath().substring(0, filePosition);
+        parseFilePath = file.getParent(); // all refs should be relative to the current doc, or absolute
+        parseFilePath += File.separator;
+        this.original_location = parseFilePath;
         // TODO: get all the types in the tree
       
@@ -139 +144 @@
     URL url = (URL) this.fileSet.getFile(0).getLocation();
 
-    this.getSectionText("1");
+    //this.getSectionText("1");
     
     if (url.getProtocol().equals("file")) {
-        metsDoc = new HTMLDoc(url,url.getPath());
+        String path = url.getPath();
+        File f = new File(path);
+        if (!f.isAbsolute() && this.original_location != null) {
+        path = this.original_location + path;
+        System.err.println("new path ="+path);
+        }
+        metsDoc = new HTMLDoc(url,path);
     } else {
         metsDoc = new HTMLDoc(url);