archive-access-cvs

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

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

Revision: 1772
          http://archive-access.svn.sourceforge.net/archive-access/?rev=1772&view=rev
Author:   bradtofel
Date:     2007-07-16 15:34:00 -0700 (Mon, 16 Jul 2007)

Log Message:
-----------
REFACTOR: move StringFormatter into wbRequest
FEATURE: now includes methods for accessing Server and Context prefixes from WBRequest.

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/UIResults.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/UIResults.java	2007-07-16 22:32:47 UTC (rev 1771)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/UIResults.java	2007-07-16 22:34:00 UTC (rev 1772)
@@ -49,6 +49,9 @@
 	 * @return Returns the wbRequest.
 	 */
 	public WaybackRequest getWbRequest() {
+		if(wbRequest == null) {
+			wbRequest = new WaybackRequest();
+		}
 		return wbRequest;
 	}
 
@@ -56,7 +59,7 @@
 	 * @return StringFormatter localized to user request
 	 */
 	public StringFormatter getFormatter() {
-		return wbRequest.getFormatter();
+		return getWbRequest().getFormatter();
 	}
 	/**
 	 * Store this UIResults in the HttpServletRequest argument.
@@ -147,4 +150,17 @@
 		replaceAll(encoded,"quot",""");
 		return encoded.toString();
 	}
+	/**
+	 * @return URL that points to the root of the current WaybackContext
+	 */
+	public String getContextPrefix() {
+		return getWbRequest().getContextPrefix();
+	}
+
+	/**
+	 * @return URL that points to the root of the Server
+	 */
+	public String getServerPrefix() {
+		return getWbRequest().getServerPrefix();
+	}
 }


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: [1810] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/core/UIResults.java

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

Revision: 1810
          http://archive-access.svn.sourceforge.net/archive-access/?rev=1810&view=rev
Author:   bradtofel
Date:     2007-07-19 13:39:07 -0700 (Thu, 19 Jul 2007)

Log Message:
-----------
FEATURE: added getContextConfig() to allow .jsps to access WaybackContext specific configurations

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/UIResults.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/UIResults.java	2007-07-19 20:38:24 UTC (rev 1809)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/UIResults.java	2007-07-19 20:39:07 UTC (rev 1810)
@@ -24,9 +24,12 @@
  */
 package org.archive.wayback.core;
 
+import java.util.Properties;
+
 import javax.servlet.http.HttpServletRequest;
 
 import org.archive.wayback.util.StringFormatter;
+import org.archive.wayback.webapp.WaybackContext;
 
 /**
  *
@@ -37,7 +40,9 @@
 public class UIResults {
 	private final static String FERRET_NAME = "ui-results";
 	protected WaybackRequest wbRequest;
+	private String contentJsp = null;
 	
+	
 	/**
 	 * @param wbRequest Wayback Request argument
 	 */
@@ -64,8 +69,11 @@
 	/**
 	 * Store this UIResults in the HttpServletRequest argument.
 	 * @param httpRequest
+	 * @param contentJsp 
 	 */
-	public void storeInRequest(HttpServletRequest httpRequest) {
+	public void storeInRequest(HttpServletRequest httpRequest, 
+			String contentJsp) {
+		this.contentJsp = contentJsp;
 		httpRequest.setAttribute(FERRET_NAME, this);		
 	}
 
@@ -78,7 +86,7 @@
 		if(results == null) {
 			results = getGeneric(httpRequest);
 			// why not store it in case someone else needs it...
-			results.storeInRequest(httpRequest);
+//			results.storeInRequest(httpRequest,"");
 		}
 		return results;
 	}
@@ -163,4 +171,32 @@
 	public String getServerPrefix() {
 		return getWbRequest().getServerPrefix();
 	}
+	/**
+	 * @return the contentJsp
+	 */
+	public String getContentJsp() {
+		return contentJsp;
+	}
+	/**
+	 * @param contentJsp the contentJsp to set
+	 */
+	public void setContentJsp(String contentJsp) {
+		this.contentJsp = contentJsp;
+	}
+	/**
+	 * @param configName
+	 * @return String configuration for the context, if present, otherwise null
+	 */
+	public String getContextConfig(final String configName) {
+		String configValue = null;
+		WaybackContext context = getWbRequest().getContext();
+		if(context != null) {
+			Properties configs = context.getConfigs();
+			if(configs != null) {
+				configValue = configs.getProperty(configName);
+			}
+		}
+		return configValue;
+	}
+	
 }


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: [2098] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/core/UIResults.java

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

Revision: 2098
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2098&view=rev
Author:   bradtofel
Date:     2007-11-29 13:05:22 -0800 (Thu, 29 Nov 2007)

Log Message:
-----------
FEATURE: now store original request URL, for access within subsequent JSP processes.

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/UIResults.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/UIResults.java	2007-11-29 20:39:33 UTC (rev 2097)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/UIResults.java	2007-11-29 21:05:22 UTC (rev 2098)
@@ -41,6 +41,7 @@
 	private final static String FERRET_NAME = "ui-results";
 	protected WaybackRequest wbRequest;
 	private String contentJsp = null;
+	private String originalRequestURL = null;
 	
 	
 	/**
@@ -74,7 +75,8 @@
 	public void storeInRequest(HttpServletRequest httpRequest, 
 			String contentJsp) {
 		this.contentJsp = contentJsp;
-		httpRequest.setAttribute(FERRET_NAME, this);		
+		this.originalRequestURL = httpRequest.getRequestURL().toString();
+		httpRequest.setAttribute(FERRET_NAME, this);
 	}
 
 	/**
@@ -198,5 +200,8 @@
 		}
 		return configValue;
 	}
+	public String getOriginalRequestURL() {
+		return originalRequestURL;
+	}
 	
 }


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