lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-22 12:00:55 +00:00
Code Issues Releases Activity

beego: fix the addTree

Browse Source
This commit is contained in:
astaxie 2014-08-12 00:15:39 +08:00
parent 52fdfc5665
commit f201859fa7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tree.go
View File

@ -108,9 +108,13 @@ func (t *Tree) addtree(segments []string, tree *Tree, wildcards []string, reg st
if w == "." || w == ":" {
continue
}
if w == ":splat" {
regexpStr = "/(.+)" + regexpStr
} else {
regexpStr = "/([^/]+)" + regexpStr
}
}
}
reg = reg + regexpStr
t.wildcard.addtree(segments[1:], tree, append(wildcards, params...), reg)
} else {
@ -145,20 +149,16 @@ func filterTreeWithPrefix(t *Tree, wildcards []string, reg string) {
}
} else {
if l.regexps != nil {
filterCards := []string{}
for _, v := range l.wildcards {
if v == ":" || v == "." {
continue
}
filterCards = append(filterCards, v)
}
l.wildcards = filterCards
for _, w := range wildcards {
if w == "." || w == ":" {
continue
}
if w == ":splat" {
reg = "(.+)/" + reg
} else {
reg = "([^/]+)/" + reg
}
}
l.regexps = regexp.MustCompile("^" + reg + strings.Trim(l.regexps.String(), "^$") + "$")
}
}