Skip to content

Change how nested objects are indexed #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lmarini merged 4 commits into from
Sep 11, 2023
Merged

Change how nested objects are indexed #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c7d5c8
modifications to indexing
max-zilla Mar 8, 2023
9282ea4
remove old comment
max-zilla Mar 8, 2023
a94046c
Update CHANGELOG.md
max-zilla Mar 8, 2023
0afc72f
Merge branch 'develop' into nested-search-fix
lmarini Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ registration or heartbeat to Clowder that will restrict use of that extractor to
## Fixed
- Updated lastModifiesDate when updating file or metadata to a dataset, added lastModified to UI [386](https://github.com/clowder-framework/clowder/issues/386)
- Disabled button while create dataset ajax call is still going on [#311](https://github.com/clowder-framework/clowder/issues/311)
- Fixed bug where complex JSON metadata objects using arrays were not being indexed properly for search.


## 1.21.0 - 2022-08-23
Expand Down
10 changes: 4 additions & 6 deletions app/services/ElasticsearchPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ class ElasticsearchPlugin(application: Application) extends Plugin {
case jv: JsArray => {
builder.startArray(clean_k)
jv.value.foreach(subv => {
builder.value(subv.toString.replace("\"",""))
builder.value(convertJsObjectToBuilder(builder, subv.asInstanceOf[JsObject]))
})
builder.endArray()
}
Expand Down Expand Up @@ -598,11 +598,9 @@ class ElasticsearchPlugin(application: Application) extends Plugin {
// Elasticsearch 2 does not allow periods in field names
builder.startArray(k.toString.replace(".", "_"))
v.value.foreach(jv => {
// Try to interpret numeric value from each String if possible
parseDouble(jv.toString) match {
case Some(d) => builder.value(d)
case None => builder.value(jv)
}
builder.startObject()
convertJsObjectToBuilder(builder, jv.asInstanceOf[JsObject])
builder.endObject()
})
builder.endArray()
}
Expand Down