Fix update_postgresql_tables 10 to 11

[bacula/bacula] / bacula / scripts / mtx-changer.in

diff --git a/bacula/scripts/mtx-changer.in b/bacula/scripts/mtx-changer.in
index 1992e1843d85c0f9d3a9c7908649cf6ea85e3313..fe23051edf93bb8b2584f5fe4194a3af72d00cde 100644 (file)
--- a/bacula/scripts/mtx-changer.in
+++ b/bacula/scripts/mtx-changer.in
@@ -2,8 +2,6 @@
 #
 # Bacula interface to mtx autoloader
 #
-#  $Id$
-#
 #  If you set in your Device resource
 #
 #  Changer Command = "path-to-this-script/mtx-changer %c %o %S %a %d"
@@ -30,7 +28,7 @@
 #      loaded            which slot is loaded?
 #      list              list Volume names (requires barcode reader)
 #      slots             how many slots total?
-#      listall            list all info
+#      listall           list all info
 #      transfer
 #
 #  Slots are numbered from 1 ...
@@ -49,6 +47,12 @@
 #
 
 # source our conf file
+if test ! -f @scriptdir@/mtx-changer.conf ; then
+  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+  echo "ERROR: @scriptdir@/mtx-changer.conf file not found!!!!"
+  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+  exit 1
+fi
 . @scriptdir@/mtx-changer.conf
 
 MTX=@MTX@
@@ -72,12 +76,35 @@ make_temp_file() {
   if test x${TMPFILE} = x; then
      TMPFILE="@working_dir@/mtx.$$"
      if test -f ${TMPFILE}; then
-       echo "Temp file security problem on: ${TMPFILE}"
+       echo "ERROR: Temp file security problem on: ${TMPFILE}"
        exit 1
      fi
   fi
 }
 
+#
+#  Create a temporary file for stderr
+#
+#  Note, this file is used because sometime mtx emits
+#  unexpected error messages followed by the output
+#  expected during success.
+#  So we separate STDOUT and STDERR in
+#  certain of the mtx commands. The contents of STDERR
+#  is then printed after the STDOUT produced by mtx
+#  thus we sometimes get better changer results. 
+#
+make_err_file() {
+  ERRFILE=`mktemp @working_dir@/mtx.err.XXXXXXXXXX`
+  if test x${ERRFILE} = x; then
+     ERRFILE="@working_dir@/mtx.err.$$"
+     if test -f ${ERRFILE}; then
+       echo "ERROR: Temp file security problem on: ${ERRFILE}"
+       exit 1
+     fi
+  fi
+}
+
+
 #
 # The purpose of this function to wait a maximum 
 #   time for the drive. It will
@@ -107,7 +134,7 @@ check_parm_count() {
     pCount=$1
     pCountNeed=$2
     if test $pCount -lt $pCountNeed; then
-       echo "usage: mtx-changer ctl-device command [slot archive-device drive-index]"
+       echo "ERROR: usage: mtx-changer ctl-device command [slot archive-device drive-index]"
        echo "  Insufficient number of arguments given."
        if test $pCount -lt 2; then
            echo "  Mimimum usage is first two arguments ..."
@@ -129,8 +156,8 @@ case $2 in
        check_parm_count $# 2
        ;;
     transfer)
-        check_parm_count $# 4
-        ;;
+       check_parm_count $# 4
+       ;;
     *)
        check_parm_count $# 5
        ;;
@@ -156,17 +183,25 @@ case $cmd in
       if test ${offline_sleep} -ne 0 ; then
        sleep ${offline_sleep}
       fi
-      ${MTX} -f $ctl unload $slot $drive
+      make_err_file
+      ${MTX} -f $ctl unload $slot $drive 2>${ERRFILE}
+      rtn=$?
+      cat ${ERRFILE}
+      rm -f ${ERRFILE} >/dev/null 2>&1
+      exit $rtn
       ;;
 
    load)
       debug "Doing mtx -f $ctl load $slot $drive"
-      ${MTX} -f $ctl load $slot $drive
+      make_err_file
+      ${MTX} -f $ctl load $slot $drive 2>${ERRFILE}
       rtn=$?
       if test ${load_sleep} -ne 0 ; then
        sleep ${load_sleep}
       fi
       wait_for_drive $device
+      cat ${ERRFILE}
+      rm -f ${ERRFILE} >/dev/null 2>&1
       exit $rtn
       ;;
 
@@ -188,7 +223,22 @@ case $cmd in
       exit $rtn
       ;;
 
-   listall) 
+   listall)
+#  Drive content:        D:Drive num:F:Slot loaded:Volume Name
+#  D:0:F:2:vol2        or D:Drive num:E
+#  D:1:F:42:vol42   
+#  D:3:E
+# 
+#  Slot content:
+#  S:1:F:vol1            S:Slot num:F:Volume Name
+#  S:2:E              or S:Slot num:E
+#  S:3:F:vol4
+# 
+#  Import/Export tray slots:
+#  I:10:F:vol10          I:Slot num:F:Volume Name
+#  I:11:E             or I:Slot num:E
+#  I:12:F:vol40
+ 
       debug "Doing mtx -f $ctl -- to list all"
       make_temp_file
       if test ${inventory} -ne 0 ; then
@@ -196,7 +246,7 @@ case $cmd in
       fi
       ${MTX} -f $ctl status >${TMPFILE}
       rtn=$?
-      # can be converted to awk+sed+cut, contributions are welcome
+      # can be converted to awk+sed+cut, see below
       perl -ne '
 /Data Transfer Element (\d+):Empty/ && print "D:$1:E\n";
 /Data Transfer Element (\d+):Full \(Storage Element (\d+) Loaded\)(:VolumeTag =\s*(.+))?/ && print "D:$1:F:$2:$4\n";
@@ -204,6 +254,11 @@ case $cmd in
 /Storage Element (\d+):Full( :VolumeTag=(.+))?/ && print "S:$1:F:$3\n";
 /Storage Element (\d+) IMPORT.EXPORT:Empty/ && print "I:$1:E\n";
 /Storage Element (\d+) IMPORT.EXPORT:Full( :VolumeTag=(.+))?/ && print "I:$1:F:$3\n";' ${TMPFILE}
+      # If perl isn't installed, you can use by those commands
+#cat ${TMPFILE} | grep "Data Transfer Element" | awk "{print \"D:\"\$4 \$7 \$9 \$10}" | sed "s/=/:/" | sed "s/Full/F:/" | sed "s/Empty/E/"
+#cat ${TMPFILE} | grep -v "Data Transfer Element" | grep "Storage Element" | grep -v "IMPORT/EXPORT" | awk "{print \"S:\"\$3 \$4 \$5}" | sed "s/IMPORT\/EXPORT//" | sed "s/Full *:VolumeTag=/F:/" | sed "s/Empty/E/"
+#cat ${TMPFILE} | grep -v "Data Transfer Element" | grep "Storage Element" | grep "IMPORT/EXPORT" | awk "{print \"I:\"\$3 \$4 \$5}" | sed "s/IMPORT\/EXPORT//" | sed "s/Full *:VolumeTag=/F:/" | sed "s/Empty/E/" 
+
       rm -f ${TMPFILE} >/dev/null 2>&1
       exit $rtn
       ;;