Webware for Python

Update of /cvsroot/webware/Webware/WebKit
In directory usw-pr-cvs1:/tmp/cvs-serv9519

Modified Files:
      Tag: MultipleSerApp-1
	OneShotAdapter.py OneShotAppServer.py OneShot.cgi 
Log Message:

Tweaks to work with MultiAppServices patch


Index: OneShotAdapter.py
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/OneShotAdapter.py,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -C2 -d -r1.18 -r1.18.2.1
*** OneShotAdapter.py	2001/10/04 19:57:10	1.18
--- OneShotAdapter.py	2002/01/26 21:33:54	1.18.2.1
***************
*** 43,47 ****
  		return config
  
! 	def run(self):
  
  		try:
--- 43,47 ----
  		return config
  
! 	def run(self, appname):
  
  		try:
***************
*** 75,79 ****
  			from ASStreamOut import ASStreamOut
  			rs = ASStreamOut()
! 			transaction = appSvr.dispatchRawRequest(dict, rs)
  			rs.close()
  			transaction.die()
--- 75,79 ----
  			from ASStreamOut import ASStreamOut
  			rs = ASStreamOut()
! 			transaction = appSvr.dispatchRawRequest(appname, dict, rs)
  			rs.close()
  			transaction.die()
***************
*** 142,151 ****
  
  
! def main(webKitDir=None):
  	if webKitDir is None:
  		import os
  		webKitDir = os.getcwd()
  	try:
! 		OneShotAdapter(webKitDir).run()
  	except:
  		import traceback
--- 142,151 ----
  
  
! def main(webKitDir=None, appName='localhost'):
  	if webKitDir is None:
  		import os
  		webKitDir = os.getcwd()
  	try:
! 		OneShotAdapter(webKitDir).run(appName)
  	except:
  		import traceback

Index: OneShotAppServer.py
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/OneShotAppServer.py,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** OneShotAppServer.py	2001/04/19 22:39:49	1.3
--- OneShotAppServer.py	2002/01/26 21:33:54	1.3.2.1
***************
*** 24,27 ****
  		return Application(server=self, useSessionSweeper=0)
  
! 	def dispatchRawRequest(self, newRequestDict, strmOut):
! 		return self._app.dispatchRawRequest(newRequestDict, strmOut)
--- 24,27 ----
  		return Application(server=self, useSessionSweeper=0)
  
! 	def dispatchRawRequest(self, appname, newRequestDict, strmOut):
! 		return self.applicationInstanceByName(appname).dispatchRawRequest(newRequestDict, strmOut)

Index: OneShot.cgi
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/OneShot.cgi,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** OneShot.cgi	2001/09/21 19:27:32	1.9
--- OneShot.cgi	2002/01/26 21:33:54	1.9.2.1
***************
*** 10,13 ****
--- 10,17 ----
  AppWorkDir = None
  
+ ## Specify the name you gave the target Application in
+ ##  AppServer.config.  This defaults to 'localhost'
+ AppName = 'localhost'
+ 
  try:
  	import os, sys
***************
*** 23,27 ****
  
  	import WebKit.OneShotAdapter
! 	WebKit.OneShotAdapter.main(AppWorkDir)
  except:
  	import string, sys, traceback
--- 27,31 ----
  
  	import WebKit.OneShotAdapter
! 	WebKit.OneShotAdapter.main(AppWorkDir, AppName)
  except:
  	import string, sys, traceback