gibheer/bleve
0
0
Fork 0
Code

removed a few more public methods

Browse Source
This commit is contained in:
Marty Schoch 2014-08-30 00:13:46 -04:00
parent 8c6427959c
commit 76660c0d13
3 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mapping_document.go
View File

@ -24,7 +24,7 @@ type DocumentMapping struct {
DefaultAnalyzer string `json:"default_analyzer"` DefaultAnalyzer string `json:"default_analyzer"`
} }
func (dm *DocumentMapping) Validate(cache *registry.Cache) error { func (dm *DocumentMapping) validate(cache *registry.Cache) error {
var err error var err error
if dm.DefaultAnalyzer != "" { if dm.DefaultAnalyzer != "" {
_, err := cache.AnalyzerNamed(dm.DefaultAnalyzer) _, err := cache.AnalyzerNamed(dm.DefaultAnalyzer)
@ -33,7 +33,7 @@ func (dm *DocumentMapping) Validate(cache *registry.Cache) error {
} }
} }
for _, property := range dm.Properties { for _, property := range dm.Properties {
err = property.Validate(cache) err = property.validate(cache)
if err != nil { if err != nil {
return err return err
} }
@ -62,11 +62,7 @@ func (dm *DocumentMapping) Validate(cache *registry.Cache) error {
return nil return nil
} }
func (dm *DocumentMapping) GoString() string { func (dm *DocumentMapping) documentMappingForPath(path string) *DocumentMapping {
return fmt.Sprintf(" &bleve.DocumentMapping{Enabled:%t, Dynamic:%t, Properties:%#v, Fields:%#v}", dm.Enabled, dm.Dynamic, dm.Properties, dm.Fields)
}
func (dm *DocumentMapping) DocumentMappingForPath(path string) *DocumentMapping {
pathElements := decodePath(path) pathElements := decodePath(path)
current := dm current := dm
for _, pathElement := range pathElements { for _, pathElement := range pathElements {

6
mapping_field.go
View File

@ -10,8 +10,6 @@
package bleve package bleve
import ( import (
"fmt"
"github.com/blevesearch/bleve/document" "github.com/blevesearch/bleve/document"
) )
@ -51,7 +49,3 @@ func (fm *FieldMapping) Options() document.IndexingOptions {
} }
return rv return rv
} }
func (fm *FieldMapping) GoString() string {
return fmt.Sprintf("&bleve.FieldMapping{Name:%s, Type:%s, Analyzer:%s, Store:%t, Index:%t}", *fm.Name, *fm.Type, *fm.Analyzer, *fm.Store, *fm.Index)
}

12
mapping_index.go
View File

@ -70,12 +70,12 @@ func (im *IndexMapping) validate() error {
if err != nil { if err != nil {
return err return err
} }
err = im.DefaultMapping.Validate(im.cache) err = im.DefaultMapping.validate(im.cache)
if err != nil { if err != nil {
return err return err
} }
for _, docMapping := range im.TypeMapping { for _, docMapping := range im.TypeMapping {
err = docMapping.Validate(im.cache) err = docMapping.validate(im.cache)
if err != nil { if err != nil {
return err return err
} }
@ -199,7 +199,7 @@ func (im *IndexMapping) mapDocument(doc *document.Document, data interface{}) er
im.walkDocument(data, []string{}, []uint64{}, walkContext) im.walkDocument(data, []string{}, []uint64{}, walkContext)
// see if the _all field was disabled // see if the _all field was disabled
allMapping := docMapping.DocumentMappingForPath("_all") allMapping := docMapping.documentMappingForPath("_all")
if allMapping == nil || (allMapping.Enabled != false) { if allMapping == nil || (allMapping.Enabled != false) {
field := document.NewCompositeFieldWithIndexingOptions("_all", true, []string{}, walkContext.excludedFromAll, document.INDEX_FIELD|document.INCLUDE_TERM_VECTORS) field := document.NewCompositeFieldWithIndexingOptions("_all", true, []string{}, walkContext.excludedFromAll, document.INDEX_FIELD|document.INCLUDE_TERM_VECTORS)
doc.AddField(field) doc.AddField(field)
@ -270,7 +270,7 @@ func (im *IndexMapping) walkDocument(data interface{}, path []string, indexes []
func (im *IndexMapping) processProperty(property interface{}, path []string, indexes []uint64, context *walkContext) { func (im *IndexMapping) processProperty(property interface{}, path []string, indexes []uint64, context *walkContext) {
pathString := encodePath(path) pathString := encodePath(path)
// look to see if there is a mapping for this field // look to see if there is a mapping for this field
subDocMapping := context.dm.DocumentMappingForPath(pathString) subDocMapping := context.dm.documentMappingForPath(pathString)
// check tos see if we even need to do further processing // check tos see if we even need to do further processing
if subDocMapping != nil && !subDocMapping.Enabled { if subDocMapping != nil && !subDocMapping.Enabled {
@ -403,7 +403,7 @@ func (im *IndexMapping) analyzerNameForPath(path string) string {
// first we look for explicit mapping on the field // first we look for explicit mapping on the field
for _, docMapping := range im.TypeMapping { for _, docMapping := range im.TypeMapping {
pathMapping := docMapping.DocumentMappingForPath(path) pathMapping := docMapping.documentMappingForPath(path)
if pathMapping != nil { if pathMapping != nil {
if len(pathMapping.Fields) > 0 { if len(pathMapping.Fields) > 0 {
if pathMapping.Fields[0].Analyzer != nil { if pathMapping.Fields[0].Analyzer != nil {
@ -447,7 +447,7 @@ func (im *IndexMapping) datetimeParserNameForPath(path string) string {
// first we look for explicit mapping on the field // first we look for explicit mapping on the field
for _, docMapping := range im.TypeMapping { for _, docMapping := range im.TypeMapping {
pathMapping := docMapping.DocumentMappingForPath(path) pathMapping := docMapping.documentMappingForPath(path)
if pathMapping != nil { if pathMapping != nil {
if len(pathMapping.Fields) > 0 { if len(pathMapping.Fields) > 0 {
if pathMapping.Fields[0].Analyzer != nil { if pathMapping.Fields[0].Analyzer != nil {