Menu
▾
▴
archive-access-cvs
|
From: <bra...@us...> - 2007-09-28 22:42:10
|
Revision: 2020
http://archive-access.svn.sourceforge.net/archive-access/?rev=2020&view=rev
Author: bradtofel
Date: 2007-09-28 15:42:11 -0700 (Fri, 28 Sep 2007)
Log Message:
-----------
REFACTOR: moved references to store and index to WaybackCollection.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2007-09-28 22:41:20 UTC (rev 2019)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2007-09-28 22:42:11 UTC (rev 2020)
@@ -35,8 +35,6 @@
import org.archive.wayback.QueryRenderer;
import org.archive.wayback.ReplayDispatcher;
import org.archive.wayback.RequestParser;
-import org.archive.wayback.ResourceIndex;
-import org.archive.wayback.ResourceStore;
import org.archive.wayback.ResultURIConverter;
import org.archive.wayback.WaybackConstants;
import org.archive.wayback.accesscontrol.ExclusionFilterFactory;
@@ -71,8 +69,7 @@
private boolean useServerName = false;
private int contextPort = 0;
private String contextName = null;
- private ResourceIndex index = null;
- private ResourceStore store = null;
+ private WaybackCollection collection = null;
private ReplayDispatcher replay = null;
private QueryRenderer query = null;
private RequestParser parser = null;
@@ -295,7 +292,7 @@
throws IOException, ServletException {
Resource resource = null;
try {
- SearchResults results = index.query(wbRequest);
+ SearchResults results = collection.getResourceIndex().query(wbRequest);
if(!(results instanceof CaptureSearchResults)) {
throw new ResourceNotAvailableException("Bad results...");
}
@@ -303,7 +300,7 @@
// TODO: check which versions are actually accessible right now?
SearchResult closest = captureResults.getClosest(wbRequest);
- resource = store.retrieveResource(closest);
+ resource = collection.getResourceStore().retrieveResource(closest);
replay.renderResource(httpRequest, httpResponse, wbRequest,
closest, resource, uriConverter, captureResults);
@@ -321,7 +318,7 @@
throws ServletException, IOException {
try {
- SearchResults results = index.query(wbRequest);
+ SearchResults results = collection.getResourceIndex().query(wbRequest);
if(results.getResultsType().equals(
WaybackConstants.RESULTS_TYPE_CAPTURE)) {
@@ -352,20 +349,6 @@
}
/**
- * @param index the index to set
- */
- public void setIndex(ResourceIndex index) {
- this.index = index;
- }
-
- /**
- * @param store the store to set
- */
- public void setStore(ResourceStore store) {
- this.store = store;
- }
-
- /**
* @param replay the replay to set
*/
public void setReplay(ReplayDispatcher replay) {
@@ -444,4 +427,12 @@
public void setAuthentication(BooleanOperator<WaybackRequest> authentication) {
this.authentication = authentication;
}
+
+ public WaybackCollection getCollection() {
+ return collection;
+ }
+
+ public void setCollection(WaybackCollection collection) {
+ this.collection = collection;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2007-11-28 03:08:06
|
Revision: 2087
http://archive-access.svn.sourceforge.net/archive-access/?rev=2087&view=rev
Author: bradtofel
Date: 2007-11-27 19:08:09 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
FEATURE: added closest indicator for queries, allowed missing trailing '/' on requests to base of AccessPoint
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2007-11-28 02:50:25 UTC (rev 2086)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2007-11-28 03:08:09 UTC (rev 2087)
@@ -137,6 +137,10 @@
}
String contextPath = getContextPath(httpRequest);
if (!origRequestPath.startsWith(contextPath)) {
+ if(contextPath.startsWith(origRequestPath)) {
+ // missing trailing '/', just omit:
+ return "";
+ }
return null;
}
return origRequestPath.substring(contextPath.length());
@@ -321,7 +325,10 @@
SearchResults results = collection.getResourceIndex().query(wbRequest);
if(results.getResultsType().equals(
WaybackConstants.RESULTS_TYPE_CAPTURE)) {
-
+ CaptureSearchResults cResults = (CaptureSearchResults) results;
+ SearchResult closest = cResults.getClosest(wbRequest);
+ closest.put(WaybackConstants.RESULT_CLOSEST_INDICATOR,
+ WaybackConstants.RESULT_CLOSEST_VALUE);
query.renderUrlResults(httpRequest,httpResponse,wbRequest,
results,uriConverter);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-01-15 23:21:01
|
Revision: 2140
http://archive-access.svn.sourceforge.net/archive-access/?rev=2140&view=rev
Author: bradtofel
Date: 2008-01-15 15:21:02 -0800 (Tue, 15 Jan 2008)
Log Message:
-----------
FEATURE: reimplemented lost NotInArchive logging.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2008-01-15 03:06:37 UTC (rev 2139)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2008-01-15 23:21:02 UTC (rev 2140)
@@ -26,6 +26,7 @@
import java.io.IOException;
import java.util.Properties;
+import java.util.logging.Logger;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
@@ -47,6 +48,7 @@
import org.archive.wayback.exception.AuthenticationControlException;
import org.archive.wayback.exception.BadQueryException;
import org.archive.wayback.exception.ResourceNotAvailableException;
+import org.archive.wayback.exception.ResourceNotInArchiveException;
import org.archive.wayback.exception.WaybackException;
import org.archive.wayback.util.operator.BooleanOperator;
import org.springframework.beans.factory.BeanNameAware;
@@ -66,6 +68,9 @@
*/
public class AccessPoint implements RequestContext, BeanNameAware {
+ private static final Logger LOGGER = Logger.getLogger(
+ AccessPoint.class.getName());
+
private boolean useServerName = false;
private int contextPort = 0;
private String contextName = null;
@@ -309,6 +314,7 @@
replay.renderResource(httpRequest, httpResponse, wbRequest,
closest, resource, uriConverter, captureResults);
} catch(WaybackException e) {
+ logNotInArchive(e,wbRequest);
replay.renderException(httpRequest, httpResponse, wbRequest, e);
} finally {
if(resource != null) {
@@ -337,9 +343,23 @@
results,uriConverter);
}
} catch(WaybackException e) {
+ logNotInArchive(e,wbRequest);
query.renderException(httpRequest, httpResponse, wbRequest, e);
}
}
+
+ private void logNotInArchive(WaybackException e, WaybackRequest r) {
+ if(e instanceof ResourceNotInArchiveException) {
+ String url = r.get(WaybackConstants.REQUEST_URL);
+ StringBuilder sb = new StringBuilder(100);
+ sb.append("NotInArchive\t");
+ sb.append(contextName).append("\t");
+ sb.append(contextPort).append("\t");
+ sb.append(url);
+
+ LOGGER.info(sb.toString());
+ }
+ }
/**
* @param contextPort the contextPort to set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-04-11 04:09:20
|
Revision: 2234
http://archive-access.svn.sourceforge.net/archive-access/?rev=2234&view=rev
Author: bradtofel
Date: 2008-04-10 21:09:26 -0700 (Thu, 10 Apr 2008)
Log Message:
-----------
FEATURE: added shutdown() method, which shuts down the local collection.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2008-04-11 04:08:21 UTC (rev 2233)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2008-04-11 04:09:26 UTC (rev 2234)
@@ -348,6 +348,12 @@
}
}
+ public void shutdown() throws IOException {
+ if(collection != null) {
+ collection.shutdown();
+ }
+ }
+
private void logNotInArchive(WaybackException e, WaybackRequest r) {
if(e instanceof ResourceNotInArchiveException) {
String url = r.get(WaybackConstants.REQUEST_URL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-07-01 23:55:59
|
Revision: 2381
http://archive-access.svn.sourceforge.net/archive-access/?rev=2381&view=rev
Author: bradtofel
Date: 2008-07-01 16:56:08 -0700 (Tue, 01 Jul 2008)
Log Message:
-----------
REFACTOR: SearchResult => (Url|Capture)SearchResult
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2008-07-01 23:55:46 UTC (rev 2380)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2008-07-01 23:56:08 UTC (rev 2381)
@@ -41,11 +41,12 @@
import org.archive.wayback.ResultURIConverter;
import org.archive.wayback.WaybackConstants;
import org.archive.wayback.accesscontrol.ExclusionFilterFactory;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.core.CaptureSearchResults;
import org.archive.wayback.core.Resource;
-import org.archive.wayback.core.SearchResult;
import org.archive.wayback.core.SearchResults;
import org.archive.wayback.core.UIResults;
+import org.archive.wayback.core.UrlSearchResults;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.exception.AuthenticationControlException;
import org.archive.wayback.exception.BaseExceptionRenderer;
@@ -230,7 +231,7 @@
WaybackRequest wbRequest = new WaybackRequest();
wbRequest.setContextPrefix(getAbsoluteLocalPrefix(httpRequest));
wbRequest.setContext(this);
- UIResults uiResults = new UIResults(wbRequest);
+ UIResults uiResults = new UIResults(wbRequest,uriConverter);
String translated = "/" + translateRequestPathQuery(httpRequest);
uiResults.storeInRequest(httpRequest,translated);
RequestDispatcher dispatcher = null;
@@ -310,7 +311,7 @@
CaptureSearchResults captureResults = (CaptureSearchResults) results;
// TODO: check which versions are actually accessible right now?
- SearchResult closest = captureResults.getClosest(wbRequest);
+ CaptureSearchResult closest = captureResults.getClosest(wbRequest);
resource = collection.getResourceStore().retrieveResource(closest);
ReplayRenderer renderer = replay.getRenderer(wbRequest, closest, resource);
renderer.renderResource(httpRequest, httpResponse, wbRequest,
@@ -327,18 +328,19 @@
throws ServletException, IOException, WaybackException {
SearchResults results = collection.getResourceIndex().query(wbRequest);
- if(results.getResultsType().equals(
- WaybackConstants.RESULTS_TYPE_CAPTURE)) {
+ if(results instanceof CaptureSearchResults) {
CaptureSearchResults cResults = (CaptureSearchResults) results;
- SearchResult closest = cResults.getClosest(wbRequest);
- closest.put(WaybackConstants.RESULT_CLOSEST_INDICATOR,
- WaybackConstants.RESULT_CLOSEST_VALUE);
+ CaptureSearchResult closest = cResults.getClosest(wbRequest);
+ closest.setClosest(true);
+ query.renderCaptureResults(httpRequest,httpResponse,wbRequest,
+ cResults,uriConverter);
+
+ } else if(results instanceof UrlSearchResults) {
+ UrlSearchResults uResults = (UrlSearchResults) results;
query.renderUrlResults(httpRequest,httpResponse,wbRequest,
- results,uriConverter);
-
+ uResults,uriConverter);
} else {
- query.renderUrlPrefixResults(httpRequest,httpResponse,wbRequest,
- results,uriConverter);
+ throw new WaybackException("Unknown index format");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-07-07 21:34:37
|
Revision: 2414
http://archive-access.svn.sourceforge.net/archive-access/?rev=2414&view=rev
Author: bradtofel
Date: 2008-07-07 14:34:45 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
INTERAFACE: now call getClosest() with true optional second argument, causing an AnchorWindowTooSmallException if no results are within the requested window.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2008-07-07 21:33:24 UTC (rev 2413)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2008-07-07 21:34:45 UTC (rev 2414)
@@ -311,7 +311,8 @@
CaptureSearchResults captureResults = (CaptureSearchResults) results;
// TODO: check which versions are actually accessible right now?
- CaptureSearchResult closest = captureResults.getClosest(wbRequest);
+ CaptureSearchResult closest = captureResults.getClosest(wbRequest,
+ true);
resource = collection.getResourceStore().retrieveResource(closest);
ReplayRenderer renderer = replay.getRenderer(wbRequest, closest, resource);
renderer.renderResource(httpRequest, httpResponse, wbRequest,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-07-09 00:26:10
|
Revision: 2423
http://archive-access.svn.sourceforge.net/archive-access/?rev=2423&view=rev
Author: bradtofel
Date: 2008-07-08 17:26:19 -0700 (Tue, 08 Jul 2008)
Log Message:
-----------
INTERFACE: now use CaptureSearchResults.markClosest()
COMMENT: javadoc update
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2008-07-08 23:46:16 UTC (rev 2422)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2008-07-09 00:26:19 UTC (rev 2423)
@@ -61,11 +61,15 @@
* within a ServletContext, including holding references to the
* implementation instances of the primary Wayback classes:
*
- * ResourceIndex
- * ResourceStore
- * QueryUI
- * ReplayUI
+ * RequestParser
+ * ResourceIndex(via WaybackCollection)
+ * ResourceStore(via WaybackCollection)
+ * QueryRenderer
+ * ReplayDispatcher
+ * ExceptionRenderer
+ * ResultURIConverter
*
+ *
* @author brad
* @version $Date$, $Revision$
*/
@@ -331,8 +335,7 @@
SearchResults results = collection.getResourceIndex().query(wbRequest);
if(results instanceof CaptureSearchResults) {
CaptureSearchResults cResults = (CaptureSearchResults) results;
- CaptureSearchResult closest = cResults.getClosest(wbRequest);
- closest.setClosest(true);
+ cResults.markClosest(wbRequest);
query.renderCaptureResults(httpRequest,httpResponse,wbRequest,
cResults,uriConverter);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X