Changeset 4315

Timestamp:

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

Author:

jmt12

Message:

updated so it could call the redesigned MetaEditPrompt

File:

• trunk/gli/src/org/greenstone/gatherer/msm/MetadataSetManager.java (modified) (5 diffs)

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

@@ -914 +914 @@
      }
      public final boolean searchForMetadata(FileNode destination, FileNode source, boolean folder_level, boolean dummy_run) {
-          Gatherer.println("MetadataSetManager.searchForMetadata()");
+          ///atherer.println("MetadataSetManager.searchForMetadata()");
           return loader.searchForMetadata(destination, source, folder_level, dummy_run);
      }
@@ -1015 +1015 @@
                      // If we are confirming prompt for user_action.
                      if(values.length() > 0 && action == MetaEditPrompt.CONFIRM) {
-                          MetaEditPrompt mep = new MetaEditPrompt(MetaEditPrompt.ADD_PROMPT, multiple_selection);
-                          user_action = mep.display(record.toString(), data.getElement().toString(), values, data.getValue());
+                          MetaEditPrompt mep = new MetaEditPrompt(MetaEditPrompt.ADD_PROMPT, multiple_selection, record.getFile(), data.getElement().toString(), values, data.getValue());
+                          user_action = mep.display();
                      }
                      if(user_action == MetaEditPrompt.ACCUMULATE_ALL || user_action == MetaEditPrompt.CANCEL || user_action == MetaEditPrompt.OVERWRITE_ALL) {
@@ -1097 +1097 @@
                 // We do have it. If action == CONFIRM, show user prompt.
                 if(action == MetaEditPrompt.CONFIRM) {
-                     MetaEditPrompt mep = new MetaEditPrompt(MetaEditPrompt.REMOVE_PROMPT, multiple_selection);
-                     user_action = mep.display(record.toString(), data.getElement().toString(), data.getValue());
+                     MetaEditPrompt mep = new MetaEditPrompt(MetaEditPrompt.REMOVE_PROMPT, multiple_selection, record.getFile(), data.getElement().toString(), data.getValue(), "");
+                     user_action = mep.display();
                 }
                 // Set action to match the user_action under certain circumstances.
@@ -1178 +1178 @@
      private int updateMetadata(long id, FileNode record, Metadata old_data, Metadata new_data, int action, boolean multiple_selection) {
           ArrayList metadata = Gatherer.c_man.getCollection().gdm.getMetadata(record.getFile());
-          int user_action = MetaEditPrompt.UPDATE;
+          int user_action = MetaEditPrompt.OVERWRITE;
           // Standard case of updating an existing metadata value.
           if(metadata.contains(old_data)) {
@@ -1184 +1184 @@
                 // If we are to prompt the user, do so.
                 if(action == MetaEditPrompt.CONFIRM) {
-                     MetaEditPrompt mep = new MetaEditPrompt(MetaEditPrompt.UPDATE_PROMPT, multiple_selection);
-                     user_action = mep.display(record.toString(), old_data.getElement().toString(), old_data.getValue(), new_data.getValue());
+                     MetaEditPrompt mep = new MetaEditPrompt(MetaEditPrompt.UPDATE_PROMPT, multiple_selection, record.getFile(), old_data.getElement().toString(), old_data.getValue(), new_data.getValue());
+                     user_action = mep.display();
                 }
                 // Some user actions should have a continuous effect.
-                if(user_action == MetaEditPrompt.UPDATE_ALL || user_action == MetaEditPrompt.CANCEL) {
+                if(user_action == MetaEditPrompt.OVERWRITE_ALL || user_action == MetaEditPrompt.CANCEL) {
                      action = user_action;
                 }
                 // And if the update chose update, do so.
-                if(action == MetaEditPrompt.UPDATE_ALL || user_action == MetaEditPrompt.UPDATE || action == MetaEditPrompt.UPDATE_ONCE) {
+                if(action == MetaEditPrompt.OVERWRITE_ALL || user_action == MetaEditPrompt.OVERWRITE || user_action == MetaEditPrompt.UPDATE_ONCE) {
                      ///ystem.err.println("Updating:\n"+old_data+"\nto\n"+new_data);
                      fireMetadataChanged(id, record, old_data, new_data);