Menu
▾
▴
archive-access-cvs
|
From: <bra...@us...> - 2007-10-29 22:26:09
|
Revision: 2064
http://archive-access.svn.sourceforge.net/archive-access/?rev=2064&view=rev
Author: bradtofel
Date: 2007-10-29 15:26:11 -0700 (Mon, 29 Oct 2007)
Log Message:
-----------
FEATURE: added TwoMonth partitioner to Timeline mode
Modified Paths:
--------------
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/TwoMonthResultsPartitioner.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-10-29 21:44:06 UTC (rev 2063)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsTimelinePartitionsFactory.java 2007-10-29 22:26:11 UTC (rev 2064)
@@ -44,19 +44,24 @@
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_YEAR_PARTITIONS = 10;
// These are sort of "ball park" figures. Should be using calendars
// for better accuracy..
- private static int MAX_HOUR_SECONDS = 60 * 60 * NUM_HOUR_PARTITIONS;
- private static int MAX_DAY_SECONDS = 60 * 60 * 24 * NUM_DAY_PARTITIONS;
- private static int MAX_MONTH_SECONDS = 60 * 60 * 24 * 30 * NUM_MONTH_PARTITIONS;
+ private static int MAX_HOUR_SECONDS = 2 * 60 * 60 * NUM_HOUR_PARTITIONS;
+ private static int MAX_DAY_SECONDS = 2 * 60 * 60 * 24 * NUM_DAY_PARTITIONS;
+ 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;
//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 YearResultsPartitioner yearRP = new YearResultsPartitioner();
/**
@@ -94,6 +99,16 @@
* @param wbRequest
* @return ArrayList of ResultsPartition objects
*/
+ public static ArrayList<ResultsPartition> getTwoMonth(SearchResults results,
+ WaybackRequest wbRequest) {
+ return get(twoMonthRP,NUM_TWO_MONTH_PARTITIONS,results,wbRequest);
+ }
+
+ /**
+ * @param results
+ * @param wbRequest
+ * @return ArrayList of ResultsPartition objects
+ */
public static ArrayList<ResultsPartition> getYear(SearchResults results,
WaybackRequest wbRequest) {
return get(yearRP,NUM_YEAR_PARTITIONS,results,wbRequest);
@@ -115,6 +130,8 @@
return getDay(results,wbRequest);
} else if(diff < MAX_MONTH_SECONDS) {
return getMonth(results,wbRequest);
+ } else if(diff < MAX_TWO_MONTH_SECONDS) {
+ return getTwoMonth(results,wbRequest);
}
return getYear(results,wbRequest);
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/TwoMonthResultsPartitioner.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/TwoMonthResultsPartitioner.java 2007-10-29 21:44:06 UTC (rev 2063)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/TwoMonthResultsPartitioner.java 2007-10-29 22:26:11 UTC (rev 2064)
@@ -67,7 +67,7 @@
Calendar endMinusSecond = getCalendar();
endMinusSecond.setTime(end.getTime());
endMinusSecond.add(Calendar.SECOND,-1);
- return wbRequest.getFormatter().format("ResultPartitions.twoMonth",
- start.getTime(),endMinusSecond.getTime());
+ return wbRequest.getFormatter().format("ResultPartitions.month",
+ start.getTime());
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-07-01 23:27:40
|
Revision: 2360
http://archive-access.svn.sourceforge.net/archive-access/?rev=2360&view=rev
Author: bradtofel
Date: 2008-07-01 16:27:49 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
REFACTOR: SearchResult => (Url|Capture)SearchResult
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartition.java
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/ResultsTimelinePartitionsFactory.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartition.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartition.java 2008-07-01 23:27:14 UTC (rev 2359)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartition.java 2008-07-01 23:27:49 UTC (rev 2360)
@@ -26,9 +26,8 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.archive.wayback.core.SearchResult;
-import org.archive.wayback.core.SearchResults;
-import org.archive.wayback.WaybackConstants;
+import org.archive.wayback.core.CaptureSearchResult;
+import org.archive.wayback.core.CaptureSearchResults;
/**
*
@@ -41,7 +40,7 @@
private String endDateStr = null; // exclusive
private String title = null;
- private ArrayList<SearchResult> matches = null;
+ private ArrayList<CaptureSearchResult> matches = null;
/**
* @return number of SearchResult objects in this partition
@@ -61,7 +60,7 @@
this.startDateStr = startDateStr;
this.endDateStr = endDateStr;
this.title= title;
- matches = new ArrayList<SearchResult>();
+ matches = new ArrayList<CaptureSearchResult>();
}
/**
@@ -69,12 +68,11 @@
* within the time range of this partition into this partition.
* @param results
*/
- public void filter(SearchResults results) {
- Iterator<SearchResult> itr = results.iterator();
+ public void filter(CaptureSearchResults results) {
+ Iterator<CaptureSearchResult> itr = results.iterator();
while(itr.hasNext()) {
- SearchResult result = itr.next();
- String captureDate = result.get(
- WaybackConstants.RESULT_CAPTURE_DATE);
+ CaptureSearchResult result = itr.next();
+ String captureDate = result.getCaptureTimestamp();
if((captureDate.compareTo(startDateStr) >= 0)
&& (captureDate.compareTo(endDateStr) < 0)) {
matches.add(result);
@@ -92,7 +90,7 @@
/**
* @return Returns the matches.
*/
- public ArrayList<SearchResult> getMatches() {
+ public ArrayList<CaptureSearchResult> getMatches() {
return matches;
}
}
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 2008-07-01 23:27:14 UTC (rev 2359)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartitionsFactory.java 2008-07-01 23:27:49 UTC (rev 2360)
@@ -30,7 +30,7 @@
import org.archive.util.ArchiveUtils;
import org.archive.wayback.WaybackConstants;
-import org.archive.wayback.core.SearchResults;
+import org.archive.wayback.core.CaptureSearchResults;
import org.archive.wayback.core.Timestamp;
import org.archive.wayback.core.WaybackRequest;
@@ -56,7 +56,7 @@
* @param wbRequest
* @return ArrayList of ResultsPartition objects
*/
- public static ArrayList<ResultsPartition> get(SearchResults results,
+ public static ArrayList<ResultsPartition> get(CaptureSearchResults results,
WaybackRequest wbRequest) {
Timestamp startTS = Timestamp.parseBefore(results.getFilter(
WaybackConstants.REQUEST_START_DATE));
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 2008-07-01 23:27:14 UTC (rev 2359)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsTimelinePartitionsFactory.java 2008-07-01 23:27:49 UTC (rev 2360)
@@ -29,7 +29,7 @@
import org.archive.util.ArchiveUtils;
import org.archive.wayback.WaybackConstants;
-import org.archive.wayback.core.SearchResults;
+import org.archive.wayback.core.CaptureSearchResults;
import org.archive.wayback.core.Timestamp;
import org.archive.wayback.core.WaybackRequest;
@@ -69,7 +69,7 @@
* @param wbRequest
* @return ArrayList of ResultsPartition objects
*/
- public static ArrayList<ResultsPartition> getHour(SearchResults results,
+ public static ArrayList<ResultsPartition> getHour(CaptureSearchResults results,
WaybackRequest wbRequest) {
return get(hourRP,NUM_HOUR_PARTITIONS,results,wbRequest);
}
@@ -79,7 +79,7 @@
* @param wbRequest
* @return ArrayList of ResultsPartition objects
*/
- public static ArrayList<ResultsPartition> getDay(SearchResults results,
+ public static ArrayList<ResultsPartition> getDay(CaptureSearchResults results,
WaybackRequest wbRequest) {
return get(dayRP,NUM_DAY_PARTITIONS,results,wbRequest);
}
@@ -89,7 +89,7 @@
* @param wbRequest
* @return ArrayList of ResultsPartition objects
*/
- public static ArrayList<ResultsPartition> getMonth(SearchResults results,
+ public static ArrayList<ResultsPartition> getMonth(CaptureSearchResults results,
WaybackRequest wbRequest) {
return get(monthRP,NUM_MONTH_PARTITIONS,results,wbRequest);
}
@@ -99,7 +99,7 @@
* @param wbRequest
* @return ArrayList of ResultsPartition objects
*/
- public static ArrayList<ResultsPartition> getTwoMonth(SearchResults results,
+ public static ArrayList<ResultsPartition> getTwoMonth(CaptureSearchResults results,
WaybackRequest wbRequest) {
return get(twoMonthRP,NUM_TWO_MONTH_PARTITIONS,results,wbRequest);
}
@@ -109,7 +109,7 @@
* @param wbRequest
* @return ArrayList of ResultsPartition objects
*/
- public static ArrayList<ResultsPartition> getYear(SearchResults results,
+ public static ArrayList<ResultsPartition> getYear(CaptureSearchResults results,
WaybackRequest wbRequest) {
return get(yearRP,NUM_YEAR_PARTITIONS,results,wbRequest);
}
@@ -119,10 +119,10 @@
* @param wbRequest
* @return ArrayList of ResultsPartition objects
*/
- public static ArrayList<ResultsPartition> getAuto(SearchResults results,
+ public static ArrayList<ResultsPartition> getAuto(CaptureSearchResults results,
WaybackRequest wbRequest) {
- int first = Timestamp.parseBefore(results.getFirstResultDate()).sse();
- int last = Timestamp.parseAfter(results.getLastResultDate()).sse();
+ int first = Timestamp.parseBefore(results.getFirstResultTimestamp()).sse();
+ int last = Timestamp.parseAfter(results.getLastResultTimestamp()).sse();
int diff = last - first;
if(diff < MAX_HOUR_SECONDS) {
return getHour(results,wbRequest);
@@ -140,9 +140,9 @@
* @param results
* @return String Constant of minimum resolution that will hold the results
*/
- public static String getMinResolution(SearchResults results) {
- int first = Timestamp.parseBefore(results.getFirstResultDate()).sse();
- int last = Timestamp.parseAfter(results.getLastResultDate()).sse();
+ public static String getMinResolution(CaptureSearchResults results) {
+ int first = Timestamp.parseBefore(results.getFirstResultTimestamp()).sse();
+ int last = Timestamp.parseAfter(results.getLastResultTimestamp()).sse();
int diff = last - first;
if(diff < MAX_HOUR_SECONDS) {
return WaybackConstants.REQUEST_RESOLUTION_HOURS;
@@ -157,7 +157,7 @@
}
private static ArrayList<ResultsPartition> get(ResultsPartitioner
- partitioner, int partitionCount, SearchResults results,
+ partitioner, int partitionCount, CaptureSearchResults results,
WaybackRequest wbRequest) {
ArrayList<ResultsPartition> partitions =
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X