Changeset 7420 in orxonox.OLD

Timestamp:

Apr 28, 2006, 2:22:26 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Completion and execution is ok now

File:

• trunk/src/lib/shell/shell_command.cc (modified) (5 diffs)

trunk/src/lib/shell/shell_command.cc

@@ -98 +98 @@
       for (cmd = cmdClass->commandList.begin(); cmd < cmdClass->commandList.end(); cmd++)
         if (commandName == (*cmd)->getName())
+        {
           delete (*cmd);
+          break;
+        }
     }
   }
@@ -244 +247 @@
       {
         for (bo = objectList->begin(); bo != objectList->end(); bo++)
-          if ((*bo)->getName() != NULL && nocaseCmp(objectDescriptor, (*bo)->getName(), objectDescriptor.size()))
+          if ((*bo)->getName() != NULL && !nocaseCmp(objectDescriptor, (*bo)->getName(), objectDescriptor.size()))
             boList->push_back(*bo);
       }
@@ -274 +277 @@
   bool ShellCommand::execute(const std::string& executionString)
   {
+    SubString inputSplits(executionString, SubString::WhiteSpacesWithComma);
+
+    // if we do not have any input return
+    if (inputSplits.empty())
+      return false;
+
+    unsigned int paramBegin;
+    const ShellCommand* sc;
+    std::vector<BaseObject*> boList;
+    sc = getCommandFromInput(inputSplits, paramBegin, &boList);
+    if (sc != NULL)
+    {
+      PRINT(0)("Command %s on ", sc->getName());
+      for(std::vector<BaseObject*>::const_iterator bo = boList.begin(); bo != boList.end(); ++bo)
+      {
+        PRINT(0)("%s::%s\n", (*bo)->getClassName(), (*bo)->getName());
+        (*sc->executor)((*bo), inputSplits.getSubSet(paramBegin).join());
+      }
+      return true;
+    }
+    return false;
+
+
+    /*
     long classID = CL_NULL;                      //< the classID retrieved from the Class.
     ShellCommandClass* commandClass = NULL;      //< the command class this command applies to.
@@ -281 +308 @@
     //  long completeType = SHELLC_NONE;           //< the Type we'd like to complete.
 
-    SubString inputSplits(executionString, SubString::WhiteSpacesWithComma);
-
-    // if we do not have any input return
-    if (inputSplits.empty())
-      return false;
-
-    unsigned int paramBegin;
-    const ShellCommand* sc;
-    std::vector<BaseObject*> boList;
-    sc = getCommandFromInput(inputSplits, paramBegin, &boList);
-    if (sc != NULL)
-    {
-      PRINT(0)("Command %s on ", sc->getName());
-      for(std::vector<BaseObject*>::const_iterator bo = boList.begin(); bo != boList.end(); ++bo)
-        PRINT(0)("%s::%s\n", (*bo)->getClassName(), (*bo)->getName());
-    }
+
 
     // if we only have one input (!MUST BE AN ALIAS)
@@ -374 +386 @@
     }
     return false;
+    */
   }