Changeset 14126 for trunk/FACT++/src/RemoteControl.cc

Timestamp:

06/08/12 18:05:57 (12 years ago)

Author:

tbretz

Message:

Removed the DimNetwork; implemented the JavaScript interpreter.

File:

• trunk/FACT++/src/RemoteControl.cc (modified) (3 diffs)

trunk/FACT++/src/RemoteControl.cc

@@ -49 +49 @@
 
     // If we have not cd'ed to a server show only the line start
-    if (fCurrentServer.empty())
+    if (fCurrentServer.empty() || !fImp)
         return beg + "> ";
 
     // Check if we have cd'ed to a valid server
-    const ClientList::const_iterator l = fClientList.find(fCurrentServer);
-    if (l==fClientList.end())
+    const pair<int32_t, string> state = fImp->GetServerState(fCurrentServer);
+    if (state.first==-256)
         return beg + "> ";
-
-    const State state = GetState(fCurrentServer, l->second->GetState());
 
     // The server
@@ -63 +61 @@
 
     // If no match found or something wrong found just output the server
-    if (state.index<-1)
+    if (state.first<-1)
         return beg + " " + serv + "> ";
 
     // If everything found add the state to the server
-    return beg + " " + serv + ":\033[32m\033[1m" + state.name + "\033[0m> ";
+    return beg + " " + serv + ":\033[32m\033[1m" + state.second + "\033[0m> ";
 }
 
@@ -77 +75 @@
 
     // If we have not cd'ed to a server show only the line start
-    if (fCurrentServer.empty())
+    if (fCurrentServer.empty() || !fImp)
         return beg + "> ";
 
-    // Check if we have cd'ed to a valid server
-    const ClientList::const_iterator l = fClientList.find(fCurrentServer);
-    if (l==fClientList.end())
+    const pair<int32_t, string> state = fImp->GetServerState(fCurrentServer);
+    if (state.first==-256)
         return beg + "> ";//Form("\n[%d] \033[34m\033[1m%s\033[0m> ", GetLine(), fCurrentServer.c_str());
 
-    const State state = GetState(fCurrentServer, l->second->GetState());
-
     // If no match found or something wrong found just output the server
-    if (state.index<-1)
+    if (state.first<-1)
         return beg + " " + fCurrentServer + "> ";
 
     // If everything found add the state to the server
-    return beg + " " + fCurrentServer + ":" + state.name + "> ";
+    return beg + " " + fCurrentServer + ":" + state.second + "> ";
 }