new version

oaipmh-core/pom.xml

@@ -4,11 +4,11 @@
   <parent>
     <artifactId>oaipmh</artifactId>
     <groupId>info.textgrid.middleware</groupId>
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.1.6-SNAPSHOT</version>
   </parent>
   <groupId>info.textgrid.middleware</groupId>
   <artifactId>oaipmh-core</artifactId>
-  <version>2.1.5-SNAPSHOT</version>
+  <version>2.1.6-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>DARIAHDE :: OAI-PMH :: Core</name>
   <url>http://maven.apache.org</url>

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

@@ -19,7 +19,7 @@ public final class DARIAHConstants {
 	// public static boolean furtherElements = true;
 
 	public static final String			ITEM_IDENTIFIER_PREFIX		= "hdl:";
-	public static final String			COLLECTIONREGISTRY_PREFIX	= "dariah:collection";
+	public static final String			COLLECTIONREGISTRY_PREFIX	= "dariah:collection:";
 	public static final String			COLLECTION_MIMETYPE			= "text/tg.collection+tg.aggregation+xml";
 	public static final List<String>	TEXTGRID_REP_ADMIN_CONTACT	= Arrays.asList("textgrid-support@gwdg.de");
 

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

@@ -162,12 +162,12 @@ public class RecordListDeliverer {
 				.setTypes(this.oaiEsClient.getEsType()).addFields(this.fields)
 				.setQuery(query).setSize(1000);
 		
-		System.out.println("GetRecprdList: " + getRecordList);
+		//System.out.println("GetRecprdList: " + getRecordList);
 		SearchResponse getRecordListItems = getRecordList.execute().actionGet();
 
 		if (getRecordListItems != null && getRecordListItems.getHits().totalHits() > 0) {
 			setFoundItems(true);
-			System.out.println("AMOUNT: " + getRecordListItems.getHits().totalHits());
+			//System.out.println("AMOUNT: " + getRecordListItems.getHits().totalHits());
 			for (SearchHit hit : getRecordListItems.getHits().getHits()) {
 				
 				// Only if we have a search response AND a hit field map...

oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java

@@ -381,7 +381,7 @@ public class OaiPmhTest {
 	@Test
 	@Ignore
 	public void testListRecordsDariah() throws ParseException {
-
+		
 		this.recordList.setContributor(DARIAHConstants.CONTRIBUTOR_LIST);
 		this.recordList.setCoverage(DARIAHConstants.COVERAGE_LIST);
 		this.recordList.setCreators(DARIAHConstants.CREATOR_LIST);
@@ -405,13 +405,12 @@ public class OaiPmhTest {
 		//this.recordList.setFormatToFilter("text/tg.collection+tg.aggregation+xml");
 		this.recordList.setModifiedField(DARIAHConstants.MODIFIED_FIELD);
 		// this.recordList.setFormatToFilter("image/png");
-		this.recordList
-				.setRelationToFurtherMetadataObject("descriptiveMetadata.dc:relation");
+		this.recordList.setRelationToFurtherMetadataObject("descriptiveMetadata.dc:relation");
 
 		// cregId:hdl:6607/0000-0000-26A5-B
 		// dariah:collection:6607/0000-0000-26A5-B
 		JAXBElement<OAIPMHType> r = this.request.getRequest("ListRecords", "",
-				"oai_dc", "11022/0000-0000-8FA0-A", "", "", "");
+				"oai_dc", "", "", "", "");
 		JAXB.marshal(r, System.out);
 		System.out.println("-----------------------------------\n");
 	}
@@ -468,7 +467,7 @@ public class OaiPmhTest {
 		this.setListDARIAH.setIdentifierField(DARIAHConstants.IDENTIFIER);
 		this.setListDARIAH.setRepositoryObjectURIPrefix(DARIAHConstants.ITEM_IDENTIFIER_PREFIX);
 		this.setListDARIAH.setSpecField("descriptiveMetadata.dc:title");
-		this.setListDARIAH.setSpecFieldPrefix(DARIAHConstants.ITEM_IDENTIFIER_PREFIX);
+		this.setListDARIAH.setSpecFieldPrefix(DARIAHConstants.COLLECTIONREGISTRY_PREFIX);
 		JAXBElement<OAIPMHType> r = this.request.getRequest("ListSets", "", "",
 				"", "", "", "");
 		JAXB.marshal(r, System.out);

oaipmh-webapp/pom.xml

@@ -4,12 +4,12 @@
 	<parent>
 		<artifactId>oaipmh</artifactId>
 		<groupId>info.textgrid.middleware</groupId>
-		<version>2.1.5-SNAPSHOT</version>
+		<version>2.1.6-SNAPSHOT</version>
 	</parent>
 	<groupId>info.textgrid.middleware</groupId>
 	<artifactId>oaipmh-webapp</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.5-SNAPSHOT</version>
+	<version>2.1.6-SNAPSHOT</version>
 	<name>DARIAHDE :: OAI-PMH :: Webapp</name>
 	<url>http://maven.apache.org</url>
 	<profiles>

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>info.textgrid.middleware</groupId>
   <artifactId>oaipmh</artifactId>
-  <version>2.1.5-SNAPSHOT</version>
+  <version>2.1.6-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>DARIAHDE :: OAI-PMH</name>
   <properties>