Merge pull request #14 from edoweb/0.6.0

0.6.0

Author: jschnasse

app/actions/Create.java

@@ -17,9 +17,13 @@
 package actions;
 
 import static archive.fedora.Vocabulary.TYPE_OBJECT;
+import helper.HttpArchiveException;
 
 import java.util.List;
 
+import org.openrdf.rio.RDFFormat;
+
+import archive.fedora.RdfUtils;
 import models.Globals;
 import models.Node;
 import models.RegalObject;
@@ -113,8 +117,6 @@ private void setNodeMembers(Node node, RegalObject object) {
 	    setNodeType(object.getContentType(), node);
 	if (object.getParentPid() != null)
 	    linkWithParent(object.getParentPid(), node);
-	if (object.getTransformer() != null)
-	    updateTransformer(object.getTransformer(), node);
 	if (object.getAccessScheme() != null)
 	    node.setAccessScheme(object.getAccessScheme());
 	if (object.getPublishScheme() != null)
@@ -125,17 +127,19 @@ private void setNodeMembers(Node node, RegalObject object) {
 	    node.setImportedFrom(object.getIsDescribedBy().getImportedFrom());
 	if (object.getIsDescribedBy().getLegacyId() != null)
 	    node.setLegacyId(object.getIsDescribedBy().getLegacyId());
+	if (object.getTransformer() != null)
+	    updateTransformer(object.getTransformer(), node);
     }
 
     private void overrideNodeMembers(Node node, RegalObject object) {
 	setNodeType(object.getContentType(), node);
 	linkWithParent(object.getParentPid(), node);
-	updateTransformer(object.getTransformer(), node);
 	node.setAccessScheme(object.getAccessScheme());
 	node.setPublishScheme(object.getPublishScheme());
 	node.setCreatedBy(object.getIsDescribedBy().getCreatedBy());
 	node.setImportedFrom(object.getIsDescribedBy().getImportedFrom());
 	node.setLegacyId(object.getIsDescribedBy().getLegacyId());
+	updateTransformer(object.getTransformer(), node);
     }
 
     private void setNodeType(String type, Node node) {
@@ -155,10 +159,19 @@ private void updateTransformer(List<String> transformers, Node node) {
 	if ("public".equals(node.getPublishScheme())) {
 	    node.addTransformer(new Transformer("oaidc"));
 	}
+	if (node.hasUrn()) {
+	    node.addTransformer(new Transformer("epicur"));
+	    node.addTransformer(new Transformer("aleph"));
+	}
+
 	if (transformers != null) {
 	    for (String t : transformers) {
 		if ("oaidc".equals(t))
-		    continue; // already added
+		    continue; // implicitly added - or not allowed to set
+		if ("epicur".equals(t))
+		    continue; // implicitly added - or not allowed to set
+		if ("aleph".equals(t))
+		    continue; // implicitly added - or not allowed to set
 		node.addTransformer(new Transformer(t));
 	    }
 	}

app/actions/Index.java

@@ -16,9 +16,6 @@
  */
 package actions;
 
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 
 import models.Globals;
@@ -91,19 +88,13 @@ protected String index(Node n) {
     /**
      * @param nodes
      *            a list of nodes
-     * @param namespace
-     *            a namespace to create a new index from
+     * @param indexNameWithDatestamp
+     *            a name for a new index
      * @return the list of indexed objects as string
      */
-    public String indexAll(List<Node> nodes, String namespace) {
-	String indexNameWithDatestamp = namespace + "-" + getCurrentDate();
+    public String indexAll(List<Node> nodes, String indexNameWithDatestamp) {
 	return Globals.search.indexAll(nodes, indexNameWithDatestamp)
 		.toString();
     }
 
-    private String getCurrentDate() {
-	DateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
-	Date date = new Date();
-	return dateFormat.format(date);
-    }
 }

app/controllers/MyController.java

@@ -19,6 +19,7 @@
 import helper.HttpArchiveException;
 
 import java.io.StringWriter;
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -405,4 +406,10 @@ public static Date createDateFromString(String d) {
 	    throw new HttpArchiveException(500, e);
 	}
     }
+
+    protected static String getCurrentDate() {
+	DateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+	Date date = new Date();
+	return dateFormat.format(date);
+    }
 }

app/controllers/MyUtils.java

@@ -68,9 +68,10 @@ public static Promise<Result> index(@PathParam("pid") String pid,
     public static Promise<Result> indexAll(
 	    @QueryParam("index") final String indexName) {
 	return new BulkActionAccessor().call(() -> {
+	    String indexNameWithDatestamp = indexName + "-" + getCurrentDate();
 	    actions.BulkAction bulk = new actions.BulkAction();
 	    bulk.execute(indexName, nodes -> {
-		return index.indexAll(nodes, indexName);
+		return index.indexAll(nodes, indexNameWithDatestamp);
 	    });
 	    response().setHeader("Transfer-Encoding", "Chunked");
 	    return ok(bulk.getChunks());
@@ -188,19 +189,19 @@ public static Promise<Result> initContentModels(
 	return new BulkActionAccessor().call(() -> {
 	    List<Transformer> transformers = new Vector<Transformer>();
 	    transformers.add(new Transformer(namespace + "epicur", "epicur",
-		    "http://edoweb-anonymous-user:nopwd@" + Globals.server
+		    "http://edoweb-anonymous-user:nopwd@" + "localhost:9000"
 			    + "/resource/(pid)." + namespace + "epicur"));
 	    transformers.add(new Transformer(namespace + "oaidc", "oaidc",
-		    "http://edoweb-anonymous-user:nopwd@" + Globals.server
+		    "http://edoweb-anonymous-user:nopwd@" + "localhost:9000"
 			    + "/resource/(pid)." + namespace + "oaidc"));
 	    transformers.add(new Transformer(namespace + "pdfa", "pdfa",
-		    "http://edoweb-anonymous-user:nopwd@" + Globals.server
+		    "http://edoweb-anonymous-user:nopwd@" + "localhost:9000"
 			    + "/resource/(pid)." + namespace + "pdfa"));
 	    transformers.add(new Transformer(namespace + "pdfbox", "pdfbox",
-		    "http://edoweb-anonymous-user:nopwd@" + Globals.server
+		    "http://edoweb-anonymous-user:nopwd@" + "localhost:9000"
 			    + "/resource/(pid)." + namespace + "pdfbox"));
 	    transformers.add(new Transformer(namespace + "aleph", "aleph",
-		    "http://edoweb-anonymous-user:nopwd@" + Globals.server
+		    "http://edoweb-anonymous-user:nopwd@" + "localhost:9000"
 			    + "/resource/(pid)." + namespace + "aleph"));
 	    create.contentModelsInit(transformers);
 	    String result = "Reinit contentModels " + namespace + "epicur, "

app/converter/mab/RegalToMabMapper.java

@@ -100,9 +100,12 @@ private void handleTypes(String subj, String pred, String obj) {
 
     private void handleFreeFields(String subj, String pred, String obj) {
 
-	if (archive.fedora.Vocabulary.REL_MAB_527.equals(pred))
-	    record.id = obj.substring(obj.lastIndexOf('/') + 1);
-	else if ("http://purl.org/dc/terms/created".equals(pred))
+	if (archive.fedora.Vocabulary.REL_MAB_527.equals(pred)) {
+	    String id = obj.substring(obj.lastIndexOf('/') + 1);
+	    if (!id.startsWith("urn")) {
+		record.id = id;
+	    }
+	} else if ("http://purl.org/dc/terms/created".equals(pred))
 	    record.datumDerErsterfassung = obj;
 	else if ("http://purl.org/dc/terms/title".equals(pred))
 	    record.hauptsachtitelVorlage = obj;

app/models/Node.java

@@ -38,6 +38,7 @@
 
 import org.openrdf.rio.RDFFormat;
 
+import archive.fedora.RdfException;
 import archive.fedora.RdfUtils;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -1210,7 +1211,11 @@ public String toString() {
      */
     public boolean hasUrn() {
 	String hasUrn = "http://purl.org/lobid/lv#urn";
-	return RdfUtils.hasTriple(pid, hasUrn, metadata);
+	try {
+	    return RdfUtils.hasTriple(pid, hasUrn, metadata);
+	} catch (Exception e) {
+	    return false;
+	}
     }
 
     /**

build.sbt

@@ -2,7 +2,7 @@ import com.github.play2war.plugin._
 
 name := "regal-api"
 
-version := "0.6.0-SNAPSHOT"
+version := "0.6.0"
 
 Play2WarPlugin.play2WarSettings
 

pom.xml

@@ -1,6 +1,6 @@
 <project>
 	<groupId>de.nrw.hbz.regal</groupId>
-	<version>0.6.0-SNAPSHOT</version>
+	<version>0.6.0</version>
 	<properties>
 		<play2.version>2.2.3</play2.version>
 	</properties>