First cut of bat rerun a Job from Jobs Run

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

diff --git a/bacula/src/qt-console/run/runcmd.cpp b/bacula/src/qt-console/run/runcmd.cpp
index ce1f7d582012ee9a857c77e45a46ca9effd5fb94..6b21a4b46da3b5fe45ac6b71533be9f1fb029840 100644 (file)
--- a/bacula/src/qt-console/run/runcmd.cpp
+++ b/bacula/src/qt-console/run/runcmd.cpp
@@ -1,12 +1,12 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2010 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.
    This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
+   modify it under the terms of version three of the GNU Affero General Public
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
@@ -15,7 +15,7 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
@@ -37,7 +37,6 @@
  *
  *   Kern Sibbald, March MMVII
  *
- *  $Id$
  */ 
 
 #include "bat.h"
@@ -46,21 +45,22 @@
 /*
  * Setup all the combo boxes and display the dialog
  */
-runCmdPage::runCmdPage()
+runCmdPage::runCmdPage(int conn)
 {
    m_name = tr("Restore Run");
    pgInitialize();
    setupUi(this);
    QTreeWidgetItem* thisitem = mainWin->getFromHash(this);
    thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/restore.png")));
-   m_conn = m_console->notifyOff();
+   m_conn = conn;
+   m_console->notify(conn, false);
 
    fill();
    m_console->discardToPrompt(m_conn);
 
    connect(okButton, SIGNAL(pressed()), this, SLOT(okButtonPushed()));
    connect(cancelButton, SIGNAL(pressed()), this, SLOT(cancelButtonPushed()));
-   dockPage();
+   //dockPage();
    setCurrent();
    this->show();
 
@@ -83,15 +83,15 @@ void runCmdPage::fill()
    m_console->read(m_conn);
    item = m_console->msg(m_conn);
    items = item.split("\n");
-   label->setText(items[0]);
-   Dmsg1(200, "Title=%s\n", items[0].toUtf8().data());
-   items.removeFirst();               /* remove title */
    foreach(item, items) {
       rx.indexIn(item);
       val = rx.cap(1);
-      Dmsg1(200, "Item=%s\n", item.toUtf8().data());
-      Dmsg1(200, "Value=%s\n", val.toUtf8().data());
+      Dmsg1(000, "Item=%s\n", item.toUtf8().data());
+      Dmsg1(000, "Value=%s\n", val.toUtf8().data());
 
+      if (item.startsWith("Title:")) {
+         run->setText(val);
+      }
       if (item.startsWith("JobName:")) {
          jobCombo->addItem(val);
          continue;
@@ -160,7 +160,7 @@ void runCmdPage::okButtonPushed()
    displayhtml += cmd + "</font>\n";
    m_console->display_html(displayhtml);
    m_console->display_text("\n");
-   m_console->write_dir(cmd.toUtf8().data());
+   m_console->write_dir(m_conn, cmd.toUtf8().data());
    m_console->displayToPrompt(m_conn);
 //   consoleCommand(cmd); ***FIXME set back to consoleCommand when connection issue is resolved