fix sites validation bug

staylorofford · Mar 12, 2018 · 6579180 · 6579180
1 parent 4d8fcce
commit 6579180
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/cmd/fits-api/routes_test.go b/cmd/fits-api/routes_test.go
@@ -70,6 +70,7 @@ var routes = wt.Requests{
 	{ID: wt.L(), Accept: svg, Content: svg, URL: "/plot?typeID=t1&sites=TEST1,TEST2&days=4000"},
 	{ID: wt.L(), Accept: svg, Content: svg, URL: "/plot?typeID=t1&sites=TEST1,TEST2&days=4000&start=2010-11-24T00:00:00Z"},
 	{ID: wt.L(), Accept: svg, Content: svg, URL: "/plot?typeID=t1&sites=TEST1,TEST2&start=2010-11-24T00:00:00Z"},
+	{ID: wt.L(), Accept: svg, Content: svg, URL: "/plot?typeID=t1&sites=T1.TEST1,T1.TEST2&start=2010-11-24T00:00:00Z"},
 
 	{ID: wt.L(), Accept: svg, Content: svg, URL: "/spark?typeID=t1&siteID=TEST1"},
 	{ID: wt.L(), Accept: svg, Content: svg, URL: "/spark?typeID=t1&siteID=TEST1&days=12"},

diff --git a/internal/valid/valid.go b/internal/valid/valid.go
@@ -15,7 +15,7 @@ import (
 //within e.g., POLYGON((177.18+-37.52,177.19+-37.52,177.20+-37.53,177.18+-37.52))
 
 var (
-	textRE, textErr     = regexp.Compile(`^[0-9a-zA-Z\-\,]+$`)
+	textRE, textErr     = regexp.Compile(`^[0-9a-zA-Z\-\,\.]+$`)
 	srsRE, srsErr       = regexp.Compile(`^EPSG:[0-9]+$`)
 	withinRE, withinErr = regexp.Compile(`^POLYGON\(\([0-9\-\, \.\+]+\)\)$`)
 	widthRE, widthErr   = regexp.Compile(`^[0-9]+$`)

diff --git a/internal/valid/valid_test.go b/internal/valid/valid_test.go
@@ -39,6 +39,7 @@ func TestQuery(t *testing.T) {
 		{k: "within", v: "POLYGON((177.18 -37.52,177.19 -37.52,177.20 -37.53,177.18 -37.52))"},
 
 		{k: "sites", v: "GISB,CHTI,RAUL"},
+		{k: "sites", v: "VO.GISB,VO.CHTI,RAUL"},
 
 		{k: "width", v: "500"},