Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
Search Doc Service
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
memoriav
M
Memobase 2020
S
services
elastic-services
Search Doc Service
Commits
599efd4f
Commit
599efd4f
authored
Nov 02, 2020
by
Jonas Waeber
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Catch invalid date parser error.
parent
81553a90
Pipeline
#16457
failed with stages
in 1 minute and 48 seconds
Changes
9
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
44 additions
and
23 deletions
+44
-23
src/main/kotlin/SearchDocTransform.kt
src/main/kotlin/SearchDocTransform.kt
+4
-2
src/main/kotlin/builders/AgentContainerBuilder.kt
src/main/kotlin/builders/AgentContainerBuilder.kt
+1
-1
src/main/kotlin/builders/DateContainerBuilder.kt
src/main/kotlin/builders/DateContainerBuilder.kt
+14
-4
src/main/kotlin/builders/FacettedContainerBuilder.kt
src/main/kotlin/builders/FacettedContainerBuilder.kt
+1
-1
src/main/kotlin/builders/IFieldBuilder.kt
src/main/kotlin/builders/IFieldBuilder.kt
+1
-1
src/main/kotlin/builders/PersonFacetBuilder.kt
src/main/kotlin/builders/PersonFacetBuilder.kt
+1
-1
src/main/kotlin/builders/PlaceFacetBuilder.kt
src/main/kotlin/builders/PlaceFacetBuilder.kt
+1
-1
src/main/kotlin/builders/SuggestContainerBuilder.kt
src/main/kotlin/builders/SuggestContainerBuilder.kt
+1
-1
src/main/kotlin/helpers/DateFacetBuildHelpers.kt
src/main/kotlin/helpers/DateFacetBuildHelpers.kt
+20
-11
No files found.
src/main/kotlin/SearchDocTransform.kt
View file @
599efd4f
...
...
@@ -78,6 +78,8 @@ class SearchDocTransform(private val mediaUrl: String) {
val
digitalIdentifierReferences
=
Extract
.
identifiers
(
digitalObject
?.
get
(
"identifiedBy"
))
val
digitalIdentifierEntities
=
mutableListOf
<
JsonObject
>()
val
id
=
record
[
"@id"
]
as
String
for
(
item
in
input
.
entries
)
{
for
(
builder
:
IFieldBuilder
in
listOf
(
personFacetBuilder
,
...
...
@@ -106,7 +108,7 @@ class SearchDocTransform(private val mediaUrl: String) {
suggestContainerBuilder
))
{
if
(
builder
.
filter
(
item
.
value
))
{
builder
.
append
(
item
.
value
)
builder
.
append
(
i
d
,
i
tem
.
value
)
}
if
(
digitalIdentifierReferences
.
contains
(
item
.
key
))
...
...
@@ -114,7 +116,7 @@ class SearchDocTransform(private val mediaUrl: String) {
}
}
val
id
=
record
[
"@id"
]
as
String
val
recordIdentifiers
=
Filter
.
entitiesByProperty
(
"identifiedBy"
,
record
,
input
)
val
recordTitles
=
Filter
.
entitiesByProperty
(
"hasTitle"
,
record
,
input
)
...
...
src/main/kotlin/builders/AgentContainerBuilder.kt
View file @
599efd4f
...
...
@@ -52,7 +52,7 @@ class AgentContainerBuilder(
}
}
override
fun
append
(
jsonObject
:
JsonObject
):
String
{
override
fun
append
(
key
:
String
,
jsonObject
:
JsonObject
):
String
{
val
names
=
Extract
.
languageContainer
(
"agent-name"
,
jsonObject
[
KEYS
.
name
])
val
name
=
if
(
names
.
isNotEmpty
())
names
.
reduce
{
acc
,
languageContainer
->
acc
.
merge
(
languageContainer
)
}
...
...
src/main/kotlin/builders/DateContainerBuilder.kt
View file @
599efd4f
package
org.memobase.builders
import
com.beust.klaxon.JsonObject
import
org.apache.logging.log4j.LogManager
import
org.memobase.KEYS
import
org.memobase.helpers.DateFacetBuildHelpers
import
org.memobase.model.DateContainer
import
org.memobase.rdf.NS
import
java.lang.NumberFormatException
class
DateContainerBuilder
(
private
val
containedIds
:
List
<
String
>)
:
IFieldBuilder
{
private
val
log
=
LogManager
.
getLogger
(
"DateContainerBuilder"
)
private
val
dateContainers
=
mutableListOf
<
DateContainer
>()
...
...
@@ -17,7 +20,7 @@ class DateContainerBuilder(private val containedIds: List<String>) : IFieldBuild
false
}
override
fun
append
(
jsonObject
:
JsonObject
):
String
{
override
fun
append
(
key
:
String
,
jsonObject
:
JsonObject
):
String
{
val
isNormalized
=
jsonObject
.
containsKey
(
"normalizedDateValue"
)
val
date
=
if
(
isNormalized
)
{
jsonObject
[
"normalizedDateValue"
]
as
String
...
...
@@ -37,9 +40,16 @@ class DateContainerBuilder(private val containedIds: List<String>) : IFieldBuild
DateFacetBuildHelpers
.
buildFromNormalizedSingleDate
(
date
)
else
emptyList
()
NS
.
rico
+
"DateRange"
->
if
(
isNormalized
)
DateFacetBuildHelpers
.
buildFromNormalizedDateRange
(
date
)
else
emptyList
()
if
(
isNormalized
)
{
try
{
DateFacetBuildHelpers
.
buildFromNormalizedDateRange
(
date
)
}
catch
(
ex
:
NumberFormatException
)
{
log
.
error
(
"Could not parse normalized date $date in resource $key."
)
emptyList
<
String
>()
}
}
else
{
emptyList
()
}
else
->
emptyList
()
}
dateContainers
.
add
(
...
...
src/main/kotlin/builders/FacettedContainerBuilder.kt
View file @
599efd4f
...
...
@@ -41,7 +41,7 @@ class FacettedContainerBuilder(
return
identifiers
.
contains
(
jsonObject
[
KEYS
.
entityId
])
}
override
fun
append
(
jsonObject
:
JsonObject
):
String
{
override
fun
append
(
key
:
String
,
jsonObject
:
JsonObject
):
String
{
val
filterAndFacet
=
facetFunction
(
jsonObject
)
containers
.
add
(
FacettedContainer
(
...
...
src/main/kotlin/builders/IFieldBuilder.kt
View file @
599efd4f
...
...
@@ -23,6 +23,6 @@ import com.beust.klaxon.JsonObject
interface
IFieldBuilder
{
fun
filter
(
jsonObject
:
JsonObject
):
Boolean
fun
append
(
jsonObject
:
JsonObject
):
String
fun
append
(
key
:
String
,
jsonObject
:
JsonObject
):
String
fun
build
():
List
<
Any
>
}
src/main/kotlin/builders/PersonFacetBuilder.kt
View file @
599efd4f
...
...
@@ -38,7 +38,7 @@ class PersonFacetBuilder : IFieldBuilder {
}
}
override
fun
append
(
jsonObject
:
JsonObject
):
String
{
override
fun
append
(
key
:
String
,
jsonObject
:
JsonObject
):
String
{
val
result
=
FacetBuildHelpers
.
person
(
jsonObject
)
return
if
(
result
.
second
.
isNotEmpty
())
{
personFacetValues
.
addAll
(
result
.
second
)
...
...
src/main/kotlin/builders/PlaceFacetBuilder.kt
View file @
599efd4f
...
...
@@ -38,7 +38,7 @@ class PlaceFacetBuilder : IFieldBuilder {
}
}
override
fun
append
(
jsonObject
:
JsonObject
):
String
{
override
fun
append
(
key
:
String
,
jsonObject
:
JsonObject
):
String
{
val
result
=
FacetBuildHelpers
.
place
(
jsonObject
)
return
if
(
result
.
second
.
isNotEmpty
())
{
placeFacetValues
.
addAll
(
result
.
second
)
...
...
src/main/kotlin/builders/SuggestContainerBuilder.kt
View file @
599efd4f
...
...
@@ -41,7 +41,7 @@ class SuggestContainerBuilder(private val hasSubjectIds: List<String>) : IFieldB
}
}
override
fun
append
(
jsonObject
:
JsonObject
):
String
{
override
fun
append
(
key
:
String
,
jsonObject
:
JsonObject
):
String
{
return
when
(
jsonObject
[
KEYS
.
atType
])
{
NS
.
skos
+
KEYS
.
Concept
->
parseKeywords
(
jsonObject
)
NS
.
rico
+
KEYS
.
Title
->
parseTitles
(
jsonObject
)
...
...
src/main/kotlin/helpers/DateFacetBuildHelpers.kt
View file @
599efd4f
...
...
@@ -80,9 +80,11 @@ object DateFacetBuildHelpers {
while
(
fromDecadeAsInt
!=
untilDecadeAsInt
)
{
fromDecadeAsInt
+=
10
results
.
add
(
"$level_2$separator$fromCentury$separator${getDecade(
fromDecadeAsInt
)}
$
separator
"
"$level_2$separator$fromCentury$separator${
getDecade
(
fromDecadeAsInt
)
}
$
separator
"
)
}
results
...
...
@@ -96,9 +98,12 @@ object DateFacetBuildHelpers {
while
(
fromCenturyAsInt
!=
untilCenturyAsInt
)
{
results
.
add
(
"$level_1$separator${getCentury(
fromCenturyAsInt
)}
$
separator
")
"$level_1$separator${
getCentury
(
fromCenturyAsInt
)
}
$
separator
"
)
fromCenturyAsInt
+=
1
}
results
.
add
(
...
...
@@ -110,11 +115,15 @@ object DateFacetBuildHelpers {
while
(
fromDecadeAsInt
!=
untilDecadeAsInt
)
{
fromDecadeAsInt
+=
10
results
.
add
(
"$level_2$separator${getCentury(
fromDecadeAsInt
/
100
)}
$
separator
$
{
getDecade
(
fromDecadeAsInt
)}
$
separator
"
"$level_2$separator${
getCentury
(
fromDecadeAsInt
/
100
)
}
$
separator
$
{
getDecade
(
fromDecadeAsInt
)
}
$
separator
"
)
}
results
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment