fix: Add package-lock.json

.gitlab-ci.yml

@@ -61,7 +61,7 @@ prepare-release:
     - if: $CI_COMMIT_REF_NAME == "main" && $CI_COMMIT_TITLE !~ /^[\d\.]+$/ && $CI_COMMIT_TITLE !~ /^Prepare next development iteration/
   image: maven:3.8.3-jdk-8
   extends:
-    - .prepare-semantic-release
+    - .prepare-semantic-release-dry-run
 
 # Build, validate, and package all the feature branches
 validate-java:

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

@@ -54,7 +54,7 @@ import info.textgrid.namespaces.middleware.tgauth.ProjectInfo;
  */
 public class OAIPMHUtilities {
 
-  private static Logger log = Logger.getAnonymousLogger();
+  private static Logger log = Logger.getLogger(OAIPMHUtilities.class.getName());
 
   // **
   // FINALS

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

@@ -310,6 +310,18 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
         // FIXME Put query field into config!
         queryField = "administrativeMetadata.dcterms:relation";
         valueField = set;
+
+        // Add record with set metadata in it (to also find collection metadata in Repository
+        // Search!)
+        // FIXME Must be done WITH THE QUERY. We must add it here, since it results in 101 records
+        // if we do add it below!
+
+        // FIXME Put query field into config!
+        // if (!set.isEmpty()) {
+        // QueryBuilder setQuery = QueryBuilders
+        // .matchQuery("administrativeMetadata.dcterms:identifier", this.specFieldPrefix + set);
+        // fetchFields(QueryBuilders.boolQuery().must(setQuery), recordList, resumptionToken, set);
+        // }
       }
 
       // **
@@ -329,7 +341,9 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
       QueryBuilder boolQuery = QueryBuilders.boolQuery().must(rangeQuery).must(matchQuery);
 
       query = boolQuery;
-    } else {
+    }
+    // Set == null!
+    else {
       query = rangeQuery;
     }
 
@@ -337,16 +351,6 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
 
       fetchFields(query, recordList, resumptionToken, set);
 
-      // FOR DHREP ONLY: Add record with set metadata in it (to also find collection metadata in
-      // Repository Search!)
-      // FIXME Put query field into config!
-      // if (this.dariah && set != null && !set.isEmpty()) {
-      // QueryBuilder setQuery = QueryBuilders
-      // .matchQuery("administrativeMetadata.dcterms:identifier", this.specFieldPrefix + set);
-      //
-      // fetchFields(QueryBuilders.boolQuery().must(setQuery), recordList, resumptionToken, set);
-      // }
-
     } catch (UnsupportedEncodingException e) {
       // TODO Auto-generated catch block
       e.printStackTrace();

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

@@ -29,14 +29,14 @@ import org.junit.Test;
  * 
  * @author Stefan E. Funk, SUB Göttingen
  */
-// @Ignore
+@Ignore
 public class OaiPmhDariahdeOnlineTests {
   // **
   // FINALS
   // **
 
-  // private static final String PROPERTIES_FILE = "oaipmh.test.repository-de-dariah-eu.properties";
-  private static final String PROPERTIES_FILE = "oaipmh.test.trep-de-dariah-eu.properties";
+  private static final String PROPERTIES_FILE = "oaipmh.test.repository-de-dariah-eu.properties";
+  // private static final String PROPERTIES_FILE = "oaipmh.test.trep-de-dariah-eu.properties";
 
   private static final String HDL_PREFIX = "hdl:";
   private static final String STAR_PREFIX = "***";
@@ -313,8 +313,11 @@ public class OaiPmhDariahdeOnlineTests {
    * @throws IOException
    */
   @Test
+  @Ignore
   public void testListRecordsSetDCStarPrefix() throws IOException {
 
+    // TODO Un-ignore if identifier check is implemented!
+
     System.out.println(OaiPmhTestUtilities.TESTING + "#LISTRECORDS - STAR PREFIX");
 
     if (checkListRecordsSet.startsWith(HDL_PREFIX)) {
@@ -465,8 +468,11 @@ public class OaiPmhDariahdeOnlineTests {
    * @throws IOException
    */
   @Test
+  @Ignore
   public void testListIdentifiersSetDCStarPrefixe() throws IOException {
 
+    // TODO Un-ignore if identifier check is implemented!
+
     System.out.println(OaiPmhTestUtilities.TESTING + "#LISTIDENTIFIERS - STAR PREFIX");
 
     if (checkListIdentifiersSet.startsWith(HDL_PREFIX)) {

oaipmh-core/src/test/resources/oaipmh.test.repository-de-dariah-eu.properties

@@ -14,9 +14,9 @@ checkListRecordsDCFrom =
 checkListRecordsDCUntil =
 checkListRecordsDATACITEFrom =
 checkListRecordsDATACITEUntil =
-checkListRecordsSet = 
-checkListRecordsSetExpectedPages =
+checkListRecordsSet = hdl:21.11113/0000-000B-C8F2-2
+checkListRecordsSetExpectedPages = 8
  # ListIdentifiers
-checkListIdentifiersSet = 
-checkListIdentifiersSetExpectedPages = 
+checkListIdentifiersSet = hdl:21.11113/0000-000B-C8F2-2
+checkListIdentifiersSetExpectedPages = 8 
  
\ No newline at end of file