Properly handle copyrighted data #574
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gunnarvelle
commented
Jan 9, 2025
| @@ -268,7 +269,7 @@ trait MultiDraftSearchService { | |||
| val idFilter = if (settings.withIdIn.isEmpty) None else Some(idsQuery(settings.withIdIn)) | |||
|
|
|||
| val licenseFilter = settings.license match { | |||
| case None => Some(boolQuery().not(termQuery("license", "copyrighted"))) | |||
| case None => Some(boolQuery().not(termQuery("license", License.Copyrighted.toString))) | |||
There was a problem hiding this comment.
Dette funker ikkje slik det er no, men konsekvensen er at vi får opp artikler med opphavsrett i ed-søket, så hell i uhell!
Also remove `includeCopyrighted` flag from search
gunnarvelle
commented
Jan 10, 2025
For backwards compatibility. If `license` is provided this is used instead.
gunnarvelle
commented
Jan 14, 2025
search-api/src/main/scala/no/ndla/searchapi/service/search/MultiDraftSearchService.scala
Outdated
Show resolved
Hide resolved
gunnarvelle
commented
Jan 14, 2025
image-api/src/main/scala/no/ndla/imageapi/controller/ImageControllerV2.scala
Show resolved
Hide resolved
gunnarvelle
commented
Jan 14, 2025
|
Får ikkje lov å approve siden eg laga denne, men tenker vi kan merge. |
|
Denne gikk litt i glemmeboka, men er vi klare i frontend for å ta inn dette? @gunnarvelle |
|
Ikkje heilt endå, men etter min tilhørende pr i ed kan vi nok ta den inn |
This was referenced Feb 19, 2025
gunnarvelle
force-pushed
the
fix-copyrighted-filter
branch
from
133b30a to
fe77995
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Data med opphavsrett er lagra med lisens "COPYRIGHTED" og ikkje "copyrighted" så dette søket fungerer ikkje i dag.
https://github.com/NDLANO/Issues/issues/4263