Changeset 6848 for trunk/gli/src/org/greenstone/gatherer/msm

Timestamp:

2004-02-19T11:52:25+13:00 (20 years ago)

Author:

mdewsnip

Message:

Fix to a bug where files were incorrectly marked as having folder level metadata.

File:

• trunk/gli/src/org/greenstone/gatherer/msm/GDMDocument.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/msm/GDMDocument.java

@@ -338 +338 @@
                     }
                     }
-                    // check whether the metadata is null
+
+                    // Determine whether this metadata is file or folder level
                     if (metadata != null) {
-                    // We determine whether this metadata is file or folder level
-                    if(filename != null) {
-                        ///ystem.err.println("Filename    = " + filename);
-                        ///ystem.err.println("filename_text = " + filename_text);
-                        // If can only be file level if there is no folder path details in filename and if the filename matched the filename text node (it may have matched .* instead)!
-                        if(filename.indexOf(File.separator) == -1 && filename.equals(filename_text)) {
-                        metadata.setFileLevel(true);
-                        ///ystem.err.println("File level!!!");
-                        }
-                        else {
-                        metadata.setFileLevel(false);
-                        ///ystem.err.println("Inherited!!!");
-                        }
-                    }
+                    // The metadata is folder level if the file expression matches .*
+                    if (filename_text != null && filename_text.equals(DIRECTORY_FILENAME)) {
+                        metadata.setFileLevel(false);
+                    }
+                    // Otherwise it must be file level
                     else {
-                        ///ystem.err.println("Filename is null therefore this is file level metadata.");
                         metadata.setFileLevel(true);
                     }
+
                     metadata.setFile(file);
                     // If mode is overwrite, then remove any previous values for this metadata element.