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

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

Revision: 2712
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2712&view=rev
Author:   bradtofel
Date:     2009-05-20 01:58:38 +0000 (Wed, 20 May 2009)

Log Message:
-----------
REFACTOR: now inherits from WrappedRequestParser, so inherits configuration access methods from the delegate.

Modified Paths:
--------------
    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/OpenSearchRequestParser.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/PathRequestParser.java

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	2009-05-20 01:55:41 UTC (rev 2711)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/FormRequestParser.java	2009-05-20 01:58:38 UTC (rev 2712)
@@ -40,8 +40,15 @@
  * @author brad
  * @version $Date$, $Revision$
  */
-public class FormRequestParser extends BaseRequestParser {
+public class FormRequestParser extends WrappedRequestParser {
 	/**
+	 * @param wrapped
+	 */
+	public FormRequestParser(BaseRequestParser wrapped) {
+		super(wrapped);
+	}
+
+	/**
 	 * CGI argument name for Submit button...
 	 */
 	private final static String SUBMIT_BUTTON = "Submit";
@@ -71,7 +78,7 @@
 			} else {
 				return null;
 			}
-			wbRequest.setResultsPerPage(maxRecords);
+			wbRequest.setResultsPerPage(getMaxRecords());
 			Set<String> keys = queryMap.keySet();
 			Iterator<String> itr = keys.iterator();
 			while(itr.hasNext()) {

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/OpenSearchRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/OpenSearchRequestParser.java	2009-05-20 01:55:41 UTC (rev 2711)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/OpenSearchRequestParser.java	2009-05-20 01:58:38 UTC (rev 2712)
@@ -39,9 +39,16 @@
  * @author brad
  * @version $Date$, $Revision$
  */
-public class OpenSearchRequestParser extends BaseRequestParser {
+public class OpenSearchRequestParser extends WrappedRequestParser {
 
 	/**
+	 * @param wrapped
+	 */
+	public OpenSearchRequestParser(BaseRequestParser wrapped) {
+		super(wrapped);
+	}
+
+	/**
 	 * CGI argument name for query arguments
 	 */
 	public final static String SEARCH_QUERY = "q";
@@ -104,7 +111,7 @@
 			int nr = Integer.parseInt(numResults);
 			wbRequest.setResultsPerPage(nr);
 		} else {
-			wbRequest.setResultsPerPage(maxRecords);
+			wbRequest.setResultsPerPage(getMaxRecords());
 		}
 		if (startPage != null) {
 			int sp = Integer.parseInt(startPage);

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/PathRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/PathRequestParser.java	2009-05-20 01:55:41 UTC (rev 2711)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/PathRequestParser.java	2009-05-20 01:58:38 UTC (rev 2712)
@@ -37,9 +37,16 @@
  * @author brad
  * @version $Date$, $Revision$
  */
-public abstract class PathRequestParser extends BaseRequestParser {
+public abstract class PathRequestParser extends WrappedRequestParser {
 
 	/**
+	 * @param wrapped
+	 */
+	public PathRequestParser(BaseRequestParser wrapped) {
+		super(wrapped);
+	}
+
+	/**
 	 * @param requestPath
 	 * @return WaybackRequest with information parsed from the requestPath, or
 	 * null if information could not be extracted.
@@ -67,7 +74,7 @@
 		
 		WaybackRequest wbRequest = parse(requestPath);
 		if(wbRequest != null) {
-			wbRequest.setResultsPerPage(maxRecords);
+			wbRequest.setResultsPerPage(getMaxRecords());
 		}
 
 		return wbRequest;


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