Minor tweaks to Migration

[bacula/bacula] / bacula / src / dird / ua_update.c

diff --git a/bacula/src/dird/ua_update.c b/bacula/src/dird/ua_update.c
index e08705d4409ea86f6c2f6289456fa564dd774d67..c3191e377f33a32483eca16e558222ccbc3ae087 100644 (file)
--- a/bacula/src/dird/ua_update.c
+++ b/bacula/src/dird/ua_update.c
@@ -25,9 +25,6 @@
 #include "bacula.h"
 #include "dird.h"
 
-/* External variables */
-extern char *list_pool;               /* in sql_cmds.c */
-
 /* Imported functions */
 void update_slots(UAContext *ua);
 
@@ -219,12 +216,9 @@ static void update_volrecycle(UAContext *ua, char *val, MEDIA_DBR *mr)
 {
    int recycle;
    char ed1[50];
+
    POOL_MEM query(PM_MESSAGE);
-   if (strcasecmp(val, _("yes")) == 0) {
-      recycle = 1;
-   } else if (strcasecmp(val, _("no")) == 0) {
-      recycle = 0;
-   } else {
+   if (!is_yesno(val, &recycle)) {
       bsendmsg(ua, _("Invalid value. It must be yes or no.\n"));
       return;
    }
@@ -244,11 +238,7 @@ static void update_volinchanger(UAContext *ua, char *val, MEDIA_DBR *mr)
    char ed1[50];
 
    POOL_MEM query(PM_MESSAGE);
-   if (strcasecmp(val, _("yes")) == 0) {
-      InChanger = 1;
-   } else if (strcasecmp(val, _("no")) == 0) {
-      InChanger = 0;
-   } else {
+   if (!is_yesno(val, &InChanger)) {
       bsendmsg(ua, _("Invalid value. It must be yes or no.\n"));
       return;
    }
@@ -372,6 +362,29 @@ static void update_all_vols_from_pool(UAContext *ua)
    }
 }
 
+static void update_volenabled(UAContext *ua, char *val, MEDIA_DBR *mr)
+{
+   if (strcasecmp(val, "yes") == 0 || strcasecmp(val, "true") == 0) {
+      mr->Enabled = 1;
+   } else if (strcasecmp(val, "no") == 0 || strcasecmp(val, "false") == 0) {
+      mr->Enabled = 0;
+   } else if (strcasecmp(val, "archived") == 0) { 
+      mr->Enabled = 2;
+   } else {
+      mr->Enabled = atoi(val);
+   }
+   if (mr->Enabled < 0 || mr->Enabled > 2) {
+      bsendmsg(ua, _("Invalid Enabled, it must be 0, 1, or 2\n"));
+      return;
+   }
+   if (!db_update_media_record(ua->jcr, ua->db, mr)) {
+      bsendmsg(ua, _("Error updating media record Enabled: ERR=%s"), db_strerror(ua->db));
+   } else {
+      bsendmsg(ua, _("New Enabled is: %d\n"), mr->Enabled);
+   }
+}
+
+
 
 /*
  * Update a media record -- allows you to change the
@@ -400,6 +413,7 @@ static int update_volume(UAContext *ua)
       _("Pool"),                     /* 9 */
       _("FromPool"),                 /* 10 */
       _("AllFromPool"),              /* 11 !!! see below !!! */
+      _("Enabled"),                  /* 12 */
       NULL };
 
 #define AllFromPool 11               /* keep this updated with above */
@@ -408,6 +422,7 @@ static int update_volume(UAContext *ua)
       int j;
       POOL_DBR pr;
       if ((j=find_arg_with_value(ua, kw[i])) > 0) {
+         /* If all from pool don't select a media record */
          if (i != AllFromPool && !select_media_dbr(ua, &mr)) {
             return 0;
          }
@@ -454,34 +469,39 @@ static int update_volume(UAContext *ua)
          case 11:
             update_all_vols_from_pool(ua);
             return 1;
+         case 12:
+            update_volenabled(ua, ua->argv[j], &mr);
+            break;
          }
          done = true;
       }
    }
 
    for ( ; !done; ) {
-      bsendmsg(ua, _("Updating Volume \"%s\"\n"), mr.VolumeName);
       start_prompt(ua, _("Parameters to modify:\n"));
-      add_prompt(ua, _("Volume Status"));
-      add_prompt(ua, _("Volume Retention Period"));
-      add_prompt(ua, _("Volume Use Duration"));
-      add_prompt(ua, _("Maximum Volume Jobs"));
-      add_prompt(ua, _("Maximum Volume Files"));
-      add_prompt(ua, _("Maximum Volume Bytes"));
-      add_prompt(ua, _("Recycle Flag"));
-      add_prompt(ua, _("Slot"));
-      add_prompt(ua, _("InChanger Flag"));
-      add_prompt(ua, _("Volume Files"));
-      add_prompt(ua, _("Pool"));
-      add_prompt(ua, _("Volume from Pool"));
-      add_prompt(ua, _("All Volumes from Pool"));
-      add_prompt(ua, _("Done"));
+      add_prompt(ua, _("Volume Status"));              /* 0 */
+      add_prompt(ua, _("Volume Retention Period"));    /* 1 */
+      add_prompt(ua, _("Volume Use Duration"));        /* 2 */
+      add_prompt(ua, _("Maximum Volume Jobs"));        /* 3 */
+      add_prompt(ua, _("Maximum Volume Files"));       /* 4 */
+      add_prompt(ua, _("Maximum Volume Bytes"));       /* 5 */
+      add_prompt(ua, _("Recycle Flag"));               /* 6 */
+      add_prompt(ua, _("Slot"));                       /* 7 */
+      add_prompt(ua, _("InChanger Flag"));             /* 8 */
+      add_prompt(ua, _("Volume Files"));               /* 9 */
+      add_prompt(ua, _("Pool"));                       /* 10 */
+      add_prompt(ua, _("Volume from Pool"));           /* 11 */
+      add_prompt(ua, _("All Volumes from Pool"));      /* 12 */
+      add_prompt(ua, _("Enabled")),                    /* 13 */
+      add_prompt(ua, _("Done"));                       /* 14 */
       i = do_prompt(ua, "", _("Select parameter to modify"), NULL, 0);  
-      /* For All Volumes from Pool we don't need a Volume record */
-      if (i != 12) {
+
+      /* For All Volumes from Pool and Done, we don't need a Volume record */
+      if (i != 12 && i != 14) {
          if (!select_media_dbr(ua, &mr)) {  /* Get Volume record */
             return 0;
          }
+         bsendmsg(ua, _("Updating Volume \"%s\"\n"), mr.VolumeName);
       }
       switch (i) {
       case 0:                         /* Volume Status */
@@ -627,6 +647,24 @@ static int update_volume(UAContext *ua)
       case 12:
          update_all_vols_from_pool(ua);
          return 1;
+
+      case 13:
+         bsendmsg(ua, _("Current Enabled is: %d\n"), mr.Enabled);
+         if (!get_cmd(ua, _("Enter new Enabled: "))) {
+            return 0;
+         }
+         if (strcasecmp(ua->cmd, "yes") == 0 || strcasecmp(ua->cmd, "true") == 0) {
+            mr.Enabled = 1;
+         } else if (strcasecmp(ua->cmd, "no") == 0 || strcasecmp(ua->cmd, "false") == 0) {
+            mr.Enabled = 0;
+         } else if (strcasecmp(ua->cmd, "archived") == 0) { 
+            mr.Enabled = 2;
+         } else {
+            mr.Enabled = atoi(ua->cmd);
+         }
+         update_volenabled(ua, ua->cmd, &mr);
+         break;
+
       default:                        /* Done or error */
          bsendmsg(ua, _("Selection terminated.\n"));
          return 1;