Some Win32 fixes

[bacula/bacula] / bacula / src / wx-console / wxbutils.cpp

diff --git a/bacula/src/wx-console/wxbutils.cpp b/bacula/src/wx-console/wxbutils.cpp
index 0c1c65b16cf3d449929e1db3813e5d0514aa9857..7e93bb6cf9d27389d90e0193045098d1a6013ea1 100644 (file)
--- a/bacula/src/wx-console/wxbutils.cpp
+++ b/bacula/src/wx-console/wxbutils.cpp
@@ -2,7 +2,7 @@
  *
  *   wxbDataParser, class that receives and analyses data
  *
- *    Nicolas Boichat, April 2004
+ *    Nicolas Boichat, April-July 2004
  *
  */
 /*
@@ -29,6 +29,92 @@
 
 #include "csprint.h"
 
+#include "wxbtableparser.h"
+
+/* A macro named Yield is defined under MinGW */
+#undef Yield
+
+bool wxbUtils::inited = false;
+
+/* Initialization */
+void wxbUtils::Init() {
+   inited = true;
+}
+
+/* Reset state */
+void wxbUtils::Reset() {
+   inited = false;
+}
+
+/* Parse a table in tableParser */
+wxbTableParser* wxbUtils::CreateAndWaitForParser(wxString cmd) {
+   wxbTableParser* tableParser = new wxbTableParser();
+
+   wxbMainFrame::GetInstance()->Send(cmd);
+
+   //time_t base = wxDateTime::Now().GetTicks();
+   while (!tableParser->hasFinished()) {
+      //innerThread->Yield();
+      wxTheApp->Yield(true);
+      ::wxUsleep(100);
+      //if (base+15 < wxDateTime::Now().GetTicks()) break;
+   }
+   return tableParser;
+}
+
+/* Run a command, and waits until prompt result is fully received,
+ * if keepresults is true, returns a valid pointer to a wxbPromptParser
+ * containing the data. */
+wxbPromptParser* wxbUtils::WaitForPrompt(wxString cmd, bool keepresults) {
+   wxbPromptParser* promptParser = new wxbPromptParser();
+   
+   wxbMainFrame::GetInstance()->Send(cmd);
+    
+   //time_t base = wxDateTime::Now().GetTicks();
+   while (!promptParser->hasFinished()) {
+      //innerThread->Yield();
+      wxTheApp->Yield(true);
+      ::wxUsleep(100);
+      //if (base+15 < wxDateTime::Now().GetTicks()) break;
+   }
+     
+   if (keepresults) {
+      return promptParser;
+   }
+   else {
+      delete promptParser;
+      return NULL;
+   }  
+}
+
+/* Run a command, and waits until result is fully received. */
+wxbDataTokenizer* wxbUtils::WaitForEnd(wxString cmd, bool keepresults, bool linebyline) {
+   wxbDataTokenizer* datatokenizer = new wxbDataTokenizer(linebyline);
+
+   wxbMainFrame::GetInstance()->Send(cmd);
+   
+   //wxbMainFrame::GetInstance()->Print("(<WFE)", CS_DEBUG);
+   
+   //time_t base = wxDateTime::Now().GetTicks();
+   while (!datatokenizer->hasFinished()) {
+      //innerThread->Yield();
+      wxTheApp->Yield(true);
+      ::wxUsleep(100);
+      //if (base+15 < wxDateTime::Now().GetTicks()) break;
+   }
+   
+   //wxbMainFrame::GetInstance()->Print("(>WFE)", CS_DEBUG);
+   
+   if (keepresults) {
+      return datatokenizer;
+   }
+   else {
+      delete datatokenizer;
+      return NULL;
+   }
+}
+
+
 /* Creates a new wxbDataParser, and register it in wxbMainFrame */
 wxbDataParser::wxbDataParser(bool lineanalysis) {
    wxbMainFrame::GetInstance()->Register(this);
@@ -63,7 +149,7 @@ bool wxbDataParser::Print(wxString str, int status) {
       }
       else {
          wxStringTokenizer tkz(str, "\n", 
-            wxTOKEN_RET_DELIMS | wxTOKEN_RET_EMPTY | wxTOKEN_RET_EMPTY_ALL);
+            (wxStringTokenizerMode)(wxTOKEN_RET_DELIMS | wxTOKEN_RET_EMPTY | wxTOKEN_RET_EMPTY_ALL));
    
          while ( tkz.HasMoreTokens() ) {
             buffer << tkz.GetNextToken();
@@ -130,6 +216,7 @@ wxbPromptParser::wxbPromptParser(): wxbDataParser(false) {
    prompt = false;
    introStr = "";
    choices = NULL;
+   numerical = false;
    questionStr = "";
 }
 
@@ -151,6 +238,7 @@ bool wxbPromptParser::Analyse(wxString str, int status) {
          if (choices) {
             delete choices;
             choices = NULL;
+            numerical = false;
          }
          questionStr = "";
          introStr = "";
@@ -162,12 +250,14 @@ bool wxbPromptParser::Analyse(wxString str, int status) {
          if (!choices) {
             choices = new wxArrayString();
             choices->Add(""); /* index 0 is never used by multiple choice questions */
+            numerical = true;
          }
          
-         if (choices->GetCount() != num) { /* new choice has begun */
+         if ((long)choices->GetCount() != num) { /* new choice has begun */
             delete choices;
-            choices = new wxArrayString(num);
+            choices = new wxArrayString();
             choices->Add("", num); /* fill until this number */
+            numerical = true;
          }
          
          choices->Add(str.Mid(i+2).RemoveLast());
@@ -184,19 +274,29 @@ bool wxbPromptParser::Analyse(wxString str, int status) {
    else {
       finished = ((status == CS_PROMPT) || (status == CS_END) || (status == CS_DISCONNECTED));
       if (prompt = ((status == CS_PROMPT) && (questionStr != "$ "))) { // && (str.Find(": ") == str.Length())
+         if (introStr.Last() == '\n') {
+            introStr.RemoveLast();
+         }
          if ((introStr != "") && (questionStr == "")) {
             questionStr = introStr;
             introStr = "";
          }
-         if (introStr.Last() == '\n') {
-            introStr.RemoveLast();
+         
+         if ((!choices) && (questionStr.Find("(yes/mod/no)") > -1)) {
+            choices = new wxArrayString();
+            choices->Add("yes");
+            choices->Add("mod");
+            choices->Add("no");
+            numerical = false;
          }
+         
          return true;
       }
       else { /* ended or (dis)connected */
          if (choices) {
             delete choices;
             choices = NULL;
+            numerical = false;
          }
          questionStr = "";
          introStr = "";
@@ -226,9 +326,16 @@ wxString wxbPromptParser::getQuestionString() {
    return questionStr;
 }
 
-/* Return a wxArrayString containing the indexed choices we have
+/* Returns a wxArrayString containing the indexed choices we have
  * to answer the question, or NULL if this question is not a multiple
  * choice one. */
 wxArrayString* wxbPromptParser::getChoices() {
    return choices;
 }
+
+/* Returns true if the expected answer to the choice list is a number,
+ * false if it is a string (for example yes/mod/no). */
+bool wxbPromptParser::isNumericalChoice() {
+   return numerical;
+}
+