Oops. When I changed the contents of the field earlier, I forgot to make this change

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

diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp
index 269c423066f723d066d9731a3101048760ed8990..f3e3ae4577eab9fb48e12721d91c410678cd96e2 100644 (file)
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2008 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.
@@ -34,7 +34,6 @@
  *
  */ 
 
-//#include <QAbstractEventDispatcher>
 #include "bat.h"
 #include "console.h"
 #include "restore.h"
@@ -104,6 +103,9 @@ void Console::poll_messages()
 void Console::terminate()
 {
    if (m_sock) {
+      notify(false);
+      delete m_notifier;
+      m_notifier = NULL;
       stopTimer();
       m_sock->close();
       m_sock = NULL;
@@ -115,22 +117,25 @@ void Console::terminate()
  */
 void Console::connect_dir()
 {
-   JCR jcr;
+   JCR *jcr = new JCR;
    utime_t heart_beat;
    char buf[1024];
+   CONRES *cons;
+      
+   buf[0] = 0;
 
    m_textEdit = textEdit;   /* our console screen */
 
    if (!m_dir) {          
       mainWin->set_status("No Director found.");
-      return;
+      goto bail_out;
    }
    if (m_sock) {
       mainWin->set_status("Already connected.");
-      return;
+      goto bail_out;
    }
 
-   memset(&jcr, 0, sizeof(jcr));
+   memset(jcr, 0, sizeof(JCR));
 
    mainWin->set_statusf(_("Connecting to Director %s:%d"), m_dir->address, m_dir->DIRport);
    display_textf(_("Connecting to Director %s:%d\n\n"), m_dir->address, m_dir->DIRport);
@@ -140,7 +145,7 @@ void Console::connect_dir()
    
    LockRes();
    /* If cons==NULL, default console will be used */
-   CONRES *cons = (CONRES *)GetNextRes(R_CONSOLE, NULL);
+   cons = (CONRES *)GetNextRes(R_CONSOLE, NULL);
    UnlockRes();
 
    /* Initialize Console TLS context once */
@@ -160,7 +165,7 @@ void Console::connect_dir()
       if (!cons->tls_ctx) {
          display_textf(_("Failed to initialize TLS context for Console \"%s\".\n"),
             m_dir->name());
-         return;
+         goto bail_out;
       }
    }
 
@@ -181,7 +186,7 @@ void Console::connect_dir()
          display_textf(_("Failed to initialize TLS context for Director \"%s\".\n"),
             m_dir->name());
          mainWin->set_status("Connection failed");
-         return;
+         goto bail_out;
       }
    }
 
@@ -198,7 +203,7 @@ void Console::connect_dir()
                           NULL, m_dir->DIRport, 0);
    if (m_sock == NULL) {
       mainWin->set_status("Connection failed");
-      return;
+      goto bail_out;
    } else {
       /* Update page selector to green to indicate that Console is connected */
       mainWin->actionConnect->setIcon(QIcon(":images/connected.png"));
@@ -207,12 +212,13 @@ void Console::connect_dir()
       item->setForeground(0, greenBrush);
    }
 
-   jcr.dir_bsock = m_sock;
+   jcr->dir_bsock = m_sock;
 
-   if (!authenticate_director(&jcr, m_dir, cons, buf, sizeof(buf))) {
+   if (!authenticate_director(jcr, m_dir, cons, buf, sizeof(buf))) {
       display_text(buf);
-      return;
+      goto bail_out;
    }
+
    if (buf[0]) {
       display_text(buf);
    }
@@ -250,6 +256,9 @@ void Console::connect_dir()
 
    mainWin->set_status(_("Connected"));
    startTimer();                      /* start message timer */
+
+bail_out:
+   delete jcr;
    return;
 }
 
@@ -611,21 +620,25 @@ int Console::read()
             m_messages_pending = false;
          }
       }
+      m_sock->msg[0] = 0;
       stat = m_sock->recv();
       if (stat >= 0) {
+         if (mainWin->m_commDebug) Pmsg1(000, "got: %s\n", m_sock->msg);
          if (m_at_prompt) {
             display_text("\n");
             m_at_prompt = false;
             m_at_main_prompt = false;
          }
-         if (mainWin->m_commDebug) Pmsg1(000, "got: %s", m_sock->msg);
       }
       switch (m_sock->msglen) {
-      case BNET_MSGS_PENDING:
-         if (mainWin->m_commDebug) Pmsg0(000, "MSGS PENDING\n");
-         write_dir(".messages");
-         displayToPrompt();
-         m_messages_pending = false;
+      case BNET_MSGS_PENDING :
+         if (m_notifier->isEnabled()) {
+            if (mainWin->m_commDebug) Pmsg0(000, "MSGS PENDING\n");
+            write_dir(".messages");
+            displayToPrompt();
+            m_messages_pending = false;
+         }
+         m_messages_pending = true;
          continue;
       case BNET_CMD_OK:
          if (mainWin->m_commDebug) Pmsg0(000, "CMD OK\n");
@@ -671,10 +684,21 @@ int Console::read()
          if (mainWin->m_commDebug) Pmsg0(000, "START SELECT\n");
          new selectDialog(this);    
          break;
+      case BNET_YESNO:
+         if (mainWin->m_commDebug) Pmsg0(000, "YESNO\n");
+         new yesnoPopUp(this);
+         break;
       case BNET_RUN_CMD:
          if (mainWin->m_commDebug) Pmsg0(000, "RUN CMD\n");
          new runCmdPage();
          break;
+      case BNET_START_RTREE:
+         if (mainWin->m_commDebug) Pmsg0(000, "START RTREE CMD\n");
+         new restorePage();
+         break;
+      case BNET_END_RTREE:
+         if (mainWin->m_commDebug) Pmsg0(000, "END RTREE CMD\n");
+         break;
       case BNET_ERROR_MSG:
          if (mainWin->m_commDebug) Pmsg0(000, "ERROR MSG\n");
          m_sock->recv();              /* get the message */
@@ -849,3 +873,41 @@ void Console::consoleReload()
    QString cmd("reload");
    consoleCommand(cmd);
 }
+
+/* Function to get a list of volumes */
+void Console::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 (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 Console::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 (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 */
+}