Merge branch 'v4.2-dev' into 'v4.x-master'

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

See merge request !33

build.gradle

@@ -9,7 +9,7 @@ allprojects {
     apply plugin: 'eclipse'
 
     group = 'eu.dariah.de.minfba'
-    version = '4.3.5-SNAPSHOT'
+    version = '4.3.6-SNAPSHOT'
 
     repositories {
     	mavenLocal()

search-core/src/main/java/eu/dariah/de/search/crawling/crawler/OaiPmhCrawlerImpl.java

@@ -48,7 +48,7 @@ public class OaiPmhCrawlerImpl extends OaiPmhHarvestingService implements Crawle
 	
 	@Override
 	public void init(Endpoint endpoint, Crawl crawl, ExtendedDatamodelContainer sc) {
-		this.setUrl(CrawlHelper.renderAccessUrl(endpoint));
+		this.setUrl(endpoint.getUrl());
 		this.setSet(endpoint.getSingleParamValue("set"));
 		this.crawlId = crawl.getId();
 		
@@ -85,7 +85,7 @@ public class OaiPmhCrawlerImpl extends OaiPmhHarvestingService implements Crawle
 		}
 
 		String prefix = null;
-		OaiPmhResponseContainer oaiFormatsResponse = oaiPmhClient.listMetadataFormats(CrawlHelper.renderAccessUrl(ep), null);
+		OaiPmhResponseContainer oaiFormatsResponse = oaiPmhClient.listMetadataFormats(ep.getUrl(), null);
 		if (oaiFormatsResponse!=null && oaiFormatsResponse.getFormats()!=null) {
 			for (OaiPmhMetadataFormat format : oaiFormatsResponse.getFormats()) {
 				if (format.getMetadataNamespace().trim().toLowerCase().equals(rootNs)) {

search-ui/src/main/java/eu/dariah/de/search/config/CrawlingConfig.java

@@ -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.OaiPmhCrawlerImpl;
 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.FileUnpacker;
 import eu.dariah.de.search.crawling.files.XmlChunker;
@@ -86,7 +85,7 @@ public class CrawlingConfig extends CrawlingConfigProperties {
 	
 	@Bean
 	@Scope("prototype")
-	public OaiPmhCrawlerImpl oaipmhCrawler(GtfElementProcessor gtfElementProcessor) {
+	public OaiPmhCrawlerImpl oaiPmhCrawler(GtfElementProcessor gtfElementProcessor) {
 		OaiPmhCrawlerImpl oaipmhCrawler = new OaiPmhCrawlerImpl();
 		oaipmhCrawler.setPolitenessTimespan(500);
 		return oaipmhCrawler;

_search-commons @ 6d4748c0

-Subproject commit 9f7b5581481f783778f33b94dc15f7be479ecc0a
+Subproject commit 6d4748c06e61251120a17e34ce27e59b11a0697f