Commit 203944bb authored by mbrodhu's avatar mbrodhu
Browse files

Merge branch 'release/1.1.8'

parents e2e3e0f2 cb47e839
......@@ -4,7 +4,7 @@
<classpathentry kind="src" path="src/main/java" including="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.8.1/junit-4.8.1.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.8.1/junit-4.8.1.jar" sourcepath="M2_REPO/junit/junit/4.8.1/junit-4.8.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/3.4.0/jena-arq-3.4.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/3.4.0/jena-core-3.4.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25-sources.jar"/>
......@@ -24,7 +24,7 @@
<classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-core/2.8.6/jackson-core-2.8.6.jar"/>
<classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-databind/2.8.6/jackson-databind-2.8.6.jar"/>
<classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-annotations/2.8.0/jackson-annotations-2.8.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.25/jcl-over-slf4j-1.7.25.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.25/jcl-over-slf4j-1.7.25-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.25/jcl-over-slf4j-1.7.25.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-io/commons-io/2.5/commons-io-2.5.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient-cache/4.5.3/httpclient-cache-4.5.3.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/thrift/libthrift/0.9.3/libthrift-0.9.3.jar"/>
......
#Fri Jun 05 14:24:46 CEST 2020
#Thu Oct 01 21:13:06 CEST 2020
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.8
......
......@@ -5,7 +5,7 @@
<groupId>org.classicmayan.tools</groupId>
<artifactId>metsModsMapping</artifactId>
<packaging>jar</packaging>
<version>1.1.7</version>
<version>1.1.8</version>
<name>metsModsMapping</name>
<url>http://maven.apache.org</url>
......
......@@ -44,9 +44,11 @@ public class ModsRelatedItem {
public String getModsRelatedItemXML() {
try {
return "<relatedItem type=\"" +
getType() + "\" xlink:href=\"" +
getRefToComposedObject() + "\"/>";
return "<relatedItem type=\"" + getType() + "\">"
+"<recordInfo>"
+ "<recordIdentifier>" + getRefToComposedObject().replace("http://textgridrep.de/", "textgrid:") + "</recordIdentifier>"
+"</recordInfo>"
+"</relatedItem>" ;
}catch(NullPointerException n) {
return "ERROR";
......
......@@ -11,7 +11,7 @@ import org.junit.Test;
public class MetsTest {
static ClassicMayanMetsMods cmmm = new ClassicMayanMetsMods("textgrid:2557q", "2016-02-18T11:15:19.899+01:00", "2018-02-02T12:12:34.113+01:00");
static ClassicMayanMetsMods cmmm = new ClassicMayanMetsMods("textgrid:254wd", "2016-02-18T11:15:19.899+01:00", "2018-02-02T12:12:34.113+01:00");
static Mods mods = new Mods();
static ModsRecordInfo modsRecordInfo = new ModsRecordInfo();
......@@ -472,7 +472,7 @@ public class MetsTest {
Queries queries = new Queries();
artefactList = queries.getArtefactList();
int i=1;
for(int j=2736; j<artefactList.size(); j++) {
for(int j=0; j<artefactList.size(); j++) {
ClassicMayanMetsMods bla = new ClassicMayanMetsMods(artefactList.get(j), "2016-02-18T11:15:19.899+01:00", "2018-02-02T12:12:34.113+01:00");
System.out.println(j + " / " + artefactList.size() + " : " + artefactList.get(j));
bla.setTitleInfoData();
......@@ -527,7 +527,7 @@ public class MetsTest {
@Test
@Ignore
public void testClassicMayanMetsMOds() {
ClassicMayanMetsMods testMetsFile = new ClassicMayanMetsMods("textgrid:254w6", "2016-02-18T11:15:19.899+01:00", "2018-02-02T12:12:34.113+01:00");
ClassicMayanMetsMods testMetsFile = new ClassicMayanMetsMods("textgrid:254wd", "2016-02-18T11:15:19.899+01:00", "2018-02-02T12:12:34.113+01:00");
System.out.println(testMetsFile.getMets());
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment