1.1 --- a/WebStack/JavaServlet.py Sun Aug 29 19:09:25 2004 +0000
1.2 +++ b/WebStack/JavaServlet.py Sun Aug 29 19:10:34 2004 +0000
1.3 @@ -195,7 +195,7 @@
1.4 Returns the entire path from the request minus the query string.
1.5 """
1.6
1.7 - return self.request.getServletPath()
1.8 + return self.request.getContextPath() + self.request.getServletPath() + self.get_path_info()
1.9
1.10 def get_path_info(self):
1.11
1.12 @@ -204,7 +204,7 @@
1.13 handling the current request) from the request.
1.14 """
1.15
1.16 - return self.request.getPathInfo()
1.17 + return self.request.getPathInfo() or ""
1.18
1.19 def get_query_string(self):
1.20
2.1 --- a/WebStack/Webware.py Sun Aug 29 19:09:25 2004 +0000
2.2 +++ b/WebStack/Webware.py Sun Aug 29 19:10:34 2004 +0000
2.3 @@ -138,7 +138,12 @@
2.4 handling the current request) from the request.
2.5 """
2.6
2.7 - return self.trans.request().extraURLPath()
2.8 + path_info = self.trans.request().pathInfo()
2.9 + context_name = self.trans.request().contextName()
2.10 + if path_info.startswith(context_name):
2.11 + return path_info[len(context_name):]
2.12 + else:
2.13 + return path_info
2.14
2.15 def get_query_string(self):
2.16