[Exist-commits] eXist-1.0/src/org/exist/cocoon XQueryGenerator.java,1.20,1.21

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/cocoon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7580/src/org/exist/cocoon

Modified Files:
	XQueryGenerator.java 
Log Message:
Applied Martin's patch: calculation of baseURI had been wrong.

Index: XQueryGenerator.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/cocoon/XQueryGenerator.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** XQueryGenerator.java	23 Jul 2004 14:19:52 -0000	1.20
--- XQueryGenerator.java	16 Aug 2004 18:56:41 -0000	1.21
***************
*** 155,164 ****
  		Context context = ObjectModelHelper.getContext(objectModel);
  		Session session = request.getSession(createSession);
! 		String baseURI = request.getRequestURI();
! 		int p = baseURI.lastIndexOf('/');
! 		if (p > -1)
! 			baseURI = baseURI.substring(0, p);
! 		baseURI = context.getRealPath(baseURI.substring(request
! 				.getContextPath().length()));
  		String user = null;
  		String password = null;
--- 155,167 ----
  		Context context = ObjectModelHelper.getContext(objectModel);
  		Session session = request.getSession(createSession);
! 		
! 		final String servletPath = request.getServletPath();
! 		final String pathInfo = request.getPathInfo();
! 		StringBuffer baseURIBuffer = new StringBuffer(servletPath);
! 		if (pathInfo != null) baseURIBuffer.append(pathInfo);
! 		int p = baseURIBuffer.lastIndexOf("/");
! 		if (p > -1)  baseURIBuffer.delete(p,baseURIBuffer.length());            
! 		final String baseURI = context.getRealPath(baseURIBuffer.toString());
! 		
  		String user = null;
  		String password = null;