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

[<ikr...@us...>]

Revision: 3604
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3604&view=rev
Author:   ikreymer
Date:     2012-01-25 23:47:49 +0000 (Wed, 25 Jan 2012)
Log Message:
-----------
FIX: Add ability to specify the partitioner to be used with old-style ResultsPartitioner partitions

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartitionsFactory.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartitionsFactory.java	2012-01-24 18:58:08 UTC (rev 3603)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartitionsFactory.java	2012-01-25 23:47:49 UTC (rev 3604)
@@ -53,6 +53,11 @@
 	 */
 	public static ArrayList<ResultsPartition> get(CaptureSearchResults results,
 			WaybackRequest wbRequest) {
+		return get(results, wbRequest, null);
+	}
+
+	public static ArrayList<ResultsPartition> get(CaptureSearchResults results,
+				WaybackRequest wbRequest, ResultsPartitioner defaultPartitioner) {	
 		Timestamp startTS = Timestamp.parseBefore(results.getFilter(
 				WaybackRequest.REQUEST_START_DATE));
 		Timestamp endTS = Timestamp.parseAfter(results.getFilter(
@@ -67,14 +72,17 @@
 		long msSpanned = endDate.getTime() - startDate.getTime();
 		int secsSpanned = (int) Math.ceil(msSpanned / 1000);
 
-		ResultsPartitioner partitioner = null;
-		for(int i = 0; i < partitioners.length; i++) {
-			partitioner = partitioners[i];
-			if(partitioner.maxSecondsSpanned() >= secsSpanned) {
-				break;
+		ResultsPartitioner partitioner = defaultPartitioner;
+		
+		if (partitioner == null) {
+			for(int i = 0; i < partitioners.length; i++) {
+				partitioner = partitioners[i];
+				if(partitioner.maxSecondsSpanned() >= secsSpanned) {
+					break;
+				}
 			}
 		}
-
+		
 		// now use the partitioner to initialize and populate the 
 		// ResultPartition objects:
 		ArrayList<ResultsPartition> partitions = 

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