kes Clarify some stored/acquire messages to indicate if the

     problem is with read or append.

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

diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp
index ca3eb4e62badb3959bdd37cb939de160ba97500c..48a491189c2e9cf17a7a2ae4e178f4786ef77f2a 100644 (file)
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -297,27 +297,3 @@ void Console::read_dir(int fd)
    }
    return;
 }
-
-#ifdef xxx
-
-static gint tag;
-
-void start_director_reader(gpointer data)
-{
-
-   if (director_reader_running || !UA_sock) {
-      return;
-   }
-   tag = gdk_input_add(UA_sock->fd, GDK_INPUT_READ, read_director, NULL);
-   director_reader_running = true;
-}
-
-void stop_director_reader(gpointer data)
-{
-   if (!director_reader_running) {
-      return;
-   }
-   gdk_input_remove(tag);
-   director_reader_running = false;
-}
-#endif

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index 69eb2ac96c6355795be05d05031844aa57006a0d..dfcf7027bd373adb02ec9ee7fe35c2cd1755b0f8 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -52,6 +52,34 @@ MainWin::MainWin(QWidget *parent) : QMainWindow(parent)
    readSettings();
 }
 
+#ifdef xxx
+   job_list      = get_and_fill_combo(run_dialog, "combo_job", ".jobs");
+   client_list   = get_and_fill_combo(run_dialog, "combo_client", ".clients");
+   fileset_list  = get_and_fill_combo(run_dialog, "combo_fileset", ".filesets");
+   messages_list = get_and_fill_combo(run_dialog, "combo_messages", ".msgs");
+   pool_list     = get_and_fill_combo(run_dialog, "combo_pool", ".pools");
+   storage_list  = get_and_fill_combo(run_dialog, "combo_storage", ".storage");
+   type_list     = get_and_fill_combo(run_dialog, "combo_type", ".types");
+   level_list    = get_and_fill_combo(run_dialog, "combo_level", ".levels");
+
+static GList *get_list(char *cmd)
+{
+   GList *options;
+   char *msg;
+
+   options = NULL;
+   write_director(cmd);
+   while (bnet_recv(UA_sock) > 0) {
+      strip_trailing_junk(UA_sock->msg);
+      msg = (char *)malloc(strlen(UA_sock->msg) + 1);
+      strcpy(msg, UA_sock->msg);
+      options = g_list_append(options, msg);
+   }
+   return options;
+
+}
+#endif
+
 void MainWin::createConnections()
 {
    /* Connect signals to slots */

diff --git a/bacula/src/stored/acquire.c b/bacula/src/stored/acquire.c
index e673bd7669d046d5f3286b38dbf037e68d0e210e..9fa9f79c9589f70aacc3b34fa6f1ca124a9c35eb 100644 (file)
--- a/bacula/src/stored/acquire.c
+++ b/bacula/src/stored/acquire.c
@@ -66,7 +66,7 @@ bool acquire_device_for_read(DCR *dcr)
    dev->block(BST_DOING_ACQUIRE);
 
    if (dev->num_writers > 0) {
-      Jmsg2(jcr, M_FATAL, 0, _("Num_writers=%d not zero. Job %d canceled.\n"), 
+      Jmsg2(jcr, M_FATAL, 0, _("Acquire read: num_writers=%d not zero. Job %d canceled.\n"), 
          dev->num_writers, jcr->JobId);
       goto get_out;
    }
@@ -75,7 +75,7 @@ bool acquire_device_for_read(DCR *dcr)
    vol = jcr->VolList;
    if (!vol) {
       char ed1[50];
-      Jmsg(jcr, M_FATAL, 0, _("No volumes specified. Job %s canceled.\n"), 
+      Jmsg(jcr, M_FATAL, 0, _("No volumes specified for reading. Job %s canceled.\n"), 
          edit_int64(jcr->JobId, ed1));
       goto get_out;
    }
@@ -84,7 +84,7 @@ bool acquire_device_for_read(DCR *dcr)
       vol = vol->next;
    }
    if (!vol) {
-      Jmsg(jcr, M_FATAL, 0, _("Logic error: no next volume. Numvol=%d Curvol=%d\n"),
+      Jmsg(jcr, M_FATAL, 0, _("Logic error: no next volume to read. Numvol=%d Curvol=%d\n"),
          jcr->NumReadVolumes, jcr->CurReadVolume);
       goto get_out;                   /* should not happen */   
    }
@@ -268,7 +268,7 @@ default_path:
       break;
    } /* end for loop */
    if (!ok) {
-      Jmsg1(jcr, M_FATAL, 0, _("Too many errors trying to mount device %s.\n"),
+      Jmsg1(jcr, M_FATAL, 0, _("Too many errors trying to mount device %s for reading.\n"),
             dev->print_name());
       goto get_out;
    }
@@ -321,8 +321,8 @@ DCR *acquire_device_for_append(DCR *dcr)
     * With the reservation system, this should not happen
     */
    if (dev->can_read()) {
-      Jmsg1(jcr, M_FATAL, 0, _("Device %s is busy reading.\n"), dev->print_name());
-      Dmsg1(200, "Device %s is busy reading.\n", dev->print_name());
+      Jmsg1(jcr, M_FATAL, 0, _("Want to append, but device %s is busy reading.\n"), dev->print_name());
+      Dmsg1(200, "Want to append but device %s is busy reading.\n", dev->print_name());
       goto get_out;
    }
 
@@ -351,9 +351,9 @@ DCR *acquire_device_for_append(DCR *dcr)
             free_unused_volume(dcr);
          }
          if (dev->num_writers != 0) {
-            Jmsg3(jcr, M_FATAL, 0, _("Wanted Volume \"%s\", but device %s is busy writing on \"%s\" .\n"), 
+            Jmsg3(jcr, M_FATAL, 0, _("Wanted to append to Volume \"%s\", but device %s is busy writing on \"%s\" .\n"), 
                  dcr->VolumeName, dev->print_name(), dev->VolHdr.VolumeName);
-            Dmsg3(200, "Wanted Volume \"%s\", but device %s is busy writing on \"%s\" .\n",  
+            Dmsg3(200, "Wanted to append to Volume \"%s\", but device %s is busy writing on \"%s\" .\n",  
                  dcr->VolumeName, dev->print_name(), dev->VolHdr.VolumeName);
             goto get_out;
          }

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 335e6355bdfef98ecaea5eea3ae36dbf08421ed4..11f819355bcefee7afdfa84370f567aa8cb6cadd 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.1.2"
-#define BDATE   "02 February 2007"
-#define LSMDATE "02Feb07"
+#define BDATE   "04 February 2007"
+#define LSMDATE "04Feb07"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2007 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2007"       /* year for copyright messages in progs */

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 6bdb1c64fca28f0d3455fbf646599548ca220022..6861a1461fef2d2f4e77acbb4a5747b0324c48b9 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,9 @@
               Technical notes on version 2.1
 
 General:
+04Feb07
+kes  Clarify some stored/acquire messages to indicate if the
+     problem is with read or append.
 02Feb07
 kes  Fix memory leak with storage ids in cats/sql_get.c
 kes  Terminate watchdog earlier to avoid reference to released