Merge branch 'release/4.2.2'

oaipmh-core/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>oaipmh</artifactId>
 		<groupId>info.textgrid.middleware</groupId>
-		<version>4.2.1</version>
+		<version>4.2.2</version>
 	</parent>
 	<groupId>info.textgrid.middleware</groupId>
 	<artifactId>oaipmh-core</artifactId>

oaipmh-core/src/main/java/info/textgrid/middleware/IDIOMImages.java

@@ -20,9 +20,9 @@ import javax.xml.transform.TransformerFactoryConfigurationError;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.classicmayan.tools.TextGridUri;
 import org.classicmayan.tools.ImageMetsMods;
 import org.classicmayan.tools.MediaHarvester;
+import org.classicmayan.tools.TextGridUri;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.w3c.dom.Document;
@@ -144,6 +144,9 @@ public class IDIOMImages implements RecordDelivererInterface, RecordListDelivere
        try {
             System.out.println(id);
             //TextGridUri asa = new TextGridUri();
+            if(!id.startsWith("textgrid:")){
+                id = "textgrid:" + id;
+            }
             immByTGURI = new ImageMetsMods(new TextGridUri(id));
         } catch (CrudClientException e1) {
             // TODO Auto-generated catch block

oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java

@@ -30,6 +30,7 @@ import info.textgrid.middleware.oaipmh.RecordType;
 public class RecordDelivererIDIOM extends RecordDelivererAbstract {
 
   private String dateOfLastOblectModification;
+  private String objectType;
 
   RecordType record = new RecordType();
   ClassicMayanMetsMods metsmods;
@@ -42,6 +43,14 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract {
     super(textgrid, dariah);
   }
 
+  public String getObjectType() {
+    return objectType;
+  }
+
+  public void setObjectType(String objectType) {
+    this.objectType = objectType;
+  }
+
   /**
    * <p>
    * ElasticSearch request in non-public index to get the datestamps for the object creation and
@@ -81,7 +90,7 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract {
       e.printStackTrace();
     }
     JSONObject json = new JSONObject();
-    String[] fields = {TGConstants.CREATED, TGConstants.MODIFIED_FIELD};
+    String[] fields = {TGConstants.CREATED, TGConstants.MODIFIED_FIELD, "notes"};
     json = new JSONObject(OAIPMHUtilities
         .getRcordByIDFromElasticSearch("textgrid-nonpublic", changedId, fields, Strings.EMPTY_ARRAY)
         .getSource());
@@ -91,6 +100,8 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract {
 
     this.dateOfLastOblectModification = OAIPMHUtilities
         .datestampAsString(OAIPMHUtilities.fieldLoader(json, TGConstants.MODIFIED_FIELD));
+
+    this.setObjectType(OAIPMHUtilities.fieldLoader(json, "notes"));
   }
 
   /**
@@ -110,12 +121,17 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract {
     } else {
       textgridBaseURI_FromID = id;
     }
-
-    this.metsmods = new ClassicMayanMetsMods(
+    if(this.getObjectType().equals("ARTEFACT")){
+      this.metsmods = new ClassicMayanMetsMods(
         textgridBaseURI_FromID,
         this.dateOfObjectCreation,
         this.dateOfLastOblectModification);
-    this.record.setMetadata(idiomMets());
+      this.record.setMetadata(idiomMets());
+    }else if(this.getObjectType().startsWith("ConedaKorMediumData")){
+      this.record = new IDIOMImages().getRecordById(id).getRecord();
+      
+    }
+
 
     String identifierToSet = "";
     if (!id.startsWith("textgrid:")) {

oaipmh-webapp/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>oaipmh</artifactId>
 		<groupId>info.textgrid.middleware</groupId>
-        <version>4.2.1</version>
+        <version>4.2.2</version>
 	</parent>
 	<groupId>info.textgrid.middleware</groupId>
 	<artifactId>oaipmh-webapp</artifactId>

pom.xml

@@ -4,11 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>info.textgrid.middleware</groupId>
 	<artifactId>oaipmh</artifactId>
-	<version>4.2.1</version>
+	<version>4.2.2</version>
 	<packaging>pom</packaging>
 	<name>DARIAHDE :: OAI-PMH DataProvider</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<cxf.version>3.3.11</cxf.version>
+		<mets-mods-mapping.version>1.1.27-SNAPSHOT</mets-mods-mapping.version>
         <jdk.version>1.8</jdk.version>
         <antlr-maven-plugin.version>3.2</antlr-maven-plugin.version>
         <antlr-runtime.version>3.2</antlr-runtime.version>