Changeset 1098 for TI07-MOLES/trunk/StubB/XSLT/browse/portal/cgi/browseCGI.py

Timestamp:

06/06/06 14:54:19 (15 years ago)

Author:

lawrence

Message:

Minor changes with html layout for browse, and starting
to organise a proper request class ...

File:

• TI07-MOLES/trunk/StubB/XSLT/browse/portal/cgi/browseCGI.py (modified) (3 diffs)

TI07-MOLES/trunk/StubB/XSLT/browse/portal/cgi/browseCGI.py

@@ -99 +99 @@
                 return cookie
         
+class Request:
+    ''' Holds the request URL etc '''
+    def __init__(self,env):
+        self.env=env
+        self.URL='http://%s:%s%s'%(env.get('SERVER_NAME'),env.get('SERVER_PORT'),
+        env.get('SCRIPT_NAME'))
+        qs=env.get('QUERY_STRING')
+        if qs!='': self.URL+='?'+qs
+
 class CGIcontroller:
         ''' Currently holds the cgi environment and controls '''
@@ -104 +113 @@
         def __init__(self,config):
                 ''' Instantiate the CGI environment'''
+                #
+                # Need to refactor all of this to use the request class and then move
+                # the request class out into the utilities ...
+                #
                 self.env=os.environ
                 self.path=self.env.get('PATH_INFO','/')
@@ -109 +122 @@
                 self.config=config
                 self.response=Response()
-                self.requestURL=self.env.get('SCRIPT_NAME')+'?'+self.env.get('QUERY_STRING')
+                self.request=Request(self.env)
+                self.requestURL=self.request.URL
                 self.selector=selector(self.requestURL,config.get('layout','selectI'))