There was an issue with empty directories. The director would print

[bacula/bacula] / bacula / src / qt-console / pages.cpp

diff --git a/bacula/src/qt-console/pages.cpp b/bacula/src/qt-console/pages.cpp
index d8da0986caa933fe9cf5800235ecb198fb815987..2767a584ee40a06d9a4710a4a473c6027dca6680 100644 (file)
--- a/bacula/src/qt-console/pages.cpp
+++ b/bacula/src/qt-console/pages.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -20,7 +20,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -31,18 +31,26 @@
  *   Dirk Bartley, March 2007
  */
 
-#include "pages.h"
 #include "bat.h"
+#include "pages.h"
 
 /* A global function */
 bool isWin32Path(QString &fullPath) 
 {
-   char *buf = fullPath.left(2).toUtf8().data();
+   if (fullPath.size()<2) {
+      return false;
+   }
 
-   return buf[1] == ':' && B_ISALPHA(buf[0]);
+   bool toret = fullPath[1].toAscii() == ':' && fullPath[0].isLetter();
+   if (mainWin->m_miscDebug) {
+      if (toret)
+         Pmsg1(000, "returning from isWin32Path true %s\n", fullPath.toUtf8().data());
+      else
+         Pmsg1(000, "returning from isWin32Path false %s\n", fullPath.toUtf8().data());
+   }
+   return toret;
 }
 
-
 /*
  * dockPage
  * This function is intended to be called from within the Pages class to pull
@@ -179,11 +187,19 @@ void Pages::closeStackPage()
  */
 void Pages::pgInitialize()
 {
-   pgInitialize(NULL);
+   pgInitialize(QString(), NULL);
 }
 
-void Pages::pgInitialize(QTreeWidgetItem *parentTreeWidgetItem)
+void Pages::pgInitialize(const QString &name)
 {
+   pgInitialize(name, NULL);
+}
+
+void Pages::pgInitialize(const QString &tname, QTreeWidgetItem *parentTreeWidgetItem)
+{
+   if (tname.size()) {
+      m_name = tname;
+   }
    m_parent = mainWin->stackedWidget;
    m_console = mainWin->currentConsole();
 
@@ -214,20 +230,18 @@ void Pages::treeWidgetName(QString &name)
  */
 void Pages::consoleCommand(QString &command)
 {
-   /*if (!m_console->is_connectedGui())
-       return;*/
-   if (!m_console->preventInUseConnect()) {
-       return;
+   int conn;
+   bool donotify = false;
+   if (m_console->availableDirComm(conn))  {
+      if (m_console->is_notify_enabled(conn)) {
+         donotify = true;
+         m_console->notify(conn, false);
+      }
+      consoleCommand(command, conn);
+      if (donotify) { m_console->notify(conn, true); }
    }
-   consoleInput(command);
 }
-
-/*
- * Function to simplify executing a console command, but does not
- *  check for the connection in use.  We need this so that we can
- *  *always* enter command from the command line.
- */
-void Pages::consoleInput(QString &command)
+void Pages::consoleCommand(QString &command, int conn)
 {
    /* Bring this director's console to the front of the stack */
    setConsoleCurrent();
@@ -235,8 +249,10 @@ void Pages::consoleInput(QString &command)
    displayhtml += command + "</font>\n";
    m_console->display_html(displayhtml);
    m_console->display_text("\n");
-   m_console->write_dir(command.toUtf8().data());
-   m_console->displayToPrompt();
+   mainWin->waitEnter();
+   m_console->write_dir(conn, command.toUtf8().data(), false);
+   m_console->displayToPrompt(conn);
+   mainWin->waitExit();
 }
 
 /*
@@ -320,3 +336,41 @@ void Pages::setTreeWidgetItemDockColor()
       }
    }
 }
+
+/* Function to get a list of volumes */
+void Pages::getVolumeList(QStringList &volumeList)
+{
+   QString query("SELECT VolumeName AS Media FROM Media ORDER BY Media");
+   if (mainWin->m_sqlDebug) {
+      Pmsg1(000, "Query cmd : %s\n",query.toUtf8().data());
+   }
+   QStringList results;
+   if (m_console->sql_cmd(query, results)) {
+      QString field;
+      QStringList fieldlist;
+      /* Iterate through the lines of results. */
+      foreach (QString resultline, results) {
+         fieldlist = resultline.split("\t");
+         volumeList.append(fieldlist[0]);
+      } /* foreach resultline */
+   } /* if results from query */
+}
+
+/* Function to get a list of volumes */
+void Pages::getStatusList(QStringList &statusLongList)
+{
+   QString statusQuery("SELECT JobStatusLong FROM Status");
+   if (mainWin->m_sqlDebug) {
+      Pmsg1(000, "Query cmd : %s\n",statusQuery.toUtf8().data());
+   }
+   QStringList statusResults;
+   if (m_console->sql_cmd(statusQuery, statusResults)) {
+      QString field;
+      QStringList fieldlist;
+      /* Iterate through the lines of results. */
+      foreach (QString resultline, statusResults) {
+         fieldlist = resultline.split("\t");
+         statusLongList.append(fieldlist[0]);
+      } /* foreach resultline */
+   } /* if results from statusquery */
+}