[Archive-access-cvs] archive-access/projects/wayback/src/java/org/archive/wayback/simplequeryui SimpleQueryUI.java,1.3,1.4

[Brad <bra...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wayback/src/java/org/archive/wayback/simplequeryui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3731/src/java/org/archive/wayback/simplequeryui

Modified Files:
	SimpleQueryUI.java 
Log Message:
BUGFIX: incorrect generation of query arguments -- only append '?' + query args if they are present.

Index: SimpleQueryUI.java
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wayback/src/java/org/archive/wayback/simplequeryui/SimpleQueryUI.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SimpleQueryUI.java	22 Oct 2005 00:29:20 -0000	1.3
--- SimpleQueryUI.java	25 Oct 2005 21:42:34 -0000	1.4
***************
*** 82,87 ****
  		WMRequest wmRequest = null;
  		Matcher matcher = null;
! 
! 		String origRequestPath = request.getRequestURI() + "?" + request.getQueryString();
  		String contextPath = request.getContextPath();
  		if (!origRequestPath.startsWith(contextPath)) {
--- 82,90 ----
  		WMRequest wmRequest = null;
  		Matcher matcher = null;
! 		String queryString = request.getQueryString();
! 		String origRequestPath = request.getRequestURI();
! 		if(queryString != null) {
! 			origRequestPath = request.getRequestURI() + "?" + queryString;
! 		}
  		String contextPath = request.getContextPath();
  		if (!origRequestPath.startsWith(contextPath)) {