[Personalrobots-commit] SF.net SVN: personalrobots:[22954] pkg/trunk/sandbox/web

[<wgh...@us...>]

Revision: 22954
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=22954&view=rev
Author:   wghassan
Date:     2009-08-26 05:33:18 +0000 (Wed, 26 Aug 2009)

Log Message:
-----------
updated to handle mod-python

Modified Paths:
--------------
    pkg/trunk/sandbox/web/pyclearsilver/src/pyclearsilver/cgistarter.py
    pkg/trunk/sandbox/web/webui/src/webui/mod/webui/jslib/ros.js
    pkg/trunk/sandbox/web/webui/src/webui/startmod.py

Modified: pkg/trunk/sandbox/web/pyclearsilver/src/pyclearsilver/cgistarter.py
===================================================================
--- pkg/trunk/sandbox/web/pyclearsilver/src/pyclearsilver/cgistarter.py	2009-08-26 05:16:49 UTC (rev 22953)
+++ pkg/trunk/sandbox/web/pyclearsilver/src/pyclearsilver/cgistarter.py	2009-08-26 05:33:18 UTC (rev 22954)
@@ -111,11 +111,8 @@
       return outputFile(self.context, fn)
 
     ## manage the Python module Path
-#    sys.path.insert(0, os.path.join(cwd, "pysrc"))
-#    sys.path.insert(0, os.path.join(cwd, "pysrc", "base"))
-
+    sys.path.insert(0, os.path.abspath(cwd))
     sys.path.insert(0, os.path.abspath(moduleRootPath))
-    #sys.path.insert(0, os.path.abspath(handlerRoot))
 
     debug("sys.path", sys.path)
 
@@ -146,7 +143,7 @@
       modulePath, moduleFilename = os.path.split(handlerPath)
 
     debug(handlerPath, pathinfo)
-    #warn(handlerPath, pathinfo, modulePath, moduleFilename)
+    #warn("PATH", handlerPath, pathinfo, modulePath, moduleFilename)
     #warn("PATH", self.path)
 
     if not os.path.isfile(handlerPath):

Modified: pkg/trunk/sandbox/web/webui/src/webui/mod/webui/jslib/ros.js
===================================================================
--- pkg/trunk/sandbox/web/webui/src/webui/mod/webui/jslib/ros.js	2009-08-26 05:16:49 UTC (rev 22953)
+++ pkg/trunk/sandbox/web/webui/src/webui/mod/webui/jslib/ros.js	2009-08-26 05:33:18 UTC (rev 22954)
@@ -182,8 +182,8 @@
   gPump = new MessagePump("http://" + window.location.hostname + ":8080" + prefix);
   gPump.setupWidgets();
 
-  setTimeout("gPump.pump();", 1000);
-   // gPump.pump();
+  //setTimeout("gPump.pump();", 10);
+  gPump.pump();
 }
 
 // *******************************************

Modified: pkg/trunk/sandbox/web/webui/src/webui/startmod.py
===================================================================
--- pkg/trunk/sandbox/web/webui/src/webui/startmod.py	2009-08-26 05:16:49 UTC (rev 22953)
+++ pkg/trunk/sandbox/web/webui/src/webui/startmod.py	2009-08-26 05:33:18 UTC (rev 22954)
@@ -2,11 +2,13 @@
 
 import os, sys
 
-sys.path.insert(0, "/u/hassan/pr2/ros/core/roslib/src")
+rosroot = '/u/hassan/pr2/ros'
+sys.path.insert(0, os.path.join(rosroot, "core/roslib/src"))
 
-os.environ['ROS_ROOT'] = '/u/hassan/pr2/ros'
+os.environ['ROS_ROOT'] = rosroot
 os.environ['ROS_PACKAGE_PATH'] =  '/u/hassan/pr2/ros-pkg'
 os.environ['ROS_MASTER_URI'] =  'http://localhost:11311/'
+os.environ['PATH'] = os.path.join(rosroot, "bin") + ":" + os.environ.get('PATH', "")
 os.environ['HOME'] = '/tmp'
 
 PKG = 'webui' # this package name


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.