[Archive-access-cvs] archive-access/projects/wayback/src/webapp/jsp/TimelineUI QueryResults.jsp, 1.2, 1.3

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

Update of /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/jsp/TimelineUI
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv9737/src/webapp/jsp/TimelineUI

Modified Files:
	QueryResults.jsp 
Log Message:
FEATURE: Auto Resolution now includes, in parenths, the minimum resolution that will hold the results selected. Hopefully this will reduce the confusion on what "Auto" means, and what can be expected when changing from "Auto".

Includes a new static method on ResultsTimelinePartitionFactory, that is used by the Timeline QueryResults.jsp to find the minimum resolution, which is then drawn in the text of the Auto Option.

Index: QueryResults.jsp
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/jsp/TimelineUI/QueryResults.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** QueryResults.jsp	20 Oct 2006 22:18:51 -0000	1.2
--- QueryResults.jsp	2 Nov 2006 20:41:19 -0000	1.3
***************
*** 69,72 ****
--- 69,87 ----
  String hoursOptSelected = "";
  String autoOptSelected = "";
+ String autoOptString;
+ String minResolution = ResultsTimelinePartitionsFactory.getMinResolution(
+ 							results.getResults());
+ 
+ if(minResolution.equals(WaybackConstants.REQUEST_RESOLUTION_HOURS)) {
+ 	autoOptString = "Auto(Hours)";
+ } else if(minResolution.equals(WaybackConstants.REQUEST_RESOLUTION_DAYS)) {
+ 	autoOptString = "Auto(Days)";
+ } else if(minResolution.equals(WaybackConstants.REQUEST_RESOLUTION_MONTHS)) {
+ 	autoOptString = "Auto(Months)";
+ } else if(minResolution.equals(WaybackConstants.REQUEST_RESOLUTION_YEARS)) {
+ 	autoOptString = "Auto(Years)";
+ } else {
+ 	autoOptString = "Auto(Unknown)";
+ }
  
  ArrayList partitions;
***************
*** 230,234 ****
  				<input type="hidden" name="exactdate" value="<%= exactDateStr %>">
  				<input type="hidden" name="type" value="urlclosestquery">
! 				Resolution:
  				<select NAME="resolution" SIZE="1" onChange="changeResolution()">
  					<option <%= yearsOptSelected %> value="years">Years</option>
--- 245,249 ----
  				<input type="hidden" name="exactdate" value="<%= exactDateStr %>">
  				<input type="hidden" name="type" value="urlclosestquery">
! 				Time Range:
  				<select NAME="resolution" SIZE="1" onChange="changeResolution()">
  					<option <%= yearsOptSelected %> value="years">Years</option>
***************
*** 236,240 ****
  					<option <%= daysOptSelected %>  value="days">Days</option>
  					<option <%= hoursOptSelected %> value="hours">Hours</option>
! 					<option <%= autoOptSelected %> value="auto">Auto</option>
  				</select>&nbsp;Metadata:<input type="checkbox" name="metamode" value="yes" <%= metaChecked %> onClick="changeMeta()">&nbsp<a href="help.php" target="_top">Help</a>
  			</form>
--- 251,255 ----
  					<option <%= daysOptSelected %>  value="days">Days</option>
  					<option <%= hoursOptSelected %> value="hours">Hours</option>
! 					<option <%= autoOptSelected %> value="auto"><%= autoOptString %></option>
  				</select>&nbsp;Metadata:<input type="checkbox" name="metamode" value="yes" <%= metaChecked %> onClick="changeMeta()">&nbsp<a href="help.php" target="_top">Help</a>
  			</form>