Add optional type= argument to .jobs command. You can list only Backup, Restore,...

[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 00f39021661e44b2ea5d30fdbcd75b1a1a9316b9..d430fda8cf50d64672f8df681c7eb85fad224f54 100644 (file)
--- a/bacula/src/dird/ua_update.c
+++ b/bacula/src/dird/ua_update.c
@@ -64,8 +64,9 @@ int update_cmd(UAContext *ua, const char *cmd)
       NT_("volume"), /* 1 */
       NT_("pool"),   /* 2 */
       NT_("slots"),  /* 3 */
-      NT_("jobid"),  /* 4 */
-      NT_("stats"),  /* 5 */
+      NT_("slot"),   /* 4 */
+      NT_("jobid"),  /* 5 */
+      NT_("stats"),  /* 6 */
       NULL};
 
    if (!open_client_db(ua)) {
@@ -81,12 +82,13 @@ int update_cmd(UAContext *ua, const char *cmd)
       update_pool(ua);
       return 1;
    case 3:
+   case 4:
       update_slots(ua);
       return 1;
-   case 4:
+   case 5:
       update_job(ua);
       return 1;
-   case 5:
+   case 6:
       update_stats(ua);
       return 1;
    default:
@@ -465,7 +467,8 @@ static void update_volenabled(UAContext *ua, char *val, MEDIA_DBR *mr)
       return;
    }
    if (!db_update_media_record(ua->jcr, ua->db, mr)) {
-      ua->error_msg(_("Error updating media record Enabled: ERR=%s"), db_strerror(ua->db));
+      ua->error_msg(_("Error updating media record Enabled: ERR=%s"),
+                    db_strerror(ua->db));
    } else {
       ua->info_msg(_("New Enabled is: %d\n"), mr->Enabled);
    }
@@ -473,15 +476,20 @@ static void update_volenabled(UAContext *ua, char *val, MEDIA_DBR *mr)
 
 static void update_vol_actiononpurge(UAContext *ua, char *val, MEDIA_DBR *mr)
 {
-       if (strcasecmp(val, "truncate") == 0)
-               mr->ActionOnPurge = AOP_TRUNCATE;
-       else mr->ActionOnPurge = 0;
-
-       if (!db_update_media_record(ua->jcr, ua->db, mr)) {
-               ua->error_msg(_("Error updating media record ActionOnPurge: ERR=%s"), db_strerror(ua->db));
-       } else {
-               ua->info_msg(_("New ActionOnPurge is: %d\n"), mr->ActionOnPurge);
-       }
+   POOL_MEM ret;
+   if (strcasecmp(val, "truncate") == 0) {
+      mr->ActionOnPurge = AOP_TRUNCATE;
+   } else {
+      mr->ActionOnPurge = 0;
+   }
+   
+   if (!db_update_media_record(ua->jcr, ua->db, mr)) {
+      ua->error_msg(_("Error updating media record ActionOnPurge: ERR=%s"),
+                    db_strerror(ua->db));
+   } else {
+      ua->info_msg(_("New ActionOnPurge is: %s\n"), 
+                   aop_to_str(mr->ActionOnPurge, ret));
+   }
 }
 
 /*
@@ -496,6 +504,7 @@ static int update_volume(UAContext *ua)
    POOL *pool;
    POOL_DBR pr;
    POOLMEM *query;
+   POOL_MEM ret;
    char buf[1000];
    char ed1[130];
    bool done = false;
@@ -808,9 +817,11 @@ static int update_volume(UAContext *ua)
          return 1;
 
       case 16:
-        ua->info_msg(_("Current ActionOnPurge is: %d\n"), mr.ActionOnPurge);
-        if (!get_cmd(ua, _("Enter new ActionOnPurge: (one of: Truncate, None) "))) {
-                return 0;
+         pm_strcpy(ret, "");
+        ua->info_msg(_("Current ActionOnPurge is: %s\n"), 
+                      aop_to_str(mr.ActionOnPurge, ret));
+        if (!get_cmd(ua, _("Enter new ActionOnPurge (one of: Truncate, None): "))) {
+            return 0;
         }
 
          update_vol_actiononpurge(ua, ua->cmd, &mr);