Merge URL and Domain filter and make it a "contains" filter
This commit is contained in:
parent
2feb27e5c4
commit
563129e18d
24
database.go
24
database.go
|
@ -75,12 +75,11 @@ const (
|
||||||
)
|
)
|
||||||
|
|
||||||
type ViewsRequest struct {
|
type ViewsRequest struct {
|
||||||
view View
|
view View
|
||||||
from string
|
from string
|
||||||
to string
|
to string
|
||||||
url string
|
url string
|
||||||
domain string
|
ref string
|
||||||
ref string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type RequestResultRow struct {
|
type RequestResultRow struct {
|
||||||
|
@ -157,7 +156,6 @@ func (request *ViewsRequest) buildFilter() (filters string, parameters []sql.Nam
|
||||||
for _, filter := range []string{
|
for _, filter := range []string{
|
||||||
request.buildDateTimeFilter(¶meters),
|
request.buildDateTimeFilter(¶meters),
|
||||||
request.buildUrlFilter(¶meters),
|
request.buildUrlFilter(¶meters),
|
||||||
request.buildDomainFilter(¶meters),
|
|
||||||
request.buildRefFilter(¶meters),
|
request.buildRefFilter(¶meters),
|
||||||
} {
|
} {
|
||||||
if len(filter) > 0 {
|
if len(filter) > 0 {
|
||||||
|
@ -187,16 +185,8 @@ func (request *ViewsRequest) buildDateTimeFilter(namedArg *[]sql.NamedArg) (date
|
||||||
|
|
||||||
func (request *ViewsRequest) buildUrlFilter(namedArg *[]sql.NamedArg) (urlFilter string) {
|
func (request *ViewsRequest) buildUrlFilter(namedArg *[]sql.NamedArg) (urlFilter string) {
|
||||||
if len(request.url) > 0 {
|
if len(request.url) > 0 {
|
||||||
*namedArg = append(*namedArg, sql.Named("url", request.url))
|
*namedArg = append(*namedArg, sql.Named("url", "%"+request.url+"%"))
|
||||||
urlFilter = "url = :url"
|
urlFilter = "url like :url"
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
func (request *ViewsRequest) buildDomainFilter(namedArg *[]sql.NamedArg) (domainFilter string) {
|
|
||||||
if len(request.domain) > 0 {
|
|
||||||
*namedArg = append(*namedArg, sql.Named("domain", request.domain+"%"))
|
|
||||||
domainFilter = "url like :domain"
|
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
1
main.go
1
main.go
|
@ -114,7 +114,6 @@ func requestStats(w http.ResponseWriter, r *http.Request) {
|
||||||
from: queries.Get("from"),
|
from: queries.Get("from"),
|
||||||
to: queries.Get("to"),
|
to: queries.Get("to"),
|
||||||
url: queries.Get("url"),
|
url: queries.Get("url"),
|
||||||
domain: queries.Get("domain"),
|
|
||||||
ref: queries.Get("ref"),
|
ref: queries.Get("ref"),
|
||||||
})
|
})
|
||||||
if e != nil {
|
if e != nil {
|
||||||
|
|
Reference in New Issue