lee/heritrix3
1
0
Fork 0
mirror of https://github.com/internetarchive/heritrix3.git synced 2026-09-23 22:26:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return http 404 when appropriate.

Browse Source 
* BeanBrowseResource.java
* JobResource.java
This commit is contained in:
nlevitt
2009-12-02 03:24:11 +00:00
parent ed2061560e
commit e3fc474ca4
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/src/main/java/org/archive/crawler/restlet/BeanBrowseResource.java
+9 -9
View File
@@ -40,7 +40,6 @@ import org.restlet.data.MediaType;
import org.restlet.data.Reference;
import org.restlet.data.Request;
import org.restlet.data.Response;
import org.restlet.data.Status;
import org.restlet.resource.Representation;
import org.restlet.resource.ResourceException;
import org.restlet.resource.Variant;
@@ -75,16 +74,13 @@ public class BeanBrowseResource extends JobRelatedResource {
} else {
beanPath = "";
}
if (appCtx == null) {
getResponse().setStatus(Status.CLIENT_ERROR_NOT_FOUND);
// XXX xml?
getResponse().setEntity("No beans; crawl not yet built.", MediaType.TEXT_HTML);
//throw new ResourceException(404);
}
}
public void acceptRepresentation(Representation entity) throws ResourceException {
if (appCtx == null) {
throw new ResourceException(404);
}
// copy op?
Form form = getRequest().getEntityAsForm();
beanPath = form.getFirstValue("beanPath");
@@ -119,6 +115,10 @@ public class BeanBrowseResource extends JobRelatedResource {
}
public Representation represent(Variant variant) throws ResourceException {
if (appCtx == null) {
throw new ResourceException(404);
}
Representation representation;
if (variant.getMediaType() == MediaType.APPLICATION_XML) {
representation = new WriterRepresentation(MediaType.APPLICATION_XML) {
engine/src/main/java/org/archive/crawler/restlet/JobResource.java
+8 -3
View File
@@ -83,12 +83,13 @@ public class JobResource extends Resource {
getVariants().add(new Variant(MediaType.TEXT_HTML));
getVariants().add(new Variant(MediaType.APPLICATION_XML));
cj = getEngine().getJob(TextUtils.urlUnescape((String)req.getAttributes().get("job")));
if(cj==null) {
throw new ResourceException(404);
}
}
public Representation represent(Variant variant) throws ResourceException {
if (cj == null) {
throw new ResourceException(404);
}
Representation representation = null;
if (variant.getMediaType() == MediaType.APPLICATION_XML) {
representation = new WriterRepresentation(MediaType.APPLICATION_XML) {
@@ -545,6 +546,10 @@ public class JobResource extends Resource {
@Override
public void acceptRepresentation(Representation entity) throws ResourceException {
if (cj == null) {
throw new ResourceException(404);
}
// copy op?
Form form = null;
try {