merge with master

This commit is contained in:
Barak Michener 2014-08-13 23:03:07 -04:00
commit fe0569c9d4
10 changed files with 201 additions and 165 deletions

View file

@ -218,6 +218,9 @@ func decompressAndLoad(qw graph.QuadWriter, cfg *config.Config, path, typ string
if path == "" {
path = cfg.DatabasePath
}
if path == "" {
return nil
}
u, err := url.Parse(path)
if err != nil || u.Scheme == "file" || u.Scheme == "" {
// Don't alter relative URL path or non-URL path parameter.