From cc2484e9132a8f82f7a828e52c3cf88d23072bd3 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 9 Jun 2007 09:25:27 +0000
Subject: [PATCH] kes  Unable to reproduce bug 872. However added additional
 testing for      integer. kes  Bug #874 resolved by documenting SQLite
 limitations. kes  Bug #882 resolved by documenting mtx-changer script for new
 drive code. kes  Bug #881 resolved by removing typo in mtx-changer script.
 kes  Made Frank Sweetser's wiki the official Bacula wiki with his     
 approval. Added a link to the wiki on the web page, and implemented      a
 backup from http://paramount.ind.wpi.edu

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5002 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/kernstodo              | 2 +-
 bacula/scripts/mtx-changer.in | 2 +-
 bacula/src/console/console.c  | 9 +++++++--
 bacula/src/stored/reserve.c   | 6 +++++-
 bacula/technotes-2.1          | 9 +++++++++
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/bacula/kernstodo b/bacula/kernstodo
index d35367a853..1ea763d039 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -1,5 +1,5 @@
                     Kern's ToDo List
-                     29 May 2007
+                     087 June 2007
 
 
 Document:
diff --git a/bacula/scripts/mtx-changer.in b/bacula/scripts/mtx-changer.in
index 1fe5f003be..59f3d42335 100644
--- a/bacula/scripts/mtx-changer.in
+++ b/bacula/scripts/mtx-changer.in
@@ -124,7 +124,7 @@ check_parm_count() {
     pCountNeed=$2
     if test $pCount -lt $pCountNeed; then
 	echo "usage: mtx-changer ctl-device command [slot archive-device drive-index]"
-	echo "	Insufficient number of arguments arguments given."
+	echo "	Insufficient number of arguments given."
 	if test $pCount -lt 2; then
 	    echo "  Mimimum usage is first two arguments ..."
 	else
diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
index 443100b74d..c691c2316f 100644
--- a/bacula/src/console/console.c
+++ b/bacula/src/console/console.c
@@ -463,14 +463,19 @@ try_again:
       LockRes();
       numdir = 0;
       foreach_res(dir, R_DIRECTOR) {
-         senditf( _("%d  %s at %s:%d\n"), 1+numdir++, dir->hdr.name, dir->address,
+         senditf( _("%2d:  %s at %s:%d\n"), 1+numdir++, dir->hdr.name, dir->address,
             dir->DIRport);
       }
       UnlockRes();
-      if (get_cmd(stdin, _("Select Director: "), UA_sock, 600) < 0) {
+      if (get_cmd(stdin, _("Select Director by entering a number: "), UA_sock, 600) < 0) {
          (void)WSACleanup();               /* Cleanup Windows sockets */
          return 1;
       }
+      if (!is_a_number(UA_sock->msg)) {
+         senditf(_("%s is not a number. You must enter a number between 1 and %d\n"), 
+                 UA_sock->msg, numdir);
+         goto try_again;
+      }
       item = atoi(UA_sock->msg);
       if (item < 0 || item > numdir) {
          senditf(_("You must enter a number between 1 and %d\n"), numdir);
diff --git a/bacula/src/stored/reserve.c b/bacula/src/stored/reserve.c
index 3ca6ba53f1..cec631d9b2 100644
--- a/bacula/src/stored/reserve.c
+++ b/bacula/src/stored/reserve.c
@@ -801,6 +801,7 @@ bool find_suitable_device_for_job(JCR *jcr, RCTX &rctx)
        *   we can take note and act accordingly (probably redo the 
        *   search at least a few times).
        */
+      Dmsg1(dbglvl, "JobId=%u duplicate vol list\n", (int)rctx.jcr->JobId);
       temp_vol_list = New(dlist(vol, &vol->link));
       foreach_dlist(vol, vol_list) {
          VOLRES *nvol;
@@ -862,9 +863,12 @@ bool find_suitable_device_for_job(JCR *jcr, RCTX &rctx)
       vol_list = temp_vol_list;
       free_volume_list();                  /* release temp_vol_list */
       vol_list = save_vol_list;
+      Dmsg1(dbglvl, "JobId=%u deleted temp vol list\n", (int)rctx.jcr->JobId);
       unlock_volumes();
    }
    if (ok) {
+      Dmsg2(dbglvl, "JobId=%u got vol %s in reserved volums list\n", (int)rctx.jcr->JobId,
+            rctx.VolumeName);
       return true;
    }
 
@@ -979,7 +983,7 @@ static int reserve_device(RCTX &rctx)
    const int name_len = MAX_NAME_LENGTH;
 
    /* Make sure MediaType is OK */
-   Dmsg3(dbglvl, "JobId=%u MediaType device=%s request=%s\n",
+   Dmsg3(dbglvl, "JobId=%u chk MediaType device=%s request=%s\n",
          (int)rctx.jcr->JobId,
          rctx.device->media_type, rctx.store->media_type);
    if (strcmp(rctx.device->media_type, rctx.store->media_type) != 0) {
diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index f1d05ff2d8..4a0d7a6473 100644
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,15 @@
               Technical notes on version 2.1
 
 General:
+09Jun07
+kes  Unable to reproduce bug 872. However added additional testing for
+     integer.
+kes  Bug #874 resolved by documenting SQLite limitations.
+kes  Bug #882 resolved by documenting mtx-changer script for new drive code.
+kes  Bug #881 resolved by removing typo in mtx-changer script.
+kes  Made Frank Sweetser's wiki the official Bacula wiki with his
+     approval. Added a link to the wiki on the web page, and implemented
+     a backup from http://paramount.ind.wpi.edu                                          
 08Jun07
 kes  Fix update allfrompool to pass pool name.
 07Jun07
-- 
2.39.5