Merge branch 'develop' into 'main'

New RELEASE

See merge request dariah-de/dariah-de-oai-pmh-services!51

.gitlab-ci.yml

@@ -21,10 +21,9 @@ variables:
 include:
   - project: 'dariah-de/gitlab-templates'
     ref: 'main'
-    file: '/templates/.java.gitlab-ci.yml'
-  - project: 'dariah-de/gitlab-templates'
-    ref: 'main'
-    file: '/templates/SBOM-Upload.gitlab-ci.yml'
+    file:
+      - '/templates/.java.gitlab-ci.yml'
+      - '/templates/SBOM-Upload.gitlab-ci.yml'
 
 # Stages...
 stages:

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

@@ -15,13 +15,14 @@ import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.json.JSONObject;
+import info.textgrid.middleware.oaipmh.GetRecordType;
 import info.textgrid.middleware.oaipmh.ListRecordsType;
 import info.textgrid.middleware.oaipmh.ResumptionTokenType;
 
 /**
  * @author Maximilian Brodhun, SUB Göttingen
  * @author Stefan E. Funk, SUB Göttingen
- * @version 2021-10-25
+ * @version 2022-08-30
  * @since
  */
 public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
@@ -42,11 +43,8 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
     super(textgrid, dariah);
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see info.textgrid.middleware.RecordListDelivererInterface#getRecords(java.lang.String,
-   * java.lang.String, java.lang.String, java.lang.String)
+  /**
+   *
    */
   @Override
   public ListRecordsType getRecords(final String from, final String to, final String set,
@@ -60,9 +58,8 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
 
     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 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"))
@@ -72,12 +69,11 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
         .must(QueryBuilders.matchPhraseQuery("format", "application/json"))
         .must(QueryBuilders.matchPhraseQuery("notes", "ConedaKorMediumData"));
 
-
     both = QueryBuilders.boolQuery().should(artefact).should(conedakor);
 
-    BoolQueryBuilder bla = QueryBuilders.boolQuery().must(rangeQuery).must(test.filter(both));
-
-    recordFilterForClassicMayan = bla;
+    BoolQueryBuilder queryBuilder =
+        QueryBuilders.boolQuery().must(rangeQuery).must(test.filter(both));
+    recordFilterForClassicMayan = queryBuilder;
     // QueryBuilders.boolQuery().must(rangeQuery).should(recordFilteroClassicMayanARTEFACT).should(recordFilterForClassicMayanCONEDAKOR);
 
     SearchResponse scrollResp;
@@ -85,9 +81,6 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
     SearchRequest searchRequest = new SearchRequest("textgrid-nonpublic");
     SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
 
-    // System.out.println("QUERY:");
-    // System.out.println(recordFilterForClassicMayan);
-
     scrollResp = null;
 
     searchSourceBuilder.query(recordFilterForClassicMayan);
@@ -144,9 +137,12 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
            * changedDate); } catch (CrudClientException e) { // TODO Auto-generated catch block
            * e.printStackTrace(); }
            */
-          recordList.getRecord().add(new IDIOMImages().getRecordById(textgridURI).getRecord());
+          GetRecordType idi = new IDIOMImages().getRecordById(textgridURI);
+          // Fixes #64
+          if (idi != null) {
+            recordList.getRecord().add(idi.getRecord());
+          }
         }
-
       }
 
       // Check the need for a resumption token!

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

@@ -34,7 +34,7 @@ import org.junit.Test;
  * 
  * @author Stefan E. Funk, SUB Göttingen
  */
-// @Ignore
+@Ignore
 public class OaiPmhTextgridOnlineTests {
 
   // **
@@ -711,6 +711,7 @@ public class OaiPmhTextgridOnlineTests {
    * @throws IOException
    */
   @Test
+  @Ignore
   public void testListIdentifiersIDIOMMETSAllPages() throws IOException {
 
     System.out.println(OaiPmhTestUtilities.TESTING + "testListIdentifiersIDIOMMETSAllPages()");