Skip to content
GitLab
Commit 628128ef authored by mbrodhu's avatar mbrodhu
Browse files

Merge branch 'release/1.1.11'

parents 083bd853 49ac65a6
Hide whitespace changes
Inline Side-by-side
.classpath
View file @ 628128ef
......@@ -4,10 +4,10 @@
<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" sourcepath="M2_REPO/junit/junit/4.8.1/junit-4.8.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.8.1/junit-4.8.1.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"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/3.4.0/jena-iri-3.4.0.jar"/>
<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.11.0/xercesImpl-2.11.0.jar"/>
<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar"/>
......@@ -19,7 +19,7 @@
<classpathentry kind="var" path="M2_REPO/com/github/andrewoma/dexx/collection/0.7/collection-0.7.jar" sourcepath="M2_REPO/com/github/andrewoma/dexx/collection/0.7/collection-0.7-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.5.3/httpclient-4.5.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.5.3/httpclient-4.5.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.4.6/httpcore-4.4.6.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.4.6/httpcore-4.4.6-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.9/commons-codec-1.9.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.9/commons-codec-1.9-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/>
<classpathentry kind="var" path="M2_REPO/com/github/jsonld-java/jsonld-java/0.10.0/jsonld-java-0.10.0.jar"/>
<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"/>
......
.settings/org.eclipse.jdt.core.prefs
View file @ 628128ef
#Thu Oct 01 21:13:06 CEST 2020
#Sun Nov 15 17:28:05 CET 2020
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.8
......
pom.xml
View file @ 628128ef
......@@ -5,7 +5,7 @@
<groupId>org.classicmayan.tools</groupId>
<artifactId>metsModsMapping</artifactId>
<packaging>jar</packaging>
<version>1.1.9</version>
<version>1.1.11</version>
<name>metsModsMapping</name>
<url>http://maven.apache.org</url>
......
src/main/java/org/classicmayan/tools/ClassicMayanMetsMods.java
View file @ 628128ef
......@@ -174,8 +174,6 @@ public class ClassicMayanMetsMods {
}
public void setRelatedItems() {
//System.out.println("TESTI");
//System.out.println(textGridURI);
RelatedItemsDataObject relatedItemsDataObject = Queries.getRelatedItems(textGridURI);
List<ModsRelatedItem> relatedItems = new ArrayList<ModsRelatedItem>();
ModsRelatedItem allRealtedItems = new ModsRelatedItem(relatedItems);
......@@ -369,15 +367,9 @@ public class ClassicMayanMetsMods {
Queries.getArtefactTitle(textGridURI)));
structMaps.get(1).addMetsDiv(allDivsForLogicalStructMap);
//System.out.println(structMaps.get(1).buildAllStructMaps());
List<MetsSmLink> metsSmLinks = new ArrayList<MetsSmLink>();
MetsSmLink allMetsSmLinks = new MetsSmLink();
//System.out.println(structMaps.get(0).getMetStructMapXML());
int i=1;
for(String image : thumbnailImages) {
......
src/main/java/org/classicmayan/tools/ModsAccessCondition.java
View file @ 628128ef
......@@ -26,6 +26,6 @@ public class ModsAccessCondition {
}
public String getModsAccessConditionXML() {
return "<accessCondition type=\"" + getType() + "\" xlink:href=\"" + getRefToLicense() + "\"/>" ;
return "<accessCondition type=\"" + getType() + "\" xlink:href=\"" + getRefToLicense() + "\" displayLabel=\"CC-BY-Lizenz (4.0)\">cc-by_4</accessCondition>";
}
}
src/main/java/org/classicmayan/tools/ModsPhysicalLocation.java
View file @ 628128ef
......@@ -66,7 +66,6 @@ public class ModsPhysicalLocation {
try {
if(getPhysicalLocationDisplayType()==null) {
//System.out.println("type: " +getPhysicalLocationType());
return "<physicalLocation "
+ "type=\"" + getPhysicalLocationType() + "\">"
+ getPhysicalLocationValue() + "</physicalLocation>";
......
src/main/java/org/classicmayan/tools/Queries.java
View file @ 628128ef
......@@ -57,7 +57,7 @@ public class Queries {
"WHERE {" +
"GRAPH ?textgridUriForArtefact {" +
"?tgObject rdf:type idiom:Artefact."+
"}} LIMIT 30 OFFSET " + offset ;
"}} LIMIT 100 OFFSET " + offset ;
QueryExecution q = QueryExecutionFactory.sparqlService(queryURL, query);
ResultSet results = q.execSelect();
......@@ -252,7 +252,6 @@ public class Queries {
" }\n" +
"}}\n" +
"";
//System.out.println(query);
QueryExecution q = QueryExecutionFactory.sparqlService(queryURL, query);
ResultSet results = q.execSelect();
......@@ -279,7 +278,6 @@ public class Queries {
}
public static String hierarichalPlaceQuery(String textgridURI) {
System.out.println(textgridURI.replace("http://textgridrep.de/", "textgrid:"));
String query = AllSparqlPrefixes + " SELECT DISTINCT ?placeType ?placeName ?nextPlace ?placeTypeToPrint WHERE { GRAPH <" + textgridURI.replace("http://textgridrep.de/", "textgrid:") +"> { \n" +
" ?discoveryPlaceRef rdf:type crm:E53_Place.\n" +
......@@ -296,8 +294,6 @@ public class Queries {
" }\n" +
" }\n" +
"}";
//System.out.println("BLA");
//System.out.println(query);
QueryExecution q = QueryExecutionFactory.sparqlService(queryURL, query);
ResultSet results = q.execSelect();
......@@ -351,8 +347,7 @@ public class Queries {
" }\n" +
"}";
//System.out.println(query);
QueryExecution q = QueryExecutionFactory.sparqlService(queryURL, query);
ResultSet results = q.execSelect();
......
src/test/java/org/classicmayan/tools/MetsTest.java
View file @ 628128ef
......@@ -11,7 +11,7 @@ import org.junit.Test;
public class MetsTest {
static ClassicMayanMetsMods cmmm = new ClassicMayanMetsMods("textgrid:254wd", "2016-02-18T11:15:19.899+01:00", "2018-02-02T12:12:34.113+01:00");
static ClassicMayanMetsMods cmmm = new ClassicMayanMetsMods("textgrid:3r8vx", "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();
......@@ -470,7 +470,7 @@ public class MetsTest {
public void testAllObjects() {
List<String> artefactList = new ArrayList<String>();
Queries queries = new Queries();
artefactList = queries.getArtefactList();
artefactList = queries.getArtefactList(2500);
int i=1;
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");
......@@ -485,8 +485,16 @@ public class MetsTest {
bla.setRelatedItems();
bla.setModsTranscriptionAndTranslation();
bla.setAccessCondition();
System.out.println(bla.getMets());
j++;
if(artefactList.get(j).contains("3r8vx")) {
System.out.println("Alert");
System.out.println(bla.getMets());
}else {
}
//j++;
}
/*for(String artefact : artefactList) {
ClassicMayanMetsMods bla = new ClassicMayanMetsMods(artefact, "2016-02-18T11:15:19.899+01:00", "2018-02-02T12:12:34.113+01:00");
......@@ -508,7 +516,7 @@ public class MetsTest {
@Test
@Ignore
//@Ignore
public void testMetsFromTriplestore() {
cmmm.setTitleInfoData();
......@@ -525,9 +533,9 @@ public class MetsTest {
}
@Test
@Ignore
//@Ignore
public void testClassicMayanMetsMOds() {
ClassicMayanMetsMods testMetsFile = new ClassicMayanMetsMods("textgrid:254wd", "2016-02-18T11:15:19.899+01:00", "2018-02-02T12:12:34.113+01:00");
ClassicMayanMetsMods testMetsFile = new ClassicMayanMetsMods("textgrid:2chbq", "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