|
From: <bra...@us...> - 2008-07-29 02:13:37
|
Revision: 2516
http://archive-access.svn.sourceforge.net/archive-access/?rev=2516&view=rev
Author: bradtofel
Date: 2008-07-29 02:13:46 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
TWEAK: added some common cookie keys to omit from generated query URLs.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2008-07-28 21:58:30 UTC (rev 2515)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2008-07-29 02:13:46 UTC (rev 2516)
@@ -332,6 +332,12 @@
private static String UI_RESOURCE_BUNDLE_NAME = "WaybackUI";
+ private static String STD_LOGGED_IN_VER = "logged-in-ver";
+ private static String STD_LOGGED_IN_NAME = "logged-in-name";
+ private static String STD_LOGGED_IN_USER = "logged-in-user";
+ private static String STD_PHP_SESSION_ID = "PHPSESSID";
+ private static String STD_J_SESSION_ID = "JSESSIONID";
+
/**
* set of filter keys that are not forwarded to subsequent paginated
* requests.
@@ -344,7 +350,12 @@
REQUEST_WAYBACK_CONTEXT,
REQUEST_AUTH_TYPE,
REQUEST_REMOTE_USER,
- REQUEST_LOCALE_LANG };
+ REQUEST_LOCALE_LANG,
+ STD_LOGGED_IN_USER,
+ STD_LOGGED_IN_VER,
+ STD_LOGGED_IN_NAME,
+ STD_PHP_SESSION_ID,
+ STD_J_SESSION_ID };
/**
* @return Returns the resultsPerPage.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-08 22:59:05
|
Revision: 2526
http://archive-access.svn.sourceforge.net/archive-access/?rev=2526&view=rev
Author: bradtofel
Date: 2008-08-08 22:59:14 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
BUGFIX(unreported) setting start/end dates is the responsibility of RequestParser.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2008-08-07 22:00:34 UTC (rev 2525)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2008-08-08 22:59:14 UTC (rev 2526)
@@ -758,34 +758,34 @@
*/
public void fixup(HttpServletRequest httpRequest) {
extractHttpRequestInfo(httpRequest);
- String startDate = get(REQUEST_START_DATE);
- String endDate = get(REQUEST_END_DATE);
- String exactDate = get(REQUEST_EXACT_DATE);
- String partialDate = get(REQUEST_DATE);
- if (partialDate == null) {
- partialDate = "";
- }
- if (startDate == null || startDate.length() == 0) {
- put(REQUEST_START_DATE, Timestamp
- .padStartDateStr(partialDate));
- } else if (startDate.length() < 14) {
- put(REQUEST_START_DATE, Timestamp
- .padStartDateStr(startDate));
- }
- if (endDate == null || endDate.length() == 0) {
- put(REQUEST_END_DATE, Timestamp
- .padEndDateStr(partialDate));
- } else if (endDate.length() < 14) {
- put(REQUEST_END_DATE, Timestamp
- .padEndDateStr(endDate));
- }
- if (exactDate == null || exactDate.length() == 0) {
- put(REQUEST_EXACT_DATE, Timestamp
- .padEndDateStr(partialDate));
- } else if (exactDate.length() < 14) {
- put(REQUEST_EXACT_DATE, Timestamp
- .padEndDateStr(exactDate));
- }
+// String startDate = get(REQUEST_START_DATE);
+// String endDate = get(REQUEST_END_DATE);
+// String exactDate = get(REQUEST_EXACT_DATE);
+// String partialDate = get(REQUEST_DATE);
+// if (partialDate == null) {
+// partialDate = "";
+// }
+// if (startDate == null || startDate.length() == 0) {
+// put(REQUEST_START_DATE, Timestamp
+// .padStartDateStr(partialDate));
+// } else if (startDate.length() < 14) {
+// put(REQUEST_START_DATE, Timestamp
+// .padStartDateStr(startDate));
+// }
+// if (endDate == null || endDate.length() == 0) {
+// put(REQUEST_END_DATE, Timestamp
+// .padEndDateStr(partialDate));
+// } else if (endDate.length() < 14) {
+// put(REQUEST_END_DATE, Timestamp
+// .padEndDateStr(endDate));
+// }
+// if (exactDate == null || exactDate.length() == 0) {
+// put(REQUEST_EXACT_DATE, Timestamp
+// .padEndDateStr(partialDate));
+// } else if (exactDate.length() < 14) {
+// put(REQUEST_EXACT_DATE, Timestamp
+// .padEndDateStr(exactDate));
+// }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 02:48:53
|
Revision: 2561
http://archive-access.svn.sourceforge.net/archive-access/?rev=2561&view=rev
Author: bradtofel
Date: 2008-08-19 02:49:03 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
TWEAK: changed values for type of request - capturequery is now back to "urlquery" and "urlquery" is now "prefixquery".
TWEAK: cookie values no longer override provided/existing values.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2008-08-19 02:46:23 UTC (rev 2560)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2008-08-19 02:49:03 UTC (rev 2561)
@@ -112,12 +112,12 @@
* REQUEST_TYPE option indicating a query against the ResourceIndex for
* captures of URLs matching the REQUEST_URL
*/
- public static final String REQUEST_CAPTURE_QUERY = "capturequery";
+ public static final String REQUEST_CAPTURE_QUERY = "urlquery";
/**
* REQUEST_TYPE option indicating a query against the ResourceIndex for
* summaries of URLs prefixed with the REQUEST_URL
*/
- public static final String REQUEST_URL_QUERY = "urlquery";
+ public static final String REQUEST_URL_QUERY = "prefixquery";
/*
* **********************
* /REQUEST TYPE CONSTANTS
@@ -744,7 +744,12 @@
Cookie[] cookies = httpRequest.getCookies();
if(cookies != null) {
for(Cookie cookie : cookies) {
- put(cookie.getName(),cookie.getValue());
+ String name = cookie.getName();
+ String value = cookie.getValue();
+ String oldVal = get(name);
+ if(oldVal == null || oldVal.length() == 0) {
+ put(name,value);
+ }
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-10-10 00:30:39
|
Revision: 2601
http://archive-access.svn.sourceforge.net/archive-access/?rev=2601&view=rev
Author: bradtofel
Date: 2008-10-10 00:30:29 +0000 (Fri, 10 Oct 2008)
Log Message:
-----------
BUGFIX (unreported): do not forward WaybackRequest fields with 'null' values.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2008-10-10 00:26:15 UTC (rev 2600)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2008-10-10 00:30:29 UTC (rev 2601)
@@ -822,6 +822,7 @@
}
if(isStandard) continue;
String val = filters.get(key);
+ if(val == null) continue;
if (queryString.length() > 0) {
queryString.append(" ");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-11-07 22:29:48
|
Revision: 2635
http://archive-access.svn.sourceforge.net/archive-access/?rev=2635&view=rev
Author: bradtofel
Date: 2008-11-07 22:29:45 +0000 (Fri, 07 Nov 2008)
Log Message:
-----------
FEATURE: now supports more schemes within setRequestUrl() - any defined within org.archive.wayback.util.url.UrlOperations
FEATURE: now supports boolean exactScheme flag to indicate that user wishes only to match records with the same scheme as the requestUrl
TWEAK: removed some code that had been commented out and is no longer used/needed.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2008-11-07 02:11:09 UTC (rev 2634)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2008-11-07 22:29:45 UTC (rev 2635)
@@ -39,6 +39,7 @@
import org.archive.wayback.util.ObjectFilter;
import org.archive.wayback.util.StringFormatter;
import org.archive.wayback.util.Timestamp;
+import org.archive.wayback.util.url.UrlOperations;
import org.archive.wayback.webapp.AccessPoint;
/**
@@ -186,6 +187,12 @@
public static final String REQUEST_EXACT_HOST_ONLY = "requestexacthost";
/**
+ * Indicates user only wants results that were captured using the same
+ * scheme as that specified in REQUEST_URL.
+ */
+ public static final String REQUEST_EXACT_SCHEME_ONLY = "requestexactscheme";
+
+ /**
* indicates positive value for any request boolean flag.
*/
public static final String REQUEST_YES = "yes";
@@ -556,16 +563,27 @@
* @param urlStr Request URL.
*/
public void setRequestUrl(String urlStr) {
- // TODO: fix this to use other schemes
- if (!urlStr.startsWith("http://")) {
+
+ // This looks a little confusing: We're trying to fixup an incoming
+ // request URL that starts with:
+ // "http:/www.archive.org"
+ // so it becomes:
+ // "http://www.archive.org"
+ // (note the missing second "/" in the first)
+ //
+ // if that is not the case, then see if the incoming scheme
+ // is known, adding an implied "http://" scheme if there doesn't appear
+ // to be a scheme..
+ // TODO: make the default "http://" configurable.
+ if (!urlStr.startsWith(UrlOperations.HTTP_SCHEME)) {
if(urlStr.startsWith("http:/")) {
- urlStr = "http://" + urlStr.substring(6);
+ urlStr = UrlOperations.HTTP_SCHEME + urlStr.substring(6);
} else {
- urlStr = "http://" + urlStr;
+ if(UrlOperations.urlToScheme(urlStr) == null) {
+ urlStr = UrlOperations.HTTP_SCHEME + urlStr;
+ }
}
}
-// UURI requestURI = UURIFactory.getInstance(urlStr);
-// put(REQUEST_URL_CLEANED, requestURI.toString());
put(REQUEST_URL, urlStr);
}
@@ -614,6 +632,13 @@
public boolean isExactHost() {
return getBoolean(REQUEST_EXACT_HOST_ONLY);
}
+
+ public void setExactScheme(boolean isExactScheme) {
+ setBoolean(REQUEST_EXACT_SCHEME_ONLY,isExactScheme);
+ }
+ public boolean isExactScheme() {
+ return getBoolean(REQUEST_EXACT_SCHEME_ONLY);
+ }
public String getAnchorTimestamp() {
return get(REQUEST_ANCHOR_DATE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2009-05-20 00:44:11
|
Revision: 2708
http://archive-access.svn.sourceforge.net/archive-access/?rev=2708&view=rev
Author: bradtofel
Date: 2009-05-20 00:44:04 +0000 (Wed, 20 May 2009)
Log Message:
-----------
FEATURE: added static flags and access methods for JS, CSS, and IMG contexts.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2009-05-20 00:42:23 UTC (rev 2707)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2009-05-20 00:44:04 UTC (rev 2708)
@@ -233,6 +233,18 @@
* Request: xml data requested
*/
public static final String REQUEST_XML_DATA = "xmldata";
+ /**
+ * Request: CSS context requested
+ */
+ public static final String REQUEST_CSS_CONTEXT = "csscontext";
+ /**
+ * Request: JS context requested
+ */
+ public static final String REQUEST_JS_CONTEXT = "jscontext";
+ /**
+ * Request: IMG context requested
+ */
+ public static final String REQUEST_IMAGE_CONTEXT = "imagecontext";
/*
* *******************************
* /OUTPUT TYPE CONSTANTS
@@ -677,7 +689,28 @@
public boolean isXMLMode() {
return getBoolean(REQUEST_XML_DATA);
}
+
+ public void setJSContext(boolean isJSContext) {
+ setBoolean(REQUEST_JS_CONTEXT,isJSContext);
+ }
+ public boolean isJSContext() {
+ return getBoolean(REQUEST_JS_CONTEXT);
+ }
+
+ public void setCSSContext(boolean isCSSContext) {
+ setBoolean(REQUEST_CSS_CONTEXT,isCSSContext);
+ }
+ public boolean isCSSContext() {
+ return getBoolean(REQUEST_CSS_CONTEXT);
+ }
+ public void setIMGContext(boolean isIMGContext) {
+ setBoolean(REQUEST_IMAGE_CONTEXT,isIMGContext);
+ }
+ public boolean isIMGContext() {
+ return getBoolean(REQUEST_IMAGE_CONTEXT);
+ }
+
public String getWaybackContext() {
return get(REQUEST_WAYBACK_CONTEXT);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2009-10-22 23:38:11
|
Revision: 2813
http://archive-access.svn.sourceforge.net/archive-access/?rev=2813&view=rev
Author: bradtofel
Date: 2009-10-22 23:37:57 +0000 (Thu, 22 Oct 2009)
Log Message:
-----------
REFACTOR: moved request-specific resultFilter creation here from LocalResourceIndex -- these should still be moved into a "query parser" type class..
FEATURE: added charset "mode" feature, which will allow the user to specify one of several strategies on a request-by-request basis.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2009-10-22 23:34:57 UTC (rev 2812)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2009-10-22 23:37:57 UTC (rev 2813)
@@ -36,7 +36,10 @@
import javax.servlet.http.HttpServletRequest;
import org.archive.wayback.requestparser.OpenSearchRequestParser;
+import org.archive.wayback.resourceindex.filters.HostMatchFilter;
+import org.archive.wayback.resourceindex.filters.SchemeMatchFilter;
import org.archive.wayback.util.ObjectFilter;
+import org.archive.wayback.util.ObjectFilterChain;
import org.archive.wayback.util.StringFormatter;
import org.archive.wayback.util.Timestamp;
import org.archive.wayback.util.url.UrlOperations;
@@ -76,10 +79,22 @@
/**
* custom CaptureSearchResult Filter to use for this specific request. Can
* be null, and is sometimes useful to allow an AccessPoint to have specific
- * and possibly variable filters.
+ * and possibly variable filters. These filters relate specifically to
+ * exclusion of results from the ResourceIndex. Compared to the
+ * resultFilters, if these filters redact all results, then an
+ * AccessControlException will be thrown.
*/
private ObjectFilter<CaptureSearchResult> exclusionFilter = null;
+
/**
+ * custom CaptureSearchResult Filter to use for this specific request. Can
+ * be null, and is sometimes useful to allow an AccessPoint to have specific
+ * and possibly variable filters.
+ */
+ private ObjectFilterChain<CaptureSearchResult> resultFilters = null;
+
+
+ /**
* StringFormatter object set up with the users specific Locale, and the
* Wayback UI ResourceBundle prepared for use, simplifying UI generation
* somewhat.
@@ -245,6 +260,12 @@
* Request: IMG context requested
*/
public static final String REQUEST_IMAGE_CONTEXT = "imagecontext";
+
+ /**
+ * Request: Charset detection mode
+ */
+ public static final String REQUEST_CHARSET_MODE = "charsetmode";
+
/*
* *******************************
* /OUTPUT TYPE CONSTANTS
@@ -467,6 +488,35 @@
this.exclusionFilter = exclusionFilter;
}
+ public ObjectFilter<CaptureSearchResult> getResultFilters() {
+ ObjectFilterChain<CaptureSearchResult> tmpFilters =
+ new ObjectFilterChain<CaptureSearchResult>();
+ if(isExactHost()) {
+ tmpFilters.addFilter(new HostMatchFilter(
+ UrlOperations.urlToHost(getRequestUrl())));
+ }
+
+ if(isExactScheme()) {
+ tmpFilters.addFilter(new SchemeMatchFilter(
+ UrlOperations.urlToScheme(getRequestUrl())));
+ }
+ if(resultFilters != null) {
+ tmpFilters.addFilters(resultFilters.getFilters());
+ }
+ return tmpFilters;
+ }
+
+ public void setResultFilters(ObjectFilterChain<CaptureSearchResult> resultFilters) {
+ this.resultFilters = resultFilters;
+ }
+
+ public void addResultFilter(ObjectFilter<CaptureSearchResult> resultFilter) {
+ if(resultFilters == null) {
+ resultFilters = new ObjectFilterChain<CaptureSearchResult>();
+ }
+ resultFilters.addFilter(resultFilter);
+ }
+
/**
* @return StringFormatter based on user request info
*/
@@ -502,7 +552,18 @@
} else {
remove(key);
}
+ }
+
+ private int getInt(String key) {
+ String value = get(key);
+ if(value == null) {
+ return -1;
+ }
+ return Integer.parseInt(value);
}
+ private void setInt(String key, int value) {
+ put(key,String.valueOf(value));
+ }
private boolean getBoolean(String key) {
String value = get(key);
return(value != null && value.equals(REQUEST_YES));
@@ -549,7 +610,7 @@
return isRequestType(REQUEST_CAPTURE_QUERY);
}
/**
- * marks this request as a Replay request
+ * marks this request as a Capture Query request
*/
public void setCaptureQueryRequest() {
put(REQUEST_TYPE,REQUEST_CAPTURE_QUERY);
@@ -561,7 +622,7 @@
return isRequestType(REQUEST_URL_QUERY);
}
/**
- * marks this request as a Replay request
+ * marks this request as an Url Query request
*/
public void setUrlQueryRequest() {
put(REQUEST_TYPE,REQUEST_URL_QUERY);
@@ -711,6 +772,14 @@
return getBoolean(REQUEST_IMAGE_CONTEXT);
}
+ public void setCharsetMode(int mode) {
+ setInt(REQUEST_CHARSET_MODE,mode);
+ }
+ public int getCharsetMode() {
+ int mode = getInt(REQUEST_CHARSET_MODE);
+ return (mode == -1) ? 0 : mode;
+ }
+
public String getWaybackContext() {
return get(REQUEST_WAYBACK_CONTEXT);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2010-04-14 21:05:19
|
Revision: 3035
http://archive-access.svn.sourceforge.net/archive-access/?rev=3035&view=rev
Author: bradtofel
Date: 2010-04-14 21:05:13 +0000 (Wed, 14 Apr 2010)
Log Message:
-----------
FEATURE: added live web request flag
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2010-04-14 18:44:53 UTC (rev 3034)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2010-04-14 21:05:13 UTC (rev 3035)
@@ -207,6 +207,11 @@
* scheme as that specified in REQUEST_URL.
*/
public static final String REQUEST_EXACT_SCHEME_ONLY = "requestexactscheme";
+
+ /**
+ * Indicates user requested content from proxied from the live web.
+ */
+ public static final String REQUEST_IS_LIVE_WEB = "requestliveweb";
/**
* indicates positive value for any request boolean flag.
@@ -720,6 +725,13 @@
public boolean isExactScheme() {
return getBoolean(REQUEST_EXACT_SCHEME_ONLY);
}
+
+ public void setLiveWebRequest(boolean isLiveWebRequest) {
+ setBoolean(REQUEST_IS_LIVE_WEB,isLiveWebRequest);
+ }
+ public boolean isLiveWebRequest() {
+ return getBoolean(REQUEST_IS_LIVE_WEB);
+ }
public String getAnchorTimestamp() {
return get(REQUEST_ANCHOR_DATE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2010-06-24 20:26:31
|
Revision: 3162
http://archive-access.svn.sourceforge.net/archive-access/?rev=3162&view=rev
Author: bradtofel
Date: 2010-06-24 20:26:25 +0000 (Thu, 24 Jun 2010)
Log Message:
-----------
FEATURE: now adds HTTP "Authorization" header to the WaybackRequest
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2010-06-24 20:25:21 UTC (rev 3161)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2010-06-24 20:26:25 UTC (rev 3162)
@@ -324,6 +324,10 @@
* see HttpServletRequest.getRemoteUser()
*/
public static final String REQUEST_REMOTE_USER = "requestremoteuser";
+ /**
+ * Exact value from HTTP request for header "Authorization"
+ */
+ public static final String REQUEST_AUTHORIZATION = "Authorization";
/**
* User Locale name: Best Guess at users requested locale.
@@ -866,6 +870,9 @@
putUnlessNull(REQUEST_WAYBACK_HOSTNAME, httpRequest.getLocalName());
putUnlessNull(REQUEST_AUTH_TYPE, httpRequest.getAuthType());
putUnlessNull(REQUEST_REMOTE_USER, httpRequest.getRemoteUser());
+
+ putUnlessNull(REQUEST_AUTHORIZATION,
+ httpRequest.getHeader(REQUEST_AUTHORIZATION));
putUnlessNull(REQUEST_WAYBACK_PORT,
String.valueOf(httpRequest.getLocalPort()));
putUnlessNull(REQUEST_WAYBACK_CONTEXT, httpRequest.getContextPath());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2011-05-25 01:33:09
|
Revision: 3449
http://archive-access.svn.sourceforge.net/archive-access/?rev=3449&view=rev
Author: bradtofel
Date: 2011-05-25 01:33:03 +0000 (Wed, 25 May 2011)
Log Message:
-----------
FEATURE: added FrameWrapped state tracking code
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2011-05-25 01:30:18 UTC (rev 3448)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2011-05-25 01:33:03 UTC (rev 3449)
@@ -266,6 +266,17 @@
*/
public static final String REQUEST_IDENTITY_CONTEXT = "identitycontext";
+ /**
+ * Request: Content should be wrapped in a frame
+ */
+ public static final String REQUEST_FRAME_WRAPPER_CONTEXT =
+ "framewrappercontext";
+
+ /**
+ * Request: Display context for embedded metadata in an IFrame
+ */
+ public static final String REQUEST_IFRAME_WRAPPER_CONTEXT =
+ "iframewrappercontext";
/**
* Request: Charset detection mode
@@ -784,6 +795,20 @@
return getBoolean(REQUEST_IDENTITY_CONTEXT);
}
+ public void setFrameWrapperContext(boolean isFrameWrapperContext) {
+ setBoolean(REQUEST_FRAME_WRAPPER_CONTEXT,isFrameWrapperContext);
+ }
+ public boolean isFrameWrapperContext() {
+ return getBoolean(REQUEST_FRAME_WRAPPER_CONTEXT);
+ }
+
+ public void setIFrameWrapperContext(boolean isIFrameWrapperContext) {
+ setBoolean(REQUEST_IFRAME_WRAPPER_CONTEXT,isIFrameWrapperContext);
+ }
+ public boolean isIFrameWrapperContext() {
+ return getBoolean(REQUEST_IFRAME_WRAPPER_CONTEXT);
+ }
+
public void setCharsetMode(int mode) {
setInt(REQUEST_CHARSET_MODE,mode);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|