Version to 3.2.0-SNAPSHOT

oaipmh-core/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>oaipmh</artifactId>
 		<groupId>info.textgrid.middleware</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<groupId>info.textgrid.middleware</groupId>
 	<artifactId>oaipmh-core</artifactId>

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

@@ -94,7 +94,8 @@ public class SetDeliverer {
 	} ;
 
     for (SearchHit hit : getRecordListItems.getHits().getHits()) {
-      if (this.dariah == true && hit.getFields().get(this.identifierField).getValues().get(0)
+
+      if (this.dariah == true && hit.getSourceAsMap().get(this.identifierField)
           .toString().startsWith("hdl:")) {
         String pid = hit.getFields().get(this.identifierField).getValues().get(0).toString();
         this.identifier.add(pid);
@@ -102,8 +103,8 @@ public class SetDeliverer {
       }
 
       if (this.textgrid == true) {
-        String projectName = hit.getFields().get("project.value").getValues().get(0).toString();
-        String projectID = hit.getFields().get("project.id").getValues().get(0).toString();
+        String projectName = hit.getSourceAsMap().get("project.value").toString();
+        String projectID = hit.getSourceAsMap().get("project.id").toString();
         String projectSetSpec = projectName.concat(":").concat(projectID);
         this.setSet.put(projectID, projectName);
       }

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

@@ -39,7 +39,7 @@ public class OaiPmhTest {
   private static IdentifierListDelivererIDIOM identifierListIDIOM = new IdentifierListDelivererIDIOM(true, false);
   private MetadataFormatListDeliverer metadataFormatList = new MetadataFormatListDeliverer();
   private SetDeliverer setListDARIAH = new SetDeliverer(false, true);
-  private SetDeliverer setListTextGrid = new SetDeliverer(true, false);
+  private static SetDeliverer setListTextGrid;
   
   private OAIPMHImpl request = new OAIPMHImpl(
 		  this.rep, OaiPmhTest.record, OaiPmhTest.recordIDIOM, OaiPmhTest.recordList,
@@ -76,6 +76,8 @@ public class OaiPmhTest {
     identifierList = new IdentifierListDelivererDC(true, false);
     identifierList.setOaiEsClient(oaiEsClient);
     identifierList.setIdentifierListFields(TGConstants.IDENTIFIER_LIST_FIELDS);
+    
+    setListTextGrid = new SetDeliverer(true, false);
   }
 
   /**
@@ -482,9 +484,9 @@ public class OaiPmhTest {
   @Test
   @Ignore
   public void testListSets() throws ParseException {
-    System.out.println("bla");
+
     this.setListTextGrid.setFormatField("format");
-    this.setListTextGrid.setFormatToFilter(TextGridMimetypes.DARIAH_COLLECTION);
+    this.setListTextGrid.setFormatToFilter(TextGridMimetypes.EDITION);
     this.setListTextGrid.setIdentifierField("textgridUri");
     this.setListTextGrid.setRepositoryObjectURIPrefix("textgrid:");
     JAXBElement<OAIPMHType> r = this.request.getRequest("ListSets", "", "", "", "", "", "");

oaipmh-webapp/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>oaipmh</artifactId>
 		<groupId>info.textgrid.middleware</groupId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<groupId>info.textgrid.middleware</groupId>
 	<artifactId>oaipmh-webapp</artifactId>

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>info.textgrid.middleware</groupId>
 	<artifactId>oaipmh</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>DARIAHDE :: OAI-PMH DataProvider</name>
 	<properties>