using the right restore command.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1324 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/wx-console/TODO b/bacula/src/wx-console/TODO
index 509558368d4db0222ba29e3e0e5777c7645abe3a..5f0b13a20c27e2139fa4cc7f5180c5c7333bdb4d 100644 (file)
--- a/bacula/src/wx-console/TODO
+++ b/bacula/src/wx-console/TODO
@@ -9,7 +9,11 @@ wxbMainFrame : Add some text in front of the command window such as
    
 wxbRestorePanel : Reconsider start button's labels.
 
-wxbRestorePanel : Implement cancel button when configuring
+wxbRestorePanel : Implement cancel button when first configuring
+
+wxbRestorePanel : Change defaults values when Job Name changes (first configure)
+
+wxbRestorePanel : Add titles to configuration panel
 
 general : Show nice messages when errors occurs.
 

diff --git a/bacula/src/wx-console/wxbrestorepanel.cpp b/bacula/src/wx-console/wxbrestorepanel.cpp
index 27a3af232d8650eb455cfb0e0622187227fb7640..3a571ef953e32a4a5fdd2a8956e50e08da2c8077 100644 (file)
--- a/bacula/src/wx-console/wxbrestorepanel.cpp
+++ b/bacula/src/wx-console/wxbrestorepanel.cpp
@@ -529,18 +529,23 @@ void wxbRestorePanel::CmdStart() {
       }*/
       wxbMainFrame::GetInstance()->SetStatusText("Building restore tree...");
       
-      WaitForPrompt("restore\n");
+      WaitForPrompt(wxString("restore") <<
+         " client=\"" << configPanel->GetRowString("Client") <<
+         "\" fileset=\"" << configPanel->GetRowString("Fileset") <<
+         "\" pool=\"" << configPanel->GetRowString("Pool") <<
+         "\" storage=\"" << configPanel->GetRowString("Storage") << "\"\n");
       WaitForPrompt("6\n");
-      wxbPromptParser *pp = WaitForPrompt(wxString() << configPanel->GetRowString("Before") << "\n", true);
+      //WaitForEnd();
+      /*wxbPromptParser *pp = WaitForPrompt(wxString() << configPanel->GetRowString("Before") << "\n", true);
       int client = pp->getChoices()->Index(configPanel->GetRowString("Client"));
       if (client == wxNOT_FOUND) {
          wxbMainFrame::GetInstance()->SetStatusText("Failed to find the selected client.");
          return;
       }
-      delete pp;
+      delete pp;*/
       
       wxbDataTokenizer* dt = new wxbDataTokenizer(true);
-      wxbTableParser* tableparser = CreateAndWaitForParser(wxString() << client << "\n");
+      wxbTableParser* tableparser = CreateAndWaitForParser(wxString() << configPanel->GetRowString("Before") << "\n");
       int tot = 0;
       long l;
       wxString str;