[Archive-access-cvs] SF.net SVN: archive-access: [2075] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ ResultsTimelinePartitionsFactory.java

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

Revision: 2075
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2075&view=rev
Author:   bradtofel
Date:     2007-11-05 19:51:43 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
FEATURE: fully implemented TwoMonth partitioning scheme

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsTimelinePartitionsFactory.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsTimelinePartitionsFactory.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsTimelinePartitionsFactory.java	2007-11-06 03:50:11 UTC (rev 2074)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsTimelinePartitionsFactory.java	2007-11-06 03:51:43 UTC (rev 2075)
@@ -44,7 +44,7 @@
 	private static int NUM_HOUR_PARTITIONS = 12;
 	private static int NUM_DAY_PARTITIONS = 15;
 	private static int NUM_MONTH_PARTITIONS = 12;
-	private static int NUM_TWO_MONTH_PARTITIONS = 12;
+	private static int NUM_TWO_MONTH_PARTITIONS = 16;
 	private static int NUM_YEAR_PARTITIONS = 10;
 	
 	// These are sort of "ball park" figures. Should be using calendars
@@ -54,14 +54,14 @@
 	private static int MAX_MONTH_SECONDS = 2 * 60 * 60 * 24 * 30 * 
 		NUM_MONTH_PARTITIONS;
 	private static int MAX_TWO_MONTH_SECONDS = 2 * 60 * 60 * 24 * 2* 30 * 
-		NUM_MONTH_PARTITIONS;
+		NUM_TWO_MONTH_PARTITIONS;
 	//private static int MAX_YEAR_SECONDS = 60 * 60 * 24 * 365 * NUM_YEAR_PARTITIONS;
 	
 	
 	private static HourResultsPartitioner hourRP = new HourResultsPartitioner();
 	private static DayResultsPartitioner dayRP = new DayResultsPartitioner();
 	private static MonthResultsPartitioner monthRP = new MonthResultsPartitioner();
-	private static TwoMonthResultsPartitioner twoMonthRP = new TwoMonthResultsPartitioner();
+	private static TwoMonthTimelineResultsPartitioner twoMonthRP = new TwoMonthTimelineResultsPartitioner();
 	private static YearResultsPartitioner yearRP = new YearResultsPartitioner();
 	
 	/**
@@ -150,6 +150,8 @@
 			return WaybackConstants.REQUEST_RESOLUTION_DAYS;
 		} else if(diff < MAX_MONTH_SECONDS) {
 			return WaybackConstants.REQUEST_RESOLUTION_MONTHS;
+		} else if(diff < MAX_TWO_MONTH_SECONDS) {
+			return WaybackConstants.REQUEST_RESOLUTION_TWO_MONTHS;
 		}
 		return WaybackConstants.REQUEST_RESOLUTION_YEARS;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.