diff --git a/tree.go b/tree.go index 25b78e50..da7690ea 100644 --- a/tree.go +++ b/tree.go @@ -19,6 +19,7 @@ import ( "regexp" "strings" + "github.com/Maxgis/tree" "github.com/astaxie/beego/context" "github.com/astaxie/beego/utils" ) @@ -467,7 +468,7 @@ func splitPath(key string) []string { // ":name:string" -> true, [:name], ([\w]+) // ":id([0-9]+)" -> true, [:id], ([0-9]+) // ":id([0-9]+)_:name" -> true, [:id :name], ([0-9]+)_(.+) -// "cms_:id_:page.html" -> true, [:id_ :page], cms_(.+)(.+).html +// "cms_:id_:page.html" -> true, [:id :page], cms_(.+)_(.+).html // "cms_:id(.+)_:page.html" -> true, [:id :page], cms_(.+)_(.+).html // "*" -> true, [:splat], "" // "*.*" -> true,[. :path :ext], "" . meaning separator @@ -487,7 +488,7 @@ func splitSegment(key string) (bool, []string, string) { var expt []rune var skipnum int params := []string{} - reg := regexp.MustCompile(`[a-zA-Z0-9_]+`) + reg := regexp.MustCompile(`[a-zA-Z0-9]+`) for i, v := range key { if skipnum > 0 { skipnum-- @@ -574,6 +575,7 @@ func splitSegment(key string) (bool, []string, string) { } params = append(params, ":"+string(param)) } + tree.Print(string(out)) return true, params, string(out) } return false, nil, "" diff --git a/tree_test.go b/tree_test.go index 81ff7edd..df7242cb 100644 --- a/tree_test.go +++ b/tree_test.go @@ -74,6 +74,8 @@ func init() { routers = append(routers, testinfo{"/v1/:v(.+)_cms/ttt_:id(.+)_:page(.+).html", "/v1/2_cms/ttt_123_1.html", map[string]string{":v": "2", ":id": "123", ":page": "1"}}) routers = append(routers, testinfo{"/api/projects/:pid/members/?:mid", "/api/projects/1/members", map[string]string{":pid": "1"}}) routers = append(routers, testinfo{"/api/projects/:pid/members/?:mid", "/api/projects/1/members/2", map[string]string{":pid": "1", ":mid": "2"}}) + routers = append(routers, testinfo{"/page/:id_:page", "/page/12_33", map[string]string{":id": "12", ":page": "33"}}) + routers = append(routers, testinfo{"/page/:id_:page.html", "/page/12_33.html", map[string]string{":id": "12", ":page": "33"}}) } func TestTreeRouters(t *testing.T) {