Skip to content

Commit

Permalink
Fix rebase errors
Browse files Browse the repository at this point in the history
  • Loading branch information
aduffeck committed Jul 13, 2022
1 parent 0f926fa commit 242d878
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions services/search/pkg/search/index/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
"github.com/blevesearch/bleve/v2/analysis/token/lowercase"
"github.com/blevesearch/bleve/v2/analysis/tokenizer/single"
"github.com/blevesearch/bleve/v2/mapping"
"github.com/cs3org/reva/v2/pkg/storagespace"
"github.com/blevesearch/bleve/v2/search"
"github.com/cs3org/reva/v2/pkg/storagespace"
"google.golang.org/protobuf/types/known/timestamppb"

sprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
Expand Down Expand Up @@ -314,11 +314,11 @@ func fieldsToEntity(fields map[string]interface{}) *indexDocument {
}

func fromDocumentMatch(hit *search.DocumentMatch) (*searchmsg.Match, error) {
rootID, err := storagespace.ParseID(fields["RootID"].(string))
rootID, err := storagespace.ParseID(hit.Fields["RootID"].(string))
if err != nil {
return nil, err
}
rID, err := storagespace.ParseID(fields["ID"].(string))
rID, err := storagespace.ParseID(hit.Fields["ID"].(string))
if err != nil {
return nil, err
}
Expand Down

0 comments on commit 242d878

Please sign in to comment.