Commit 1b1b8b6a authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

Elements as potential roots, not only Nonterminals; JSON suppert

parent 382f2395
Pipeline #15410 passed with stages
in 5 minutes and 35 seconds
...@@ -18,7 +18,7 @@ plugins { ...@@ -18,7 +18,7 @@ plugins {
allprojects { allprojects {
group = 'eu.dariah.de.minfba' group = 'eu.dariah.de.minfba'
version = '3.8.0-SNAPSHOT' version = '3.9.0-SNAPSHOT'
description = 'DARIAH-DE Generic Search' description = 'DARIAH-DE Generic Search'
ext { ext {
...@@ -43,7 +43,7 @@ repositories { ...@@ -43,7 +43,7 @@ repositories {
sourceCompatibility = '1.8' sourceCompatibility = '1.8'
ext { ext {
searchCommonsVersion = "1.18.0-SNAPSHOT" searchCommonsVersion = "1.19.0-SNAPSHOT"
springVersion = "4.3.6.RELEASE" springVersion = "4.3.6.RELEASE"
hibernateValidatorVersion = "5.2.2.Final" hibernateValidatorVersion = "5.2.2.Final"
...@@ -76,9 +76,9 @@ dependencies { ...@@ -76,9 +76,9 @@ dependencies {
implementation "ch.qos.logback:logback-classic:$logbackVersion" implementation "ch.qos.logback:logback-classic:$logbackVersion"
implementation "javax.servlet:jstl:1.2" implementation "javax.servlet:jstl:1.2"
implementation "org.yaml:snakeyaml:1.18" implementation "org.yaml:snakeyaml:1.18"
runtimeOnly "org.slf4j:jcl-over-slf4j:$slf4jVersion" runtime "org.slf4j:jcl-over-slf4j:$slf4jVersion"
runtimeOnly "org.slf4j:log4j-over-slf4j:$slf4jVersion" runtime "org.slf4j:log4j-over-slf4j:$slf4jVersion"
runtimeOnly "org.apache.logging.log4j:log4j-to-slf4j:2.7" runtime "org.apache.logging.log4j:log4j-to-slf4j:2.7"
testImplementation "org.springframework:spring-test:$springVersion" testImplementation "org.springframework:spring-test:$springVersion"
testImplementation "junit:junit:4.12" testImplementation "junit:junit:4.12"
testImplementation "org.mockito:mockito-all:1.10.19" testImplementation "org.mockito:mockito-all:1.10.19"
......
rootProject.name = 'search' rootProject.name = 'search'
include(':search-docs') include(':search-docs')
project(':search-docs').projectDir = new File('./docs') project(':search-docs').projectDir = new File('./docs')
\ No newline at end of file
/*includeBuild('../search-commons') {
dependencySubstitution {
substitute module('eu.dariah.de.minfba:search-commons') with project(':')
}
}*/
\ No newline at end of file
...@@ -74,7 +74,8 @@ ...@@ -74,7 +74,8 @@
<map> <map>
<entry key="OAI-PMH" value="indexCleaner,xmlBatchFileProcessor" /> <entry key="OAI-PMH" value="indexCleaner,xmlBatchFileProcessor" />
<!-- <entry key="XML" value="fileUnpacker,fileUnarchiver,xmlChunker,indexCleaner,xmlBatchFileProcessor" /> --> <!-- <entry key="XML" value="fileUnpacker,fileUnarchiver,xmlChunker,indexCleaner,xmlBatchFileProcessor" /> -->
<entry key="XML" value="fileUnpacker,fileUnarchiver,indexCleaner,xmlBatchFileProcessor" /> <entry key="XML" value="fileUnpacker,fileUnarchiver,indexCleaner,xmlBatchFileProcessor" />
<entry key="JSON" value="fileUnpacker,fileUnarchiver,indexCleaner,jsonBatchFileProcessor" />
<entry key="CSV" value="fileUnpacker,fileUnarchiver,indexCleaner,csvBatchFileProcessor" /> <entry key="CSV" value="fileUnpacker,fileUnarchiver,indexCleaner,csvBatchFileProcessor" />
<entry key="TSV" value="fileUnpacker,fileUnarchiver,indexCleaner,tsvBatchFileProcessor" /> <entry key="TSV" value="fileUnpacker,fileUnarchiver,indexCleaner,tsvBatchFileProcessor" />
<entry key="TEXT" value="fileUnpacker,fileUnarchiver,indexCleaner,textBatchFileProcessor" /> <entry key="TEXT" value="fileUnpacker,fileUnarchiver,indexCleaner,textBatchFileProcessor" />
...@@ -85,6 +86,7 @@ ...@@ -85,6 +86,7 @@
<entry key="OAI-PMH" value="oaipmhCrawler,indexCleaner,xmlBatchFileProcessor" /> <entry key="OAI-PMH" value="oaipmhCrawler,indexCleaner,xmlBatchFileProcessor" />
<!-- <entry key="XML" value="fileDownloader,fileUnpacker,fileUnarchiver,xmlChunker,indexCleaner,xmlBatchFileProcessor" /> --> <!-- <entry key="XML" value="fileDownloader,fileUnpacker,fileUnarchiver,xmlChunker,indexCleaner,xmlBatchFileProcessor" /> -->
<entry key="XML" value="fileDownloader,fileUnpacker,fileUnarchiver,indexCleaner,xmlBatchFileProcessor" /> <entry key="XML" value="fileDownloader,fileUnpacker,fileUnarchiver,indexCleaner,xmlBatchFileProcessor" />
<entry key="JSON" value="fileDownloader,fileUnpacker,fileUnarchiver,indexCleaner,jsonBatchFileProcessor" />
<entry key="CSV" value="fileDownloader,fileUnpacker,fileUnarchiver,indexCleaner,csvBatchFileProcessor" /> <entry key="CSV" value="fileDownloader,fileUnpacker,fileUnarchiver,indexCleaner,csvBatchFileProcessor" />
<entry key="TSV" value="fileDownloader,fileUnpacker,fileUnarchiver,indexCleaner,tsvBatchFileProcessor" /> <entry key="TSV" value="fileDownloader,fileUnpacker,fileUnarchiver,indexCleaner,tsvBatchFileProcessor" />
<entry key="TEXT" value="fileDownloader,fileUnpacker,fileUnarchiver,indexCleaner,textBatchFileProcessor" /> <entry key="TEXT" value="fileDownloader,fileUnpacker,fileUnarchiver,indexCleaner,textBatchFileProcessor" />
...@@ -109,6 +111,11 @@ ...@@ -109,6 +111,11 @@
<property name="maxParallelThreads" value="6" /> <property name="maxParallelThreads" value="6" />
</bean> </bean>
<bean id="jsonBatchFileProcessor" class="eu.dariah.de.search.crawling.crawler.FileProcessor" scope="prototype">
<property name="wrappedServiceType" value="de.unibamberg.minf.processing.service.json.JsonProcessingService" />
<property name="maxParallelThreads" value="6" />
</bean>
<bean id="textBatchFileProcessor" class="eu.dariah.de.search.crawling.crawler.FileProcessor" scope="prototype"> <bean id="textBatchFileProcessor" class="eu.dariah.de.search.crawling.crawler.FileProcessor" scope="prototype">
<property name="wrappedServiceType" value="de.unibamberg.minf.processing.service.text.TextProcessingService" /> <property name="wrappedServiceType" value="de.unibamberg.minf.processing.service.text.TextProcessingService" />
<property name="maxParallelThreads" value="6" /> <property name="maxParallelThreads" value="6" />
...@@ -132,6 +139,14 @@ ...@@ -132,6 +139,14 @@
</property> </property>
</bean> </bean>
<bean id="jsonStringProcessor" class="de.unibamberg.minf.processing.service.json.JsonProcessingService" scope="prototype">
<property name="elementProcessors">
<list>
<ref bean="gtfElementProcessor" />
</list>
</property>
</bean>
<bean id="csvStringProcessor" class="de.unibamberg.minf.processing.service.tabular.CsvProcessingService" scope="prototype"> <bean id="csvStringProcessor" class="de.unibamberg.minf.processing.service.tabular.CsvProcessingService" scope="prototype">
<property name="elementProcessors"> <property name="elementProcessors">
<list> <list>
......
Supports Markdown
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