archive-access-cvs

[Archive-access-cvs] SF.net SVN: archive-access: [1865] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/requestparser

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

Revision: 1865
          http://archive-access.svn.sourceforge.net/archive-access/?rev=1865&view=rev
Author:   bradtofel
Date:     2007-07-24 17:26:37 -0700 (Tue, 24 Jul 2007)

Log Message:
-----------
REFACTOR: removed all references to PropertyConfigurable interface

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/BaseRequestParser.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/CompositeRequestParser.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/BaseRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/BaseRequestParser.java	2007-07-25 00:25:52 UTC (rev 1864)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/BaseRequestParser.java	2007-07-25 00:26:37 UTC (rev 1865)
@@ -25,16 +25,13 @@
 package org.archive.wayback.requestparser;
 
 import java.util.Map;
-import java.util.Properties;
 
 import javax.servlet.http.HttpServletRequest;
 
 import org.archive.wayback.RequestParser;
 import org.archive.wayback.WaybackConstants;
-import org.archive.wayback.core.PropertyConfiguration;
 import org.archive.wayback.core.WaybackRequest;
 import org.archive.wayback.exception.BadQueryException;
-import org.archive.wayback.exception.ConfigurationException;
 import org.archive.wayback.webapp.WaybackContext;
 
 /**
@@ -67,12 +64,6 @@
 
 	protected int maxRecords = DEFAULT_MAX_RECORDS;
 
-	public void init(final Properties p) throws ConfigurationException {
-		PropertyConfiguration pc = new PropertyConfiguration(p);
-		maxRecords = pc.getInt(WaybackConstants.RESULTS_PER_PAGE_CONFIG_NAME, 
-				DEFAULT_MAX_RECORDS);		
-	}
-
 	protected static String getMapParam(Map<String,String[]> queryMap,
 			String field) {
 		String arr[] = queryMap.get(field);

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/CompositeRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/CompositeRequestParser.java	2007-07-25 00:25:52 UTC (rev 1864)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/CompositeRequestParser.java	2007-07-25 00:26:37 UTC (rev 1865)
@@ -24,16 +24,11 @@
  */
 package org.archive.wayback.requestparser;
 
-import java.util.Properties;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.archive.wayback.RequestParser;
-import org.archive.wayback.WaybackConstants;
-import org.archive.wayback.core.PropertyConfiguration;
 import org.archive.wayback.core.WaybackRequest;
 import org.archive.wayback.exception.BadQueryException;
-import org.archive.wayback.exception.ConfigurationException;
 import org.archive.wayback.webapp.WaybackContext;
 
 /**
@@ -45,15 +40,6 @@
 public class CompositeRequestParser extends BaseRequestParser {
 	private RequestParser[] parsers = null;
 	
-	public void init(final Properties p) throws ConfigurationException {
-		parsers = getRequestParsers();
-		for(int i = 0; i < parsers.length; i++) {
-			parsers[i].init(p);
-		}
-		PropertyConfiguration pc = new PropertyConfiguration(p);
-		maxRecords = pc.getInt(WaybackConstants.RESULTS_PER_PAGE_CONFIG_NAME, 
-				DEFAULT_MAX_RECORDS);		
-	}
 	/**
 	 * 
 	 */


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

[Archive-access-cvs] SF.net SVN: archive-access: [2445] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/requestparser

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

Revision: 2445
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2445&view=rev
Author:   bradtofel
Date:     2008-07-14 18:25:18 -0700 (Mon, 14 Jul 2008)

Log Message:
-----------
REFACTOR: moved decision of using earliest/latest timestamp out of base class -- allows FormRequestParser(and others) to determine how to populate the request more flexibly.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/BaseRequestParser.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/FormRequestParser.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/BaseRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/BaseRequestParser.java	2008-07-15 01:20:01 UTC (rev 2444)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/BaseRequestParser.java	2008-07-15 01:25:18 UTC (rev 2445)
@@ -126,18 +126,11 @@
 	 * @return
 	 */
 	public String getEarliestTimestamp() {
-		if(earliestTimestamp != null) {
-			return earliestTimestamp;
-			
-		}
-		return Timestamp.earliestTimestamp().getDateStr();
+		return earliestTimestamp;
 	}
 
 	public String getLatestTimestamp() {
-		if(latestTimestamp != null) {
-			return latestTimestamp;
-		}
-		return Timestamp.latestTimestamp().getDateStr();
+		return latestTimestamp;
 	}
 
 	public void setLatestTimestamp(String timestamp) {

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/FormRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/FormRequestParser.java	2008-07-15 01:20:01 UTC (rev 2444)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/FormRequestParser.java	2008-07-15 01:25:18 UTC (rev 2445)
@@ -30,6 +30,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.archive.wayback.core.Timestamp;
 import org.archive.wayback.core.WaybackRequest;
 import org.archive.wayback.webapp.AccessPoint;
 
@@ -82,12 +83,24 @@
 				String val = getMapParam(queryMap,key);
 				wbRequest.put(key,val);
 			}
-			if(wbRequest.getStartTimestamp()== null) {
-				wbRequest.setStartTimestamp(getEarliestTimestamp());
+			String partialTS = wbRequest.getReplayTimestamp();
+			if(partialTS != null) {
+				if(wbRequest.getStartTimestamp()== null) {
+					String startTS = Timestamp.parseBefore(partialTS).getDateStr();
+					wbRequest.setStartTimestamp(startTS);
+				}
+				if(wbRequest.getEndTimestamp() == null) {
+					String endTS = Timestamp.parseAfter(partialTS).getDateStr();
+					wbRequest.setEndTimestamp(endTS);
+				}
+			} else {
+				if(wbRequest.getStartTimestamp()== null) {
+					wbRequest.setStartTimestamp(getEarliestTimestamp());
+				}
+				if(wbRequest.getEndTimestamp() == null) {
+					wbRequest.setEndTimestamp(getLatestTimestamp());
+				}
 			}
-			if(wbRequest.getEndTimestamp() == null) {
-				wbRequest.setEndTimestamp(getLatestTimestamp());
-			}
 		}
 		if(wbRequest != null) {
 			wbRequest.fixup(httpRequest);


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