all idiom object at once

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

@@ -29,6 +29,7 @@ import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
+import info.textgrid.clients.tgcrud.CrudClientException;
 import info.textgrid.middleware.oaipmh.GetRecordType;
 import info.textgrid.middleware.oaipmh.HeaderType;
 import info.textgrid.middleware.oaipmh.ListIdentifiersType;
@@ -137,14 +138,22 @@ public class IDIOMImages implements RecordDelivererInterface, RecordListDelivere
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         DocumentBuilder builder;
         
-        ImageMetsMods imm = new ImageMetsMods(new ConedaKorID(id));
+        //ImageMetsMods imm = new ImageMetsMods(new ConedaKorID(id));
+        ImageMetsMods immByTGURI = null;
+        try {
+            System.out.println(id);
+            immByTGURI = new ImageMetsMods(id, "2016-02-18T10:15:19Z", "2016-02-18T10:15:19Z");
+        } catch (CrudClientException e1) {
+            // TODO Auto-generated catch block
+            e1.printStackTrace();
+        }
 
         try {
             builder = factory.newDocumentBuilder();
-            Document doc = builder.parse(new InputSource(new StringReader(imm.getXML())));
+            Document doc = builder.parse(new InputSource(new StringReader(immByTGURI.getXML())));
             metadataMets.setAny(doc.getDocumentElement());
             conedaKorRecord.setMetadata(metadataMets);
-            conedaKorRecord.setHeader(buildOAIPMH_RecordHeader(imm.getCreationDate(), imm.getID()));
+            conedaKorRecord.setHeader(buildOAIPMH_RecordHeader(immByTGURI.getCreationDate(), immByTGURI.getID()));
             singleImageMetsMods.setRecord(conedaKorRecord);
         } catch (ParserConfigurationException e) {
             // TODO Auto-generated catch block

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

@@ -4,6 +4,8 @@ import java.io.IOException;
 import java.text.ParseException;
 import java.util.Hashtable;
 import java.util.Map;
+
+import org.classicmayan.tools.ImageMetsMods;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.SearchScrollRequest;
@@ -15,6 +17,8 @@ import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.json.JSONObject;
+
+import info.textgrid.clients.tgcrud.CrudClientException;
 import info.textgrid.middleware.oaipmh.ListRecordsType;
 import info.textgrid.middleware.oaipmh.ResumptionTokenType;
 
@@ -54,20 +58,51 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
     ListRecordsType recordList = new ListRecordsType();
 
     BoolQueryBuilder recordFilterForClassicMayan;
+    BoolQueryBuilder recordFilterForClassicMayanCONEDAKOR;
+    BoolQueryBuilder recordFilteroClassicMayanARTEFACT;
+    BoolQueryBuilder both;
+
     RangeQueryBuilder rangeQuery = QueryBuilders.rangeQuery("lastModified").from(from).to(to);
+    
+    BoolQueryBuilder test = QueryBuilders.boolQuery()
+        .must(QueryBuilders.matchPhraseQuery("project.id",
+        "TGPR-0e926f53-1aba-d415-ecf6-539edcd8a318"));
+
+    BoolQueryBuilder artefact = QueryBuilders.boolQuery()
+        .must(QueryBuilders.matchPhraseQuery("format", "text/tg.inputform+rdf+xml"))
+        .must(QueryBuilders.matchPhraseQuery("notes", "ARTEFACT"));
+        
+    BoolQueryBuilder conedakor = QueryBuilders.boolQuery()
+        .must(QueryBuilders.matchPhraseQuery("format", "application/json"))
+        .must(QueryBuilders.matchPhraseQuery("notes", "ConedaKorMediumData"));
+
 
-    recordFilterForClassicMayan = QueryBuilders.boolQuery()
-        .must(rangeQuery)
+    both = QueryBuilders.boolQuery().should(artefact).should(conedakor);
+
+    BoolQueryBuilder bla = QueryBuilders.boolQuery()
+    .must(test.filter(both));
+
+    recordFilteroClassicMayanARTEFACT = QueryBuilders.boolQuery()
         .must(QueryBuilders.matchPhraseQuery("project.id",
             "TGPR-0e926f53-1aba-d415-ecf6-539edcd8a318"))
         .must(QueryBuilders.matchPhraseQuery("format", "text/tg.inputform+rdf+xml"))
         .must(QueryBuilders.matchPhraseQuery("notes", "ARTEFACT"));
 
+    recordFilterForClassicMayanCONEDAKOR = QueryBuilders.boolQuery()
+        .must(QueryBuilders.matchPhraseQuery("project.id",
+            "TGPR-0e926f53-1aba-d415-ecf6-539edcd8a318"))
+        .must(QueryBuilders.matchPhraseQuery("format", "application/json"))
+        .must(QueryBuilders.matchPhraseQuery("notes", "ConedaKorMediumData"));
+
+    recordFilterForClassicMayan = bla;
+    //QueryBuilders.boolQuery().must(rangeQuery).should(recordFilteroClassicMayanARTEFACT).should(recordFilterForClassicMayanCONEDAKOR);
+
     SearchResponse scrollResp;
 
     SearchRequest searchRequest = new SearchRequest("textgrid-nonpublic");
     SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
-
+    System.out.println("QUERY:");
+    System.out.println(recordFilterForClassicMayan);
     scrollResp = null;
 
     searchSourceBuilder.query(recordFilterForClassicMayan);
@@ -105,13 +140,30 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
 
       for (SearchHit hit : scrollResp.getHits().getHits()) {
         i++;
-
+        String recordType =
+            OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), "notes");
         String textgridURI =
             OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), "textgridUri");
+        String creationDate =
+            OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), "created");
+        String changedDate =
+            OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), "lastModified");
 
         RecordDelivererIDIOM idiomRecord = new RecordDelivererIDIOM(true, false);
-        recordList.getRecord()
-            .add(idiomRecord.getRecordById(textgridURI.replace(".0", "")).getRecord());
+        if(recordType.equals("ARTEFACT")){
+          recordList.getRecord()
+          .add(idiomRecord.getRecordById(textgridURI.replace(".0", "")).getRecord());
+        }else if(recordType.startsWith("ConedaKorMediumData")){
+          /*try {
+            ImageMetsMods immByTGURI = new ImageMetsMods(textgridURI, creationDate, changedDate);
+          } catch (CrudClientException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+          }*/
+          recordList.getRecord()
+          .add(new IDIOMImages().getRecordById(textgridURI).getRecord());
+        }
+        
       }
 
       // Check the need for a resumption token!

oaipmh-core/src/main/resources/oai_dc.xsd

@@ -13,11 +13,11 @@
         </documentation>
     </annotation>
     
-    <!--import namespace="http://purl.org/dc/elements/1.1/" 
-        schemaLocation="file:///home/max/Dokumente/simpledc20021212.xsd"/-->
-
     <import namespace="http://purl.org/dc/elements/1.1/" 
-        schemaLocation="https://dublincore.org/schemas/xmls/simpledc20021212.xsd"/>
+        schemaLocation="file:/src/main/resources/simpledc20021212.xsd"/>
+
+    <!--import namespace="http://purl.org/dc/elements/1.1/" 
+        schemaLocation="https://dublincore.org/schemas/xmls/simpledc20021212.xsd"/-->
 
     
     <element name="dc" type="oai_dc:oai_dcType"/>

pom.xml

@@ -11,7 +11,7 @@
 		<common.version>4.0.1</common.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<cxf.version>3.3.11</cxf.version>
-		<mets-mods-mapping.version>1.1.25</mets-mods-mapping.version>
+		<mets-mods-mapping.version>1.1.27-SNAPSHOT</mets-mods-mapping.version>
 		<spring.version>4.0.2.RELEASE</spring.version>
 		<elasticsearch.version>6.5.4</elasticsearch.version>
 		<antlr-runtime.version>3.2</antlr-runtime.version>