Changeset 4316

Timestamp:

2003-05-23T16:39:12+12:00 (21 years ago)

Author:

jmt12

Message:

modified to handle dummy runs over base collections

File:

• trunk/gli/src/org/greenstone/gatherer/msm/parsers/GreenstoneMetadataParser.java (modified) (7 diffs)

trunk/gli/src/org/greenstone/gatherer/msm/parsers/GreenstoneMetadataParser.java

@@ -82 +82 @@
      static final private String MODE_ATTRIBUTE = "mode";
      static final private String NAME_ATTRIBUTE = "name";
+     static final private String SEPARATOR = "/";
 
      /** A list of the collect.cfg paths that we should ignore. */
@@ -97 +98 @@
      /** Locate and import any metadata parsed by this metadata parser given the file involved and its previous incarnation. */
      public boolean process(FileNode destination, FileNode origin, boolean folder_level, boolean dummy_run) {
-          Gatherer.println("GreenstoneMetadataParser: Process " + origin + ": ");
+          ///atherer.println("GreenstoneMetadataParser: Process " + origin + ": ");
           int counter = 0;
           dialog_cancelled = false;
@@ -161 +162 @@
                      }
                      if(filename != null) {
-                          filename = file.getName() + "/" + filename;
+                          filename = file.getName() + SEPARATOR + filename;
                      }
                      else {
-                          filename = file.getName() + "/";
+                          filename = file.getName();
                      }
                      file = file.getParentFile();
@@ -175 +176 @@
                 for(int i = 0; i < search_files.size(); i++) {
                      MetadataXMLFileSearch a_search = (MetadataXMLFileSearch) search_files.get(i);
-                     ///ystem.err.println("Search " + a_search.file.getAbsolutePath() + " for " + (a_search.filename != null ? a_search.filename : "directory metadata"));
+                     ///ystem.err.println("Search " + a_search.file.getAbsolutePath() + " for " + (a_search.filename != null ? a_search.filename : ".*"));
                      // Retrieve the document
                      BasicGDMDocument document = getDocument(a_search.file);
@@ -210 +211 @@
           ///ystem.err.print("6 ");
           // Used in a complicated test later on.
-          ArrayList inherited_metadata = null;
-          if(destination != null) {
-                inherited_metadata = Gatherer.c_man.getCollection().gdm.getMetadata(destination.getFile());
-          }
-          else {
-                inherited_metadata = new ArrayList();
-          }
           for(int i = 0; !dialog_cancelled && i < metadatum.size(); i++) {
                 BasicMetadata basic_metadata = (BasicMetadata) metadatum.get(i);
@@ -298 +292 @@
                 if(!dummy_run && final_metadata != null && !dialog_cancelled) {
                      final_metadata.setAccumulate(metadata.accumulates);
-                     // There is one final test, caused by the advent of directory vs file level metadata, but its a mouthfull to explain. And it goes a little something like this: 
-                     // When you drag in a single file you want to record all of the metadata, both file and directory level, associated with it. If a user later sets directory level metadat this is overridden by directory level metadat present at file level in this file then that is just too bad. For example a user gathers a file, ec121e.htm, into a their folder 'docs/'. ec121e.htm has amoungst its metadata 'Date=01-01-01' which it inherited from its folder (ec121e/). Later the user sets 'Date=15-06-03' for the folder 'docs/'. The Date metadata now at the file level of ec121e.htm will now overwrite any such setting, which wouldn't have happened if magically the folder level metadata had stayed folder level. Of course thats some impossible magic due to the fact that source folder structure is unlikely to match destination level when moving individual files, and even asking for the metadata the the new file will inherit won't help (except by chance). 
-                     // Now consider a user dragging in a folder containing several files or folders. Essentially the same tatic taken above is used for the top level folder being moved, in that any and all metadata, inherited or no, is added to this new folder in the collection. However when adding subsequent files and folders it becomes possible to notice if inherited metadata is already set (just ask the collections GDMManager what metadata is available for a certain file -before- the file is actually added to the collection. This being the case only those unique metadata should subsequently be added to the file. Note that these unique metadata may still include directory level metadata that would have been better off added to a folder, but since none is available we make do.
-                     if(!inherited_metadata.contains(final_metadata) || final_metadata.accumulates()) {
-                          // Now we can finally add the metadata.
-                          Gatherer.c_man.getCollection().msm.fireMetadataChanged(0, destination, null, final_metadata);
-                     }
-                     else {
-                          ///ystem.err.println("Metadata already exists: " + final_metadata);
-                     }
+                     // Now we can finally add the metadata.
+                     ///ystem.err.println("Adding Metadata: " + final_metadata);
+                     Gatherer.c_man.getCollection().msm.fireMetadataChanged(0, destination, null, final_metadata);
                 }
                 // Otherwise there is no way to add this metadata. No value model no metadata value.
@@ -478 +465 @@
                                      // The dls way: ac01ne
                                      // So the three tests are
-                                     ///ystem.err.println("Check for:");
-                                     ///ystem.err.println("filename != null && '" + filename + "'.matches('" + filename_text + "') = " + (filename != null ? filename.matches(filename_text) : false));
-                                     ///ystem.err.println("filename != null && '" + filename + "'.matches('" + filename_text + DIRECTORY_FILENAME_SUFFIX + "') = " + (filename != null ? filename.matches(filename_text + DIRECTORY_FILENAME_SUFFIX) : false));
-                                     ///ystem.err.println("filename == null && '" + filename_text + "'.equals('.*') = " + (filename == null ? filename_text.equals(DIRECTORY_FILENAME) : false));
-                                     if((filename != null && (filename.matches(filename_text) || filename.matches(filename_text + DIRECTORY_FILENAME_SUFFIX))) 
+                                     //System.err.println("Check for: " + (filename != null ? filename : ".*"));
+                                     //System.err.println("Folder level = " + folder_level);
+                                     //System.err.println("filename != null && '" + filename + "'.matches('" + filename_text + "') = " + (filename != null ? filename.matches(filename_text) : false));
+                                     //System.err.println("filename != null && '" + filename + "'.matches('" + filename_text + DIRECTORY_FILENAME_SUFFIX + "') = " + (filename != null ? filename.matches(filename_text + DIRECTORY_FILENAME_SUFFIX) : false));
+                                     //System.err.println("filename == null && '" + filename_text + "'.equals('.*') = " + (filename == null ? filename_text.equals(DIRECTORY_FILENAME) : false));
+                                     if((filename != null && (filename.matches(filename_text) || filename.matches(filename_text))) 
                                          || (filename == null && filename_text.equals(DIRECTORY_FILENAME))) {
-                                          ///ystem.err.println("Match!!!");
+                                          ///ystem.err.println("Match: " + (filename != null ? filename : ".*") + " => " + filename_text);
                                           // If they match add all of the metadata found in the Description child element, remembering to abide by desired mode (accumulate vs. overwrite).
                                           NodeList description_elements = fileset_element.getElementsByTagName(DESCRIPTION_ELEMENT);