Skip to content

experimental(search2): WIP coerce type by domain #1712

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

Draft
olovy wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

experimental(search2): WIP coerce type by domain #1712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion whelk-core/src/main/groovy/whelk/search2/querytree/Condition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public sealed class Condition implements Node permits Type {
private final Operator operator;
private final Value value;


public Condition(Selector selector, Operator operator, Value value) {
this.selector = selector;
this.operator = operator;
Expand Down Expand Up @@ -101,7 +102,9 @@ public boolean implies(Node node, JsonLd jsonLd) {

@Override
public RdfSubjectType rdfSubjectType() {
return RdfSubjectType.noType();
return selector.domain().size() == 1 && selector instanceof Property p
? p.domainTypes.getFirst().rdfSubjectType()
: RdfSubjectType.noType();
}

@Override
Expand Down
2 changes: 2 additions & 0 deletions whelk-core/src/main/groovy/whelk/search2/querytree/Property.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public non-sealed class Property extends PathElement {

protected Map<String, Object> definition;
protected List<String> domain;
public List<Type> domainTypes;
protected List<String> range;
protected String inverseOf;
protected String langAlias;
Expand All @@ -67,6 +68,7 @@ public Property(String name, JsonLd jsonLd) {
protected Property(Map<String, Object> definition, JsonLd jsonLd) {
this.definition = definition;
this.domain = getDomain(jsonLd);
this.domainTypes = domain.stream().map(t -> new Type(t, jsonLd)).toList();
this.range = getRange(jsonLd);
this.inverseOf = getInverseOf(jsonLd);
this.indexKey = (String) definition.get("ls:indexKey"); // FIXME: This shouldn't have a different prefix (ls: vs librissearch:)
Expand Down
Loading