[Archive-access-cvs] archive-access/projects/wayback/src/java/org/archive/wayback/servletglue WBQueryUIServlet.java,1.2,1.3 WBReplayUIServlet.java,1.2,1.3

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

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

Modified Files:
	WBQueryUIServlet.java WBReplayUIServlet.java 
Log Message:
Major UI Overhaul:
	Moved templates up to top of webapp
	Created css, images directories, moved relevant files into them
	UI-Header.txt => UI-Header.jsp (now uses ContextPath)
	UI-Footer.txt => UI-Footer.jsp (now uses ContextPath)
	added requestform.jsp pages for ReplayUI and QueryUI
	ReplayUI servlet url .../retrieve => .../replay
	Form in header of all Query/Error pages now works

WMRequest Parsing:
	WMRequest now can parse Replay or Query requests with arguments encoded as CGI parameters. If the filter did not already parse the request, then an attemp is made with the WMRequest CGI parameter parsing... This allows for direct CGI GET requests to the individual servlets, making the requestform.jsp FORMs possible.

Timestamp:
	added static method to construct a "current" Timestamp.

Index: WBQueryUIServlet.java
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wayback/src/java/org/archive/wayback/servletglue/WBQueryUIServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WBQueryUIServlet.java	19 Oct 2005 01:22:37 -0000	1.2
--- WBQueryUIServlet.java	20 Oct 2005 00:40:41 -0000	1.3
***************
*** 78,85 ****
  		WMRequest wmRequest = (WMRequest) request
  				.getAttribute(WMREQUEST_ATTRIBUTE);
  		if (wmRequest == null) {
! 			throw new ServletException("No WMRequest object");
  		}
- 		QueryUI queryUI = wayback.getQueryUI();
  		queryUI.handle(wayback, wmRequest, request, response);
  	}
--- 78,92 ----
  		WMRequest wmRequest = (WMRequest) request
  				.getAttribute(WMREQUEST_ATTRIBUTE);
+ 		QueryUI queryUI = wayback.getQueryUI();
+ 
  		if (wmRequest == null) {
! 			wmRequest = new WMRequest();
! 			try {
! 				wmRequest.parseCGIArgsQuery(request.getParameterMap());
! 			} catch (Exception e) {
! 				queryUI.showWaybackException(null,request,response,e.getMessage());
! 				return;
! 			}
  		}
  		queryUI.handle(wayback, wmRequest, request, response);
  	}

Index: WBReplayUIServlet.java
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wayback/src/java/org/archive/wayback/servletglue/WBReplayUIServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WBReplayUIServlet.java	19 Oct 2005 01:22:37 -0000	1.2
--- WBReplayUIServlet.java	20 Oct 2005 00:40:41 -0000	1.3
***************
*** 77,84 ****
  		WMRequest wmRequest = (WMRequest) request
  				.getAttribute(WMREQUEST_ATTRIBUTE);
  		if (wmRequest == null) {
! 			throw new ServletException("No WMRequest object");
  		}
- 		ReplayUI replayUI = wayback.getReplayUI();
  		replayUI.handle(wayback, wmRequest, request, response);
  	}
--- 77,91 ----
  		WMRequest wmRequest = (WMRequest) request
  				.getAttribute(WMREQUEST_ATTRIBUTE);
+ 		ReplayUI replayUI = wayback.getReplayUI();
+ 
  		if (wmRequest == null) {
! 			wmRequest = new WMRequest();
! 			try {
! 				wmRequest.parseCGIArgsReplay(request.getParameterMap());
! 			} catch (Exception e) {
! 				replayUI.showWaybackException(null,request,response,e.getMessage());
! 				return;
! 			}
  		}
  		replayUI.handle(wayback, wmRequest, request, response);
  	}