Fixes Content.Negotiate API

This commit is contained in:
Manu Mtz-Almeida
2014-08-31 18:28:18 +02:00
parent ffea7e88a2
commit 275bdc194e
2 changed files with 22 additions and 36 deletions

View File

@ -46,16 +46,14 @@ func filterFlags(content string) string {
return content
}
func readData(key string, config map[string]interface{}) interface{} {
data, ok := config[key]
if ok {
return data
func chooseData(custom, wildcard interface{}) interface{} {
if custom == nil {
if wildcard == nil {
panic("negotiation config is invalid")
}
return wildcard
}
data, ok = config["*.data"]
if !ok {
panic("negotiation config is invalid")
}
return data
return custom
}
func parseAccept(accept string) []string {