Changeset 11250

Timestamp:

07/22/10 15:50:42 (7 weeks ago)

Author:

yoram.shamir

Message:

JScapy interleaved ports and streams.

Files:

• jsystemFramework/trunk/systemObjects/core/scriptingLanguages/src/jsystem/sysobj/scripting/python/PyShell.java (modified) (5 diffs)

jsystemFramework/trunk/systemObjects/core/scriptingLanguages/src/jsystem/sysobj/scripting/python/PyShell.java

@@ -22 +22 @@
 
         private StringBuffer logFileS = null;
+
+        private Prompt[] pyPrompts = new Prompt[1];
         
         public void init() throws Exception {
@@ -27 +29 @@
                 super.init();
                 
-                Prompt[] pyPrompts = new Prompt[1];
-                
                 pyPrompts[0] = new Prompt();
-                pyPrompts[0].setPrompt(">>>");
+                pyPrompts[0].setPrompt(">>> ");
                 pyPrompts[0].setCommandEnd(true);
 
@@ -37 +37 @@
                 cliApplication = station.getCliSession(false);
                 cliConnection = cliApplication.getConnectivityManager().getCli();
+                cliConnection.setPrompts(pyPrompts);
                 
                 logFileS = new StringBuffer();
@@ -42 +43 @@
         }
         
-        @Override
-        public void close() {
+        @Override public void close() {
                 station.close();
                 super.close();
@@ -57 +57 @@
                 cmd.addErrors("Error");
                 if (prompt != null) {
-                        cmd.setPromptString("...");                     
+                        cmd.setPromptString(prompt);
                 }
                 cliConnection.handleCliCommand(command, cmd);
                 return cmd.getResult();
+        }
+
+        public String handleCliCommandSend(String command) throws Exception {
+                logFileS.append(command + "<br>");
+                cliConnection.sendString(command+"\r", false);
+                report.report(command, command, true);
+                return "";
         }