ebl Remove missing Loaded information from status slots storage command.

ebl  Fix Console command problem that cancel the job

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7701 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index b5650d868621733d30cdce06fc87ae52f90ce6b5..40d43412ce86f661c9970a3cd0fb61961ee83b53 100644 (file)
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -160,9 +160,11 @@ bool do_a_command(UAContext *ua)
       return false;
    }
 
+#ifdef xxxx
    while (ua->jcr->wstorage->size()) {
       ua->jcr->wstorage->remove(0);
    }
+#endif
 
    len = strlen(ua->argk[0]);
    for (i=0; i<comsize; i++) {     /* search for command */

diff --git a/bacula/src/dird/ua_label.c b/bacula/src/dird/ua_label.c
index c20879c4f8480d761d81c8a45a4a0a7a46e9b816..ce609da878cf327c10a936aa87b43b52f384ce73 100644 (file)
--- a/bacula/src/dird/ua_label.c
+++ b/bacula/src/dird/ua_label.c
@@ -1031,9 +1031,9 @@ void status_slots(UAContext *ua, STORE *store_r)
    int drive;
    int i=1;
    /* output format */
-   const char *slot_api_empty_format="%i||||||\n";
-   const char *slot_api_full_format="%i|%i|%s|%s|%s|%s|%i|\n";
-   const char *slot_hformat=" %4i%c| %16s | %9s | %20s | %18s |    %i    |\n";
+   const char *slot_api_empty_format="%i|||||\n";
+   const char *slot_api_full_format="%i|%i|%s|%s|%s|%s|\n";
+   const char *slot_hformat=" %4i%c| %16s | %9s | %20s | %18s |\n";
 
    if (!open_client_db(ua)) {
       return;
@@ -1063,8 +1063,8 @@ void status_slots(UAContext *ua, STORE *store_r)
       goto bail_out;
    }
    if (!ua->api) {
-      ua->info_msg(_(" Slot |   Volume Name    |   Status  |     Media Type       |      Pool          |  Loaded |\n"));
-      ua->info_msg(_("------+------------------+-----------+----------------------+--------------------+---------|\n"));
+      ua->info_msg(_(" Slot |   Volume Name    |   Status  |     Media Type       |      Pool          |\n"));
+      ua->info_msg(_("------+------------------+-----------+----------------------+--------------------|\n"));
    }
 
    /* Walk through the list getting the media records */
@@ -1087,7 +1087,7 @@ void status_slots(UAContext *ua, STORE *store_r)
          if (!ua->api) {
             ua->info_msg(slot_hformat,
                          vl->Slot, '*',
-                         "?", "?", "?", "?", 0);
+                         "?", "?", "?", "?");
          } else {
             ua->info_msg(slot_api_empty_format, vl->Slot);
          }
@@ -1099,7 +1099,7 @@ void status_slots(UAContext *ua, STORE *store_r)
          if (slot_list[i]) {
             if (!ua->api) {
                ua->info_msg(slot_hformat,
-                            i, ' ', "", "", "", "", 0);
+                            i, ' ', "", "", "", "");
             } else {
                ua->info_msg(slot_api_empty_format, i);
             }       
@@ -1121,11 +1121,11 @@ void status_slots(UAContext *ua, STORE *store_r)
             /* Print information */
             ua->info_msg(slot_hformat,
                          vl->Slot, ((vl->Slot==mr.Slot)?' ':'*'),
-                         mr.VolumeName, mr.VolStatus, mr.MediaType, pr.Name, 0);
+                         mr.VolumeName, mr.VolStatus, mr.MediaType, pr.Name);
          } else {
             ua->info_msg(slot_api_full_format,
                          vl->Slot, mr.Slot, mr.VolumeName, mr.VolStatus, 
-                         mr.MediaType, pr.Name, 0);
+                         mr.MediaType, pr.Name);
          }
 
          db_unlock(ua->db);
@@ -1133,7 +1133,7 @@ void status_slots(UAContext *ua, STORE *store_r)
       } else {                  /* TODO: get information from catalog  */
          ua->info_msg(slot_hformat,
                       vl->Slot, '*',
-                      mr.VolumeName, "?", "?", "?", 0);
+                      mr.VolumeName, "?", "?", "?");
       }
       db_unlock(ua->db);
    }
@@ -1144,7 +1144,7 @@ void status_slots(UAContext *ua, STORE *store_r)
       if (slot_list[i]) {
          if (!ua->api) {
             ua->info_msg(slot_hformat,
-                         i, ' ', "", "", "", "", 0);
+                         i, ' ', "", "", "", "");
          } else {
             ua->info_msg(slot_api_empty_format, i);
          } 

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index e1b16bdc7258f383b0838864b84ee0e027ea116e..c0443aa3dc711edf12518db9f3715e8cd70cde86 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -18,6 +18,8 @@ remove reader/writer in FOPTS????
 
 General:
 04Oct08
+ebl  Remove missing Loaded information from status slots storage command.
+ebl  Fix Console command problem that cancel the job
 kes  Add more plugin restore debug code.
 03Oct08
 kes  Fix plugin_bwrite - plugin-blseek mixup pointed out by James.