From adc098f039efd0b73dc3254a01e1d8cfe85e3d76 Mon Sep 17 00:00:00 2001
From: Maximilian Brodhun <brodhun@sub.uni-goettingen.de>
Date: Mon, 2 Dec 2019 18:33:20 +0100
Subject: [PATCH] check if until and from are set to compare date formats
---
.../info/textgrid/middleware/RecordListDelivererAbstract.java | 2 +-
.../src/test/java/info/textgrid/middleware/OaiPmhTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
index b56dda84..e77c5505 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
@@ -77,7 +77,7 @@ public abstract class RecordListDelivererAbstract implements RecordListDeliverer
if(request.getUntil() != null && !OAIPMHUtilities.isThisDateValid(request.getUntil())) {
errorValues.add("until");
}
- if(OAIPMHUtilities.getFormatOfDate(request.getFrom()).equals(OAIPMHUtilities.getFormatOfDate(request.getFrom()))) {
+ if(request.getFrom()!= null && request.getUntil()!=null && OAIPMHUtilities.getFormatOfDate(request.getFrom()).equals(OAIPMHUtilities.getFormatOfDate(request.getFrom()))) {
errorValues.add("The granularities for from and until doesn't match");
}
if (errorValues.size() > 0) {
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
index 010266b5..5d8160f0 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
@@ -424,7 +424,7 @@ public class OaiPmhTest {
OaiPmhTest.recordList.setModifiedField(TGConstants.CREATED);
OaiPmhTest.recordList.setIdentifierField(TGConstants.URI);
OaiPmhTest.recordList.setSearchResponseSize("100");
- String r = this.request.getRequest("ListRecords", "", "oai_dc", "", "2002-02-06T05:35:00Z", "", "");
+ String r = this.request.getRequest("ListRecords", "", "oai_dc", "", "", "", "");
System.out.println(r);
System.out.println("-----------------------------------\n");
}
--
GitLab