Commit cebb6354 authored by Jonas Waeber's avatar Jonas Waeber

Merge code

parents 7c08033a 5bc1d967
Pipeline #20501 passed with stages
in 3 minutes and 57 seconds
2020.11.05 14:00:58 INFO started: Metals version 0.9.4 in workspace '/home/seb/code/switchgit/memoriav/memobase-2020/services/import-process/normalization-service' .
2020.11.05 14:00:58 INFO time: initialize in 0.35s
......@@ -70,7 +70,6 @@ class KafkaTopology(
val joinedStream =
configJoiner.join(stream, configStream)
val filterInvalidLocalTransforms = joinedStream
.transformValues(HeaderExtractionTransformSupplier<JoinedValues<String, LocalTransformsLoader>>())
.branch(
......
......@@ -8,4 +8,4 @@ data class PreparedInput(
val model: MemobaseModel,
val localTransforms: LocalTransformsLoader,
val metadata: HeaderMetadata
)
\ No newline at end of file
)
......@@ -16,9 +16,9 @@
*/
package org.memobase
import ch.memobase.settings.SettingsLoader
import org.apache.kafka.streams.KafkaStreams
import org.apache.logging.log4j.LogManager
import ch.memobase.settings.SettingsLoader
class Service(file: String = "app.yml") {
companion object {
......
......@@ -21,6 +21,10 @@ import ch.memobase.rdf.MemobaseModel
import ch.memobase.rdf.NS
import ch.memobase.reporting.Report
import com.beust.klaxon.Klaxon
import java.io.File
import java.io.FileOutputStream
import java.nio.charset.Charset
import java.util.stream.Stream
import org.apache.jena.riot.Lang
import org.apache.jena.riot.RDFDataMgr
import org.apache.jena.riot.RDFFormat
......@@ -35,10 +39,6 @@ import org.junit.jupiter.api.TestInstance
import org.junit.jupiter.params.ParameterizedTest
import org.junit.jupiter.params.provider.MethodSource
import org.memobase.params.KafkaTestParams
import java.io.File
import java.io.FileOutputStream
import java.nio.charset.Charset
import java.util.stream.Stream
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class TestIntegration {
......
......@@ -43,13 +43,13 @@ mbr:sfw-SFW_1376-2 a rico:Record ;
rico:name "Seedorf, UR (Schweiz)"@de
] ;
schema:sameAs "https://www.recherche.bar.admin.ch/recherche/#/de/suche/archivplan/21689176" ;
ebucore:hasGenre _:b0 , _:b2 , _:b3 , _:b4 , _:b5 , _:b6 ;
ebucore:hasGenre _:b2 , _:b3 , _:b4 , _:b0 , _:b5 , _:b6 ;
rico:descriptiveNote "Quellenangabe für Zitate und Publikationen: <br> Schweizerisches Bundesarchiv, J2.143#1996/386#1376-1#2*, Schweizer Filmwochenschau vom 19.09.1969, Klosterfrauen treiben Agrarkultur (1376-2)"@de ;
rico:hasInstantiation <https://memobase.ch/instantiation/digital/sfw-SFW_1376-2-1> , <https://memobase.ch/instantiation/physical/sfw-SFW_1376-2-0> ;
rico:hasLanguage _:b7 , _:b8 ;
rico:hasSubject [ a skos:Concept ;
skos:editorialNote "Ursprungsfeld: Deskriptoren" ;
skos:prefLabel "LANDWIRTSCHAFT"@de
skos:prefLabel "RELIGION"@de
] ;
rico:hasSubject [ a skos:Concept ;
skos:editorialNote "Ursprungsfeld: Deskriptoren" ;
......@@ -65,29 +65,29 @@ mbr:sfw-SFW_1376-2 a rico:Record ;
] ;
rico:hasSubject [ a skos:Concept ;
skos:editorialNote "Ursprungsfeld: Deskriptoren" ;
skos:prefLabel "RELIGION"@de
skos:prefLabel "LANDWIRTSCHAFT"@de
] ;
rico:hasTitle [ a rico:Title ;
rico:title "Schweizer Filmwochenschau"@de ;
rico:type "series"
rico:title "Klosterfrauen treiben Agrarkultur (1376-2)"@de ;
rico:type "main"
] ;
rico:hasTitle [ a rico:Title ;
rico:title "Schweizer Filmwochenschau vom 19.09.1969"@de ;
rico:type "broadcast"
] ;
rico:hasTitle [ a rico:Title ;
rico:title "Klosterfrauen treiben Agrarkultur (1376-2)"@de ;
rico:type "main"
rico:title "Schweizer Filmwochenschau"@de ;
rico:type "series"
] ;
rico:heldBy mbcb:sfw ;
rico:identifiedBy [ a rico:Identifier ;
rico:identifier "https://memobase.ch/record/sfw-SFW_1376-2" ;
rico:type "main"
] ;
rico:identifiedBy [ a rico:Identifier ;
rico:identifier "SFW_1376-2" ;
rico:type "original"
] ;
rico:identifiedBy [ a rico:Identifier ;
rico:identifier "https://memobase.ch/record/sfw-SFW_1376-2" ;
rico:type "main"
] ;
rico:isPartOf mbrs:fbfws ;
rico:publishedBy [ a rico:CorporateBody ;
rico:name "SFW"@de
......@@ -102,10 +102,19 @@ mbr:sfw-SFW_1376-2 a rico:Record ;
rico:title "Klosterfrauen treiben Agrarkultur (1376-2)"@de ;
rico:type "Film" .
_:b8 a rico:Language ;
schema:sameAs "http://www.wikidata.org/entity/Q188" ;
rico:name "Deutsch"@de , "allemand"@fr , "tedesco"@it ;
rico:resultsFrom _:b10 ;
rico:type "content" .
_:b11 a rico:CarrierType ;
rico:name "35mm Zelluloseazetat"@de .
_:b10 a rico:Activity ;
rico:affects _:b7 ;
rico:beginningDate "2021-44-21T09:44:55+0000"^^xsd:dateTime ;
rico:endDate "2021-44-21T09:44:55+0000"^^xsd:dateTime ;
rico:beginningDate "2021-46-21T09:46:42+0000"^^xsd:dateTime ;
rico:endDate "2021-46-21T09:46:42+0000"^^xsd:dateTime ;
rico:performedBy [ a rico:Mechanism ;
rico:name "LanguagesNormalizer" ;
rico:performs _:b10
......@@ -113,32 +122,6 @@ _:b10 a rico:Activity ;
rico:resultsIn _:b8 ;
rico:type "enrichment" .
_:b9 a rico:CreationRelation ;
rico:creationRelationHasSource mbr:sfw-SFW_1376-2 ;
rico:creationRelationHasTarget [ a rico:CorporateBody ;
rico:agentIsTargetOfCreationRelation
_:b9 ;
rico:name "Schweizer Filmwochenschau (SFW)"@de
] ;
rico:name "Autor" ;
rico:type "creator" .
_:b11 a rico:Activity ;
rico:affects _:b3 ;
rico:beginningDate "2021-44-21T09:44:55+0000"^^xsd:dateTime ;
rico:endDate "2021-44-21T09:44:55+0000"^^xsd:dateTime ;
rico:performedBy [ a rico:Mechanism ;
rico:name "GenreNormalizer" ;
rico:performs _:b11
] ;
rico:resultsIn _:b5 ;
rico:type "enrichment" .
_:b6 a skos:Concept ;
skos:editorialNote "Ursprungsfeld: Genre" ;
skos:prefLabel "Musik"@de , "Musique"@fr , "Musica"@it ;
rico:resultsFrom _:b12 .
<https://memobase.ch/instantiation/digital/sfw-SFW_1376-2-1>
a rico:Instantiation ;
ebucore:locator "<![CDATA[https://media.zem.ch/01WS/1969/SFW_1376.mp4?start=109&end=187]]>" ;
......@@ -162,26 +145,22 @@ _:b6 a skos:Concept ;
] ;
rico:type "digitalObject" .
_:b3 a skos:Concept ;
skos:editorialNote "Ursprungsfeld: Genre" ;
skos:prefLabel "Filmwochenschau"@de .
_:b12 a rico:Activity ;
rico:affects _:b4 ;
rico:beginningDate "2021-44-21T09:44:55+0000"^^xsd:dateTime ;
rico:endDate "2021-44-21T09:44:55+0000"^^xsd:dateTime ;
rico:beginningDate "2021-46-21T09:46:42+0000"^^xsd:dateTime ;
rico:endDate "2021-46-21T09:46:42+0000"^^xsd:dateTime ;
rico:performedBy [ a rico:Mechanism ;
rico:name "GenreNormalizer" ;
rico:performs _:b12
] ;
rico:resultsIn _:b6 ;
rico:resultsIn _:b5 ;
rico:type "enrichment" .
<https://memobase.ch/instantiation/physical/sfw-SFW_1376-2-0>
a rico:Instantiation ;
rdau:P60558 "SW"@de ;
ebucore:duration "78" ;
rico:hasCarrierType _:b13 , _:b14 ;
rico:hasCarrierType _:b13 , _:b11 ;
rico:hasDerivedInstantiation <https://memobase.ch/instantiation/digital/sfw-SFW_1376-2-1> ;
rico:identifiedBy [ a rico:Identifier ;
rico:identifier "https://memobase.ch/instantiation/physical/sfw-SFW_1376-2-0" ;
......@@ -194,42 +173,28 @@ _:b12 a rico:Activity ;
rico:instantiates mbr:sfw-SFW_1376-2 ;
rico:type "physicalObject" .
_:b14 a rico:CarrierType ;
rico:name "35mm Zelluloseazetat"@de .
_:b3 a skos:Concept ;
skos:editorialNote "Ursprungsfeld: Genre" ;
skos:prefLabel "Filmwochenschau"@de , "Filmwochenschau"@fr , "Filmwochenschau"@it ;
rico:resultsFrom _:b14 .
_:b2 a skos:Concept ;
skos:editorialNote "Ursprungsfeld: Genre" ;
skos:prefLabel "Ballett"@de .
_:b15 a rico:Activity ;
rico:affects _:b14 ;
rico:beginningDate "2021-44-21T09:44:55+0000"^^xsd:dateTime ;
rico:endDate "2021-44-21T09:44:55+0000"^^xsd:dateTime ;
rico:performedBy [ a rico:Mechanism ;
rico:name "CarrierTypeNormalizer" ;
rico:performs _:b15
] ;
rico:resultsIn _:b13 ;
rico:type "enrichment" .
_:b5 a skos:Concept ;
skos:editorialNote "Ursprungsfeld: Genre" ;
skos:prefLabel "Musik"@de , "Musique"@fr , "Musica"@it ;
rico:resultsFrom _:b12 .
_:b4 a skos:Concept ;
skos:editorialNote "Ursprungsfeld: Genre" ;
skos:prefLabel "Canzone"@de .
_:b8 a rico:Language ;
schema:sameAs "http://www.wikidata.org/entity/Q188" ;
rico:name "Deutsch"@de , "allemand"@fr , "tedesco"@it ;
rico:resultsFrom _:b10 ;
rico:type "content" .
_:b7 a rico:Language ;
rico:name "dt"@de ;
rico:type "content" .
_:b1 a rico:Activity ;
rico:affects _:b2 ;
rico:beginningDate "2021-44-21T09:44:55+0000"^^xsd:dateTime ;
rico:endDate "2021-44-21T09:44:55+0000"^^xsd:dateTime ;
rico:beginningDate "2021-46-21T09:46:42+0000"^^xsd:dateTime ;
rico:endDate "2021-46-21T09:46:42+0000"^^xsd:dateTime ;
rico:performedBy [ a rico:Mechanism ;
rico:name "GenreNormalizer" ;
rico:performs _:b1
......@@ -237,12 +202,47 @@ _:b1 a rico:Activity ;
rico:resultsIn _:b0 ;
rico:type "enrichment" .
_:b5 a skos:Concept ;
_:b6 a skos:Concept ;
skos:editorialNote "Ursprungsfeld: Genre" ;
skos:prefLabel "Filmwochenschau"@de , "Filmwochenschau"@fr , "Filmwochenschau"@it ;
rico:resultsFrom _:b11 .
skos:prefLabel "Filmwochenschau"@de .
_:b9 a rico:CreationRelation ;
rico:creationRelationHasSource mbr:sfw-SFW_1376-2 ;
rico:creationRelationHasTarget [ a rico:CorporateBody ;
rico:agentIsTargetOfCreationRelation
_:b9 ;
rico:name "Schweizer Filmwochenschau (SFW)"@de
] ;
rico:name "Autor" ;
rico:type "creator" .
_:b13 a rico:CarrierType ;
schema:sameAs "http://www.wikidata.org/entity/Q226528" ;
rico:name "35-mm-Film"@de , "format 35 mm"@fr , "35 millimetri"@it ;
rico:resultsFrom _:b15 .
_:b15 a rico:Activity ;
rico:affects _:b11 ;
rico:beginningDate "2021-46-21T09:46:42+0000"^^xsd:dateTime ;
rico:endDate "2021-46-21T09:46:42+0000"^^xsd:dateTime ;
rico:performedBy [ a rico:Mechanism ;
rico:name "CarrierTypeNormalizer" ;
rico:performs _:b15
] ;
rico:resultsIn _:b13 ;
rico:type "enrichment" .
_:b14 a rico:Activity ;
rico:affects _:b6 ;
rico:beginningDate "2021-46-21T09:46:42+0000"^^xsd:dateTime ;
rico:endDate "2021-46-21T09:46:42+0000"^^xsd:dateTime ;
rico:performedBy [ a rico:Mechanism ;
rico:name "GenreNormalizer" ;
rico:performs _:b14
] ;
rico:resultsIn _:b3 ;
rico:type "enrichment" .
_:b7 a rico:Language ;
rico:name "dt"@de ;
rico:type "content" .
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