Changeset 8021

Timestamp:

2004-08-20T16:31:40+12:00 (20 years ago)

Author:

mdewsnip

Message:

Has the format of gsdlsourcefilename suddenly changed?

File:

• trunk/gli/src/org/greenstone/gatherer/metadata/DocXMLFile.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/metadata/DocXMLFile.java

@@ -26 +26 @@
 
     // Parse the doc.xml file
+    System.err.println("Loading doc.xml file " + doc_xml_file_path + "...");
     Document document = XMLTools.parseXMLFile(this);
     if (document == null) {
@@ -59 +60 @@
             if (metadata_element_name_full.equals("gsdlsourcefilename")) {
                 gsdlsourcefilename_value = XMLTools.getElementTextValue(current_metadata_element);
-                boolean is_unix_path = gsdlsourcefilename_value.startsWith("/");
 
                 // We're only interested in the path relative to the import folder
                 int import_index = gsdlsourcefilename_value.indexOf("import");
                 if (import_index != -1) {
-                gsdlsourcefilename_value = gsdlsourcefilename_value.substring(import_index + "import".length() + 1);
+                gsdlsourcefilename_value = gsdlsourcefilename_value.substring(import_index + "import".length());
+
+                boolean is_unix_path = gsdlsourcefilename_value.startsWith("/");
+                gsdlsourcefilename_value = gsdlsourcefilename_value.substring(1);
+
+                // Make sure the path matches the OS that is running
+                if (is_unix_path && Utility.isWindows()) {
+                    // Convert path from Unix to Windows
+                    gsdlsourcefilename_value = gsdlsourcefilename_value.replaceAll("/", File.separator);
+                }
+                if (!is_unix_path && !Utility.isWindows()) {
+                    // Convert path from Windows to Unix
+                    gsdlsourcefilename_value = gsdlsourcefilename_value.replaceAll("\\", File.separator);
+                }
                 }
-
-                // Make sure the path matches the OS that is running
-                if (is_unix_path && Utility.isWindows()) {
-                // Convert path from Unix to Windows
-                gsdlsourcefilename_value = gsdlsourcefilename_value.replaceAll("/", File.separator);
+                else {
+                // We don't really know what is going on...
+                System.err.println("Warning: Could not understand gsdlsourcefilename " + gsdlsourcefilename_value);
                 }
-                if (!is_unix_path && !Utility.isWindows()) {
-                // Convert path from Windows to Unix
-                gsdlsourcefilename_value = gsdlsourcefilename_value.replaceAll("\\", File.separator);
-                }
-
-                System.err.println("gsdlsourcefilename: " + gsdlsourcefilename_value);
             }