gibheer/bleve
0
0
Fork 0
Code

made more constants private

Browse Source
This commit is contained in:
Marty Schoch 2014-08-29 14:43:06 -04:00
parent 5c4d5e230f
commit 635ae2b401
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
mapping_index.go
View File

@ -25,12 +25,12 @@ var tRUE = true
var fALSE = false
const DefaultTypeField = "_type"
const DefaultType = "_default"
const DefaultField = "_all"
const DefaultAnalyzer = "standard"
const DefaultDateTimeParser = "dateTimeOptional"
const DefaultByteArrayConverter = "json"
const defaultTypeField = "_type"
const defaultType = "_default"
const defaultField = "_all"
const defaultAnalyzer = "standard"
const defaultDateTimeParser = "dateTimeOptional"
const defaultByteArrayConverter = "json"
type IndexMapping struct {
TypeMapping map[string]*DocumentMapping `json:"types,omitempty"`
@ -52,12 +52,12 @@ func NewIndexMapping() *IndexMapping {
return &IndexMapping{
TypeMapping: make(map[string]*DocumentMapping),
DefaultMapping: NewDocumentMapping(),
TypeField: DefaultTypeField,
DefaultType: DefaultType,
DefaultAnalyzer: DefaultAnalyzer,
DefaultDateTimeParser: DefaultDateTimeParser,
DefaultField: DefaultField,
ByteArrayConverter: DefaultByteArrayConverter,
TypeField: defaultTypeField,
DefaultType: defaultType,
DefaultAnalyzer: defaultAnalyzer,
DefaultDateTimeParser: defaultDateTimeParser,
DefaultField: defaultField,
ByteArrayConverter: defaultByteArrayConverter,
cache: registry.NewCache(),
}
}
@ -149,32 +149,32 @@ func (im *IndexMapping) UnmarshalJSON(data []byte) error {
im.cache = registry.NewCache()
im.TypeField = DefaultTypeField
im.TypeField = defaultTypeField
if tmp.TypeField != "" {
im.TypeField = tmp.TypeField
}
im.DefaultType = DefaultType
im.DefaultType = defaultType
if tmp.DefaultType != "" {
im.DefaultType = tmp.DefaultType
}
im.DefaultAnalyzer = DefaultAnalyzer
im.DefaultAnalyzer = defaultAnalyzer
if tmp.DefaultAnalyzer != "" {
im.DefaultAnalyzer = tmp.DefaultAnalyzer
}
im.DefaultDateTimeParser = DefaultDateTimeParser
im.DefaultDateTimeParser = defaultDateTimeParser
if tmp.DefaultDateTimeParser != "" {
im.DefaultDateTimeParser = tmp.DefaultDateTimeParser
}
im.DefaultField = DefaultField
im.DefaultField = defaultField
if tmp.DefaultField != "" {
im.DefaultField = tmp.DefaultField
}
im.ByteArrayConverter = DefaultByteArrayConverter
im.ByteArrayConverter = defaultByteArrayConverter
if tmp.ByteArrayConverter != "" {
im.ByteArrayConverter = tmp.ByteArrayConverter
}
@ -493,7 +493,7 @@ func getFieldName(pathString string, path []string, fieldMapping *FieldMapping)
if fieldMapping.Name != nil && *fieldMapping.Name != "" {
parentName := ""
if len(path) > 1 {
parentName = encodePath(path[:len(path)-1]) + PATH_SEPARATOR
parentName = encodePath(path[:len(path)-1]) + pATH_SEPARATOR
}
fieldName = parentName + *fieldMapping.Name
}

6
reflect.go
View File

@ -50,14 +50,14 @@ func lookupProptyPathPart(data interface{}, part string) interface{} {
return nil
}
const PATH_SEPARATOR = "."
const pATH_SEPARATOR = "."
func decodePath(path string) []string {
return strings.Split(path, PATH_SEPARATOR)
return strings.Split(path, pATH_SEPARATOR)
}
func encodePath(pathElements []string) string {
return strings.Join(pathElements, PATH_SEPARATOR)
return strings.Join(pathElements, pATH_SEPARATOR)
}
func mustString(data interface{}) (string, bool) {