Due to a scheduled upgrade to version 14.10, GitLab will be unavailabe on Monday 30.05., from 19:00 until 20:00.

Commit 9c2197c8 authored by Günter Hipler's avatar Günter Hipler
Browse files

status 8.4.2021 (mail an silvia)

parent 7c83c4c8
Pipeline #24347 passed with stages
in 7 minutes and 25 seconds
...@@ -29,6 +29,8 @@ docker run --rm -v /home/swissbib/environment/code/repositories/memoriav/gitlab/ ...@@ -29,6 +29,8 @@ docker run --rm -v /home/swissbib/environment/code/repositories/memoriav/gitlab/
docker run --rm -it --network host edenhill/kafkacat:1.6.0 -C -b VPN:9092 -t import-process-reporting -K '\t' docker run --rm -it --network host edenhill/kafkacat:1.6.0 -C -b VPN:9092 -t import-process-reporting -K '\t'
docker run --rm -it --network host edenhill/kafkacat:1.6.0 -C -b VPN:9092 -t edm-es-records1 -K '\t'
docker run --rm -it --network host edenhill/kafkacat:1.6.0 -C -b VPN:9092 -t import-process-reporting-es | grep FATAL docker run --rm -it --network host edenhill/kafkacat:1.6.0 -C -b VPN:9092 -t import-process-reporting-es | grep FATAL
andere Befehle: andere Befehle:
......
...@@ -4,6 +4,12 @@ app: ...@@ -4,6 +4,12 @@ app:
#accessTermLabelsPath: "/home/swissbib/environment/code/repositories/memoriav/gitlab/services/postprocessing/rico-edm-transformer/configs/access_terms/labels.csv" #accessTermLabelsPath: "/home/swissbib/environment/code/repositories/memoriav/gitlab/services/postprocessing/rico-edm-transformer/configs/access_terms/labels.csv"
#reuseStatementLabelsPath: "/home/swissbib/environment/code/repositories/memoriav/gitlab/services/postprocessing/rico-edm-transformer/configs/reuse_statements/labels.csv" #reuseStatementLabelsPath: "/home/swissbib/environment/code/repositories/memoriav/gitlab/services/postprocessing/rico-edm-transformer/configs/reuse_statements/labels.csv"
isocodemapping: ${ISOCODE_MAPPING:?system} isocodemapping: ${ISOCODE_MAPPING:?system}
# elastic:
# host: ${ELASTIC_HOST:?system}
# port: ${ELASTIC_PORT:?system}
# documentsIndex: ${DOCUMENTS_INDEX:?system}
# institutionIndex: ${INSTITUTION_INDEX:?system}
# recordSetIndex: ${RECORD_SET_INDEX:?system}
......
...@@ -269,6 +269,9 @@ class EDM { ...@@ -269,6 +269,9 @@ class EDM {
case _ => case _ =>
} }
//fixed value for provider
aggregation.addProvider(Some("Memoriav"))
Option(ExtractionResult(aggregation)) Option(ExtractionResult(aggregation))
} else { } else {
......
...@@ -180,6 +180,13 @@ class Aggregation(private val id: String) { ...@@ -180,6 +180,13 @@ class Aggregation(private val id: String) {
}) })
} }
def addProvider(edmProvider: Option[String]): Unit = {
edmProvider.map(a =>
model.add(iri(id),EDMVocab.PROVIDER,factory.createLiteral(a))
)
}
def addEDMObjectNoFoto(edmObjectNoFoto: Option[String]): Unit = { def addEDMObjectNoFoto(edmObjectNoFoto: Option[String]): Unit = {
edmObjectNoFoto.map(a => { edmObjectNoFoto.map(a => {
if (identValue.matches(edmObjectNoFoto.get)) { if (identValue.matches(edmObjectNoFoto.get)) {
......
...@@ -44,6 +44,7 @@ object EDMVocab extends VocabularyFactory("http://www.europeana.eu/schemas/edm/" ...@@ -44,6 +44,7 @@ object EDMVocab extends VocabularyFactory("http://www.europeana.eu/schemas/edm/"
val IS_SHOWN_AT: IRI = getIri("isShownAt") val IS_SHOWN_AT: IRI = getIri("isShownAt")
val IS_SHOWN_BY: IRI = getIri("isShownBy") val IS_SHOWN_BY: IRI = getIri("isShownBy")
val OBJECT: IRI = getIri("object") val OBJECT: IRI = getIri("object")
val PROVIDER: IRI = getIri("provider")
} }
......
...@@ -73,9 +73,12 @@ object Helper { ...@@ -73,9 +73,12 @@ object Helper {
def getLanguageCode(wikiId:String):Option[String] = { def getLanguageCode(wikiId:String):Option[String] = {
isoLanguageCodes match { isoLanguageCodes match {
case Some(langkeys) if langkeys.containsKey(wikiId) => Some(langkeys.get(wikiId)) case Some(langkeys) if langkeys.containsKey(wikiId) =>
case Some(langkeys) if !langkeys.containsKey(wikiId) => None Some(langkeys.get(wikiId))
case None => None case Some(langkeys) if !langkeys.containsKey(wikiId) =>
None
case None =>
None
} }
} }
......
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