Skip to content

Commit

Permalink
Merge branch 'dev' into feature/contentpipelines
Browse files Browse the repository at this point in the history
  • Loading branch information
net-cscience-raphael committed Aug 19, 2024
2 parents 8516eeb + 8d5ffba commit 2cc9cbe
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import org.vitrivr.engine.core.operators.ingest.Extractor
* @version 1.2.0
*/
abstract class AbstractExtractor<C : ContentElement<*>, D : Descriptor<*>>(final override val input: Operator<Retrievable>, final override val analyser: Analyser<C, D>, final override val field: Schema.Field<C, D>? = null) : Extractor<C, D> {

protected val logger: KLogger = KotlinLogging.logger {}

init {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,9 @@ abstract class FesExtractor<C : ContentElement<*>, D : Descriptor<*>>(
field: Schema.Field<C, D>?,
analyser: ExternalFesAnalyser<C, D>,
protected val parameters: Map<String, String>,
) : AbstractBatchedExtractor<C, D>(input, analyser, field, parameters["batchSize"]?.toIntOrNull() ?: 1) {

private val contentSources = parameters[CONTENT_AUTHORS_KEY]?.split(",")?.toSet()


) : AbstractExtractor<C, D>(input, analyser, field) {
/** Host of the FES API. */

protected val host: String
get() = this.parameters[HOST_PARAMETER_NAME] ?: HOST_PARAMETER_DEFAULT

Expand Down

0 comments on commit 2cc9cbe

Please sign in to comment.