From 130a79bb8ebfc8207af6a95fcda9010fdf9e6ff4 Mon Sep 17 00:00:00 2001
From: mbrodhu <brodhun@sub.uni-goettingen.de>
Date: Tue, 22 Nov 2016 14:03:40 +0100
Subject: [PATCH] empty request to identify
---
.../main/java/info/textgrid/middleware/OAIPMHImpl.java | 5 +++++
.../main/java/info/textgrid/middleware/OaiPmhClient.java | 9 ++-------
.../test/java/info/textgrid/middleware/OaiPmhTest.java | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
index 48933fab..4be186f9 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
@@ -682,6 +682,11 @@ public class OAIPMHImpl implements OAIPMHProducer {
public void setVerbRequestValue(String verb, VerbType verbParam,
RequestType request) {
+ if(verb.isEmpty()){
+ verbParam = setVerb("Identify");
+ request.setVerb(verbParam);
+ }
+
if (!verb.isEmpty()) {
request.setVerb(verbParam);
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OaiPmhClient.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OaiPmhClient.java
index c9191270..e0afe246 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OaiPmhClient.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OaiPmhClient.java
@@ -40,14 +40,9 @@ public class OaiPmhClient {
* @throws ParseException
*/
public JAXBElement<OAIPMHType> request(String verb) throws ParseException {
- if(producer.getRequest(verb, identifier, metadataPrefix, set, from,
- until, resumptionToken) == null){
- return producer.getRequest("Identify", "", "", "", "", "", "");
- }
- else {
- return producer.getRequest(verb, identifier, metadataPrefix, set, from,
+ return producer.getRequest(verb, identifier, metadataPrefix, set, from,
until, resumptionToken);
- }
+
}
/**
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 fd3d9864..9efefaab 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
@@ -512,7 +512,7 @@ public class OaiPmhTest {
@Test
- @Ignore
+ //@Ignore
public void testEmptyRequest() throws ParseException {
this.identifierList.setFieldForRange(TGConstants.RANGE_FIELD);
this.identifierList.setIdentifierListFields(TGConstants.IDENTIFIER_LIST_FIELDS);
--
GitLab