Merge pull request #289 from edoweb/EDOZWO-931

Edozwo 931

Author: inkuss

app/actions/Create.java

@@ -25,6 +25,7 @@
 import java.util.List;
 import com.fasterxml.jackson.databind.JsonNode;
 import helper.HttpArchiveException;
+import helper.WebsiteVersionPublisher;
 import helper.oai.OaiDispatcher;
 import helper.WpullCrawl;
 import models.Gatherconf;
@@ -68,6 +69,7 @@ public Node updateResource(Node node, RegalObject object) {
 	}
 
 	private Node updateResource(Node node) {
+		play.Logger.debug("Updating Node with Pid " + node.getPid());
 		Globals.fedora.updateNode(node);
 		updateIndex(node.getPid());
 		return node;
@@ -79,8 +81,11 @@ private Node updateResource(Node node) {
 	 * @return the updated node
 	 */
 	public Node patchResource(Node node, RegalObject object) {
+		play.Logger.debug("Patching Node with Pid " + node.getPid());
 		new Index().remove(node);
 		setNodeMembers(node, object);
+		node.setLastModifyMessage(
+				WebsiteVersionPublisher.handleWebpagePublishing(node, object));
 		return updateResource(node);
 	}
 

app/actions/Modify.java

@@ -791,7 +791,7 @@ class MetadataNotFoundException extends RuntimeException {
 	}
 
 	@SuppressWarnings({ "serial" })
-	private class UpdateNodeException extends RuntimeException {
+	public class UpdateNodeException extends RuntimeException {
 		UpdateNodeException(Throwable cause) {
 			super(cause);
 		}

app/archive/fedora/FedoraFacade.java

@@ -390,7 +390,7 @@ public void updateNode(Node node) {
 			} else {
 				utils.updateUnManagedStream(node);
 			}
-
+			play.Logger.debug("Updated stream");
 		}
 		if (node.getMetadataFile() != null) {
 			utils.updateMetadataStream(node);

app/controllers/Resource.java

@@ -58,6 +58,7 @@
 import authenticate.BasicAuth;
 import helper.HttpArchiveException;
 import helper.WebgatherUtils;
+import helper.WebsiteVersionPublisher;
 import helper.oai.OaiDispatcher;
 import models.DublinCoreData;
 import models.Gatherconf;
@@ -315,11 +316,20 @@ public static Promise<Result> listDc(@PathParam("pid") String pid) {
 			@ApiImplicitParam(value = "New Object", required = true, dataType = "RegalObject", paramType = "body") })
 	public static Promise<Result> patchResource(@PathParam("pid") String pid) {
 		return new ModifyAction().call(pid, userId -> {
-			Node node = readNodeOrNull(pid);
-			RegalObject object = getRegalObject(request().body().asJson());
-			Node newNode = create.patchResource(node, object);
-			String result = newNode.getPid() + " created/updated!";
-			return JsonMessage(new Message(result));
+			try {
+				play.Logger.debug("Patching Pid: " + pid);
+				String result = "";
+				Node node = readNodeOrNull(pid);
+				RegalObject object = getRegalObject(request().body().asJson());
+				Node newNode = create.patchResource(node, object);
+				result = newNode.getLastModifyMessage();
+				result = result.concat(" " + newNode.getPid() + " created/updated!");
+				return JsonMessage(new Message(result));
+			} catch (Exception e) {
+				play.Logger.error("", e);
+				return JsonMessage(new Message(e, 500));
+				// return JsonMessage(new Message( json(e.toString()) ));
+			}
 		});
 	}
 
@@ -345,6 +355,8 @@ public static Promise<Result> patchResources(@PathParam("pid") String pid) {
 			@ApiImplicitParam(value = "New Object", required = true, dataType = "RegalObject", paramType = "body") })
 	public static Promise<Result> updateResource(@PathParam("pid") String pid) {
 		return new ModifyAction().call(pid, userId -> {
+			play.Logger.debug("Updating Pid: " + pid);
+			String result = "";
 			Node node = readNodeOrNull(pid);
 			RegalObject object = getRegalObject(request().body().asJson());
 			Node newNode = null;
@@ -355,9 +367,11 @@ public static Promise<Result> updateResource(@PathParam("pid") String pid) {
 			} else {
 				newNode = create.updateResource(node, object);
 			}
-			String result = newNode.getPid() + " created/updated!";
+			result = result.concat(newNode.getPid() + " created/updated!");
 			return JsonMessage(new Message(result));
+
 		});
+
 	}
 
 	@ApiOperation(produces = "application/json", nickname = "createNewResource", value = "createNewResource", notes = "Creates a Resource on a new position", response = Message.class, httpMethod = "PUT")
@@ -367,6 +381,9 @@ public static Promise<Result> createResource(
 			@PathParam("namespace") String namespace) {
 		return new CreateAction().call((userId) -> {
 			RegalObject object = getRegalObject(request().body().asJson());
+			if (object.getContentType().equals("webpage")) {
+				object.setAccessScheme("restricted");
+			}
 			Node newNode = create.createResource(namespace, object);
 			String result = newNode.getPid() + " created/updated!";
 			response().setHeader("Location", read.getHttpUriOfResource(newNode));

app/helper/JsonMapper.java

@@ -154,7 +154,7 @@ public JsonMapper(final Node n) {
 						node.getPid() + " metadata2 stream is NULL!");
 		} catch (Exception e) {
 			play.Logger.warn("", e.getMessage());
-			play.Logger.debug("", e);
+			// play.Logger.debug("", e);
 		}
 
 	}
@@ -296,7 +296,7 @@ private Map<String, Object> getDescriptiveMetadata1() {
 			return rdf;
 		} catch (Exception e) {
 			play.Logger
-					.trace(node.getPid() + " can not create JSON! " + e.getMessage());
+					.warn(node.getPid() + " can not create JSON! " + e.getMessage());
 			play.Logger.trace("", e);
 		}
 		return null;
@@ -312,7 +312,7 @@ private Map<String, Object> getDescriptiveMetadata2() {
 		} catch (Exception e) {
 			play.Logger.warn(node.getPid()
 					+ " has no descriptive Metadata2! Try to return metadata instead.");
-			play.Logger.debug("", e);
+			// play.Logger.debug("", e);
 		}
 		return getDescriptiveMetadata1();
 	}
@@ -533,6 +533,7 @@ private void postProcessContribution(Map<String, Object> rdf) {
 			rdf.put("creator", creator);
 		} catch (Exception e) {
 			play.Logger.debug("Problem processing key contribution.agent", e);
+			// play.Logger.debug("", e);
 		}
 	}
 

app/helper/WebgatherUtils.java

@@ -16,33 +16,18 @@
  */
 package helper;
 
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
 import java.net.IDN;
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Map.Entry;
-
-import com.google.common.base.CharMatcher;
-
-import actions.Create;
-import actions.Modify;
-import actions.RegalAction;
 import helper.mail.Mail;
 import models.Gatherconf;
 import models.Globals;
 import models.Message;
 import models.Node;
 import play.Logger;
-import play.Play;
 
 /**
  * Eine Klasse mit nützlichen Methoden im Umfeld des Webgatherings