Commit 5ad6dd7d authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

441: Fix issues related to deployment of upcoming v4-release (OPENED)

Task-Url: #441
parent 2b54ad73
Pipeline #25678 passed with stage
in 42 seconds
...@@ -9,7 +9,7 @@ allprojects { ...@@ -9,7 +9,7 @@ allprojects {
apply plugin: 'eclipse' apply plugin: 'eclipse'
group = 'eu.dariah.de.minfba' group = 'eu.dariah.de.minfba'
version = '4.3.5-SNAPSHOT' version = '4.3.6-SNAPSHOT'
repositories { repositories {
mavenLocal() mavenLocal()
......
...@@ -48,7 +48,7 @@ public class OaiPmhCrawlerImpl extends OaiPmhHarvestingService implements Crawle ...@@ -48,7 +48,7 @@ public class OaiPmhCrawlerImpl extends OaiPmhHarvestingService implements Crawle
@Override @Override
public void init(Endpoint endpoint, Crawl crawl, ExtendedDatamodelContainer sc) { public void init(Endpoint endpoint, Crawl crawl, ExtendedDatamodelContainer sc) {
this.setUrl(CrawlHelper.renderAccessUrl(endpoint)); this.setUrl(endpoint.getUrl());
this.setSet(endpoint.getSingleParamValue("set")); this.setSet(endpoint.getSingleParamValue("set"));
this.crawlId = crawl.getId(); this.crawlId = crawl.getId();
...@@ -85,7 +85,7 @@ public class OaiPmhCrawlerImpl extends OaiPmhHarvestingService implements Crawle ...@@ -85,7 +85,7 @@ public class OaiPmhCrawlerImpl extends OaiPmhHarvestingService implements Crawle
} }
String prefix = null; String prefix = null;
OaiPmhResponseContainer oaiFormatsResponse = oaiPmhClient.listMetadataFormats(CrawlHelper.renderAccessUrl(ep), null); OaiPmhResponseContainer oaiFormatsResponse = oaiPmhClient.listMetadataFormats(ep.getUrl(), null);
if (oaiFormatsResponse!=null && oaiFormatsResponse.getFormats()!=null) { if (oaiFormatsResponse!=null && oaiFormatsResponse.getFormats()!=null) {
for (OaiPmhMetadataFormat format : oaiFormatsResponse.getFormats()) { for (OaiPmhMetadataFormat format : oaiFormatsResponse.getFormats()) {
if (format.getMetadataNamespace().trim().toLowerCase().equals(rootNs)) { if (format.getMetadataNamespace().trim().toLowerCase().equals(rootNs)) {
......
...@@ -28,7 +28,6 @@ import eu.dariah.de.search.crawling.crawler.GitCrawlerImpl; ...@@ -28,7 +28,6 @@ import eu.dariah.de.search.crawling.crawler.GitCrawlerImpl;
import eu.dariah.de.search.crawling.crawler.IndexCleaner; import eu.dariah.de.search.crawling.crawler.IndexCleaner;
import eu.dariah.de.search.crawling.crawler.OaiPmhCrawlerImpl; import eu.dariah.de.search.crawling.crawler.OaiPmhCrawlerImpl;
import eu.dariah.de.search.crawling.crawler.RepetitiveFileCrawlerImpl; import eu.dariah.de.search.crawling.crawler.RepetitiveFileCrawlerImpl;
import eu.dariah.de.search.crawling.files.FileDownloader;
import eu.dariah.de.search.crawling.files.FileUnarchiver; import eu.dariah.de.search.crawling.files.FileUnarchiver;
import eu.dariah.de.search.crawling.files.FileUnpacker; import eu.dariah.de.search.crawling.files.FileUnpacker;
import eu.dariah.de.search.crawling.files.XmlChunker; import eu.dariah.de.search.crawling.files.XmlChunker;
...@@ -86,7 +85,7 @@ public class CrawlingConfig extends CrawlingConfigProperties { ...@@ -86,7 +85,7 @@ public class CrawlingConfig extends CrawlingConfigProperties {
@Bean @Bean
@Scope("prototype") @Scope("prototype")
public OaiPmhCrawlerImpl oaipmhCrawler(GtfElementProcessor gtfElementProcessor) { public OaiPmhCrawlerImpl oaiPmhCrawler(GtfElementProcessor gtfElementProcessor) {
OaiPmhCrawlerImpl oaipmhCrawler = new OaiPmhCrawlerImpl(); OaiPmhCrawlerImpl oaipmhCrawler = new OaiPmhCrawlerImpl();
oaipmhCrawler.setPolitenessTimespan(500); oaipmhCrawler.setPolitenessTimespan(500);
return oaipmhCrawler; return oaipmhCrawler;
......
Subproject commit 9f7b5581481f783778f33b94dc15f7be479ecc0a Subproject commit 6d4748c06e61251120a17e34ce27e59b11a0697f
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment