Update of /cvsroot/webware/Webware/WebKit/Adapters
In directory usw-pr-cvs1:/tmp/cvs-serv13561
Modified Files:
OneShot.cgi OneShotAdapter.py
Log Message:
Fixed some path problems in OneShot
Index: OneShot.cgi
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Adapters/OneShot.cgi,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OneShot.cgi 9 Oct 2002 05:24:04 -0000 1.1
--- OneShot.cgi 9 Oct 2002 05:34:22 -0000 1.2
***************
*** 12,19 ****
try:
import os, sys
! if WebwareDir:
! sys.path.insert(1, WebwareDir)
! else:
WebwareDir = os.path.dirname(os.path.dirname(os.getcwd()))
webKitDir = os.path.join(WebwareDir, 'WebKit')
if AppWorkDir is None:
--- 12,18 ----
try:
import os, sys
! if not WebwareDir:
WebwareDir = os.path.dirname(os.path.dirname(os.getcwd()))
+ sys.path.insert(1, WebwareDir)
webKitDir = os.path.join(WebwareDir, 'WebKit')
if AppWorkDir is None:
***************
*** 26,30 ****
except:
import string, sys, traceback
! from time importx asctime, localtime, time
sys.stderr.write('[%s] [error] WebKit: Error in adapter\n' % asctime(localtime(time())))
--- 25,29 ----
except:
import string, sys, traceback
! from time import asctime, localtime, time
sys.stderr.write('[%s] [error] WebKit: Error in adapter\n' % asctime(localtime(time())))
Index: OneShotAdapter.py
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Adapters/OneShotAdapter.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OneShotAdapter.py 9 Oct 2002 05:24:04 -0000 1.1
--- OneShotAdapter.py 9 Oct 2002 05:34:22 -0000 1.2
***************
*** 68,72 ****
print 'ONE SHOT MODE\n'
! from OneShotAppServer import OneShotAppServer
appSvr = OneShotAppServer(self._webKitDir)
--- 68,72 ----
print 'ONE SHOT MODE\n'
! from WebKit.OneShotAppServer import OneShotAppServer
appSvr = OneShotAppServer(self._webKitDir)
***************
*** 145,149 ****
if webKitDir is None:
import os
! webKitDir = os.getcwd()
try:
OneShotAdapter(webKitDir).run()
--- 145,149 ----
if webKitDir is None:
import os
! webKitDir = os.path.dirname(os.getcwd())
try:
OneShotAdapter(webKitDir).run()
|