[Archive-access-cvs] SF.net SVN: archive-access: [2174] trunk/archive-access/projects/wayback/ wayback-core/src

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

Revision: 2174
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2174&view=rev
Author:   bradtofel
Date:     2008-02-05 17:13:42 -0800 (Tue, 05 Feb 2008)

Log Message:
-----------
BUGFIX: now calculates current(which translates to max) year on startup, which still will require a restart on New Years, but at least won't require more code changes..

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/Timestamp.java
    trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/core/TimestampTest.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/Timestamp.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/Timestamp.java	2008-02-04 22:58:24 UTC (rev 2173)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/Timestamp.java	2008-02-06 01:13:42 UTC (rev 2174)
@@ -43,7 +43,8 @@
 	private final static String LOWER_TIMESTAMP_LIMIT = "10000000000000";
 	private final static String UPPER_TIMESTAMP_LIMIT = "29991939295959";
 	private final static String YEAR_LOWER_LIMIT      = "1996";
-	private final static String YEAR_UPPER_LIMIT      = "2008";
+	private final static String YEAR_UPPER_LIMIT      = 
+		String.valueOf(Calendar.getInstance().get(Calendar.YEAR));
 	private final static String MONTH_LOWER_LIMIT     = "01";
 	private final static String MONTH_UPPER_LIMIT     = "12";
 	private final static String DAY_LOWER_LIMIT       = "01";

Modified: trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/core/TimestampTest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/core/TimestampTest.java	2008-02-04 22:58:24 UTC (rev 2173)
+++ trunk/archive-access/projects/wayback/wayback-core/src/test/java/org/archive/wayback/core/TimestampTest.java	2008-02-06 01:13:42 UTC (rev 2174)
@@ -24,6 +24,8 @@
  */
 package org.archive.wayback.core;
 
+import java.util.Calendar;
+
 import junit.framework.TestCase;
 
 import org.archive.wayback.core.Timestamp;
@@ -40,11 +42,13 @@
 	 */
 	public void testPadDateStr() {
 
+		String curYear = String.valueOf(Calendar.getInstance().get(Calendar.YEAR));
+		
 		assertEquals("padStart '1'","19960101000000",Timestamp.padStartDateStr("1"));
 		assertEquals("padEnd '1'","19991231235959",Timestamp.padEndDateStr("1"));
 		assertEquals("padStart '2'","20000101000000",Timestamp.padStartDateStr("2"));
-		assertEquals("padEnd","20081231235959",Timestamp.padEndDateStr("2"));
-		assertEquals("padEnd","20081231235959",Timestamp.padEndDateStr("3"));
+		assertEquals("padEnd",curYear + "1231235959",Timestamp.padEndDateStr("2"));
+		assertEquals("padEnd",curYear + "1231235959",Timestamp.padEndDateStr("3"));
 		assertEquals("padEnd","20061231235959",Timestamp.padEndDateStr("2006"));
 		assertEquals("padEnd","20061231235959",Timestamp.padEndDateStr("200613"));
 		assertEquals("padEnd","20071231235959",Timestamp.padEndDateStr("2007"));


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