Remove set parameter when empty in requests
This commit is contained in:
parent
634361302c
commit
40b3ff6b7c
|
@ -182,7 +182,7 @@ public class ValidationController {
|
||||||
public ValidationJob validateWithApacheCamel(@RequestParam(name = "guidelines") String guidelinesProfileName,
|
public ValidationJob validateWithApacheCamel(@RequestParam(name = "guidelines") String guidelinesProfileName,
|
||||||
@RequestParam(name = "baseUrl", defaultValue = "http://repositorium.sdum.uminho.pt/oai/request") String baseURL, //not in use now
|
@RequestParam(name = "baseUrl", defaultValue = "http://repositorium.sdum.uminho.pt/oai/request") String baseURL, //not in use now
|
||||||
@RequestParam(name="numberOfRecords", defaultValue = "10") int numberOfRecords,
|
@RequestParam(name="numberOfRecords", defaultValue = "10") int numberOfRecords,
|
||||||
@RequestParam(name="set", required = false) String set
|
@RequestParam(name="set", required = false) Optional<String> set
|
||||||
) {
|
) {
|
||||||
|
|
||||||
AbstractOpenAireProfile profile = initializeOpenAireProfile(guidelinesProfileName);
|
AbstractOpenAireProfile profile = initializeOpenAireProfile(guidelinesProfileName);
|
||||||
|
@ -212,16 +212,18 @@ public class ValidationController {
|
||||||
|
|
||||||
RouteBuilder oaiPmhRouteBuilder;
|
RouteBuilder oaiPmhRouteBuilder;
|
||||||
|
|
||||||
|
String oaiEndpoint= "oaipmh://" + baseURL + "?verb=ListRecords&metadataPrefix=" + metadataPrefix;
|
||||||
|
if (set.isPresent())
|
||||||
|
oaiEndpoint += "&set="+set.get();
|
||||||
|
|
||||||
if (fairProfile == null) {
|
if (fairProfile == null) {
|
||||||
oaiPmhRouteBuilder =
|
oaiPmhRouteBuilder =
|
||||||
new SimpleOaiPmhRoute("oaipmh://" + baseURL + "?verb=ListRecords&metadataPrefix="
|
new SimpleOaiPmhRoute(oaiEndpoint, profile, validationJob, numberOfRecords, uuid.toString());
|
||||||
+ metadataPrefix + "&set=" + set, profile, validationJob, numberOfRecords, uuid.toString());
|
|
||||||
} else {
|
} else {
|
||||||
System.out.println("THERE");
|
System.out.println("THERE");
|
||||||
|
|
||||||
oaiPmhRouteBuilder =
|
oaiPmhRouteBuilder =
|
||||||
new FairOaiPmhRoute2("oaipmh://" + baseURL + "?verb=ListRecords&metadataPrefix="
|
new FairOaiPmhRoute2(oaiEndpoint, profile, validationJob, numberOfRecords, uuid.toString());
|
||||||
+ metadataPrefix + "&set=" + set, profile, validationJob, numberOfRecords, uuid.toString());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
camelContext.addRoutes(oaiPmhRouteBuilder);
|
camelContext.addRoutes(oaiPmhRouteBuilder);
|
||||||
|
|
Loading…
Reference in New Issue