|
@@ -145,7 +145,6 @@ func (s *SingleItem) nvNotIn(slice []ItemValue) bool {
|
|
func (s *SingleItem) inSlice(slice []ItemValue, v ItemValue) bool {
|
|
func (s *SingleItem) inSlice(slice []ItemValue, v ItemValue) bool {
|
|
for _, s2 := range slice {
|
|
for _, s2 := range slice {
|
|
s1 := s.transVar(s2)
|
|
s1 := s.transVar(s2)
|
|
- println(s1)
|
|
|
|
if s1 == v {
|
|
if s1 == v {
|
|
return true
|
|
return true
|
|
}
|
|
}
|
|
@@ -185,8 +184,6 @@ func (s *SingleItem) transVar(v ItemValue) ItemValue {
|
|
}
|
|
}
|
|
|
|
|
|
func (s *SingleItem) compare(r string, v string) bool {
|
|
func (s *SingleItem) compare(r string, v string) bool {
|
|
- println(r)
|
|
|
|
- println(v)
|
|
|
|
if strings.Index(r, "...") > -1 {
|
|
if strings.Index(r, "...") > -1 {
|
|
return s.compareRange(r, v)
|
|
return s.compareRange(r, v)
|
|
} else if strings.Index(r, " ") > 1 {
|
|
} else if strings.Index(r, " ") > 1 {
|
|
@@ -322,9 +319,6 @@ func (s *SingleItem) calc(v string) string {
|
|
}
|
|
}
|
|
|
|
|
|
func (s *SingleItem) compareLogic(r string, v string) bool {
|
|
func (s *SingleItem) compareLogic(r string, v string) bool {
|
|
- println(r)
|
|
|
|
- println(v)
|
|
|
|
-
|
|
|
|
rl := strings.Split(r, " ")
|
|
rl := strings.Split(r, " ")
|
|
if len(rl) != 2 {
|
|
if len(rl) != 2 {
|
|
return false
|
|
return false
|