Merge pull request #2 from whosonfirst/parse

Add `?parse-uri= flag` to reader URI to enable default READFUNC

README.md

@@ -27,6 +27,9 @@ func main() {
 	
 	ctx := context.Background()
 
+	// You can also enable this specific "read function" by passing
+	// ?parse-uri=true to the reader URI below.
+	
 	sql_reader.URI_READFUNC = func(uri string) (string, error) {
 		id, _ := wof_uri.IdFromPath(uri)		
 		str_id := strconv.FormatInt(id, 10)

go.mod

@@ -5,10 +5,12 @@ go 1.23.3
 require (
 	github.com/whosonfirst/go-ioutil v1.0.2
 	github.com/whosonfirst/go-reader v1.0.2
+	github.com/whosonfirst/go-whosonfirst-uri v1.3.0
 )
 
 require (
 	github.com/aaronland/go-roster v1.0.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/whosonfirst/go-whosonfirst-sources v0.1.0 // indirect
 )

go.sum

@@ -8,3 +8,7 @@ github.com/whosonfirst/go-ioutil v1.0.2 h1:+GJPfa42OFn5A+5yJSc5jQTQIkNV3/MhYyg4p
 github.com/whosonfirst/go-ioutil v1.0.2/go.mod h1:2dS1vWdAIkiHDvDF8fYyjv6k2NISmwaIjJJeEDBEdvg=
 github.com/whosonfirst/go-reader v1.0.2 h1:eccnKKSMGR+X1SJyHUZN0/7qE7VbFQULqSVQU0Su3xs=
 github.com/whosonfirst/go-reader v1.0.2/go.mod h1:2w9l/QusYZSiGuEof3RwCHUFnM492SSOF2H7UxS4YIE=
+github.com/whosonfirst/go-whosonfirst-sources v0.1.0 h1:JuKLa6KWke22jBfJ1pM9WQHoz1/3pbDv2C+aR+THPPQ=
+github.com/whosonfirst/go-whosonfirst-sources v0.1.0/go.mod h1:EUMHyGzUmqPPxlMmOp+28BFeoBdxxE0HCKRd67lkqGM=
+github.com/whosonfirst/go-whosonfirst-uri v1.3.0 h1:LYOVLqP9rWQxauYVkdw65j5LZxEi8OK0GHh/qCEpX4g=
+github.com/whosonfirst/go-whosonfirst-uri v1.3.0/go.mod h1:CuVygTCUpMG945MMvqHyqxvc/L5YkDaMrrVpRFr7ZxY=

sql.go

@@ -3,15 +3,16 @@ package reader
 import (
 	"context"
 	"database/sql"
-	"errors"
 	"fmt"
-	"github.com/whosonfirst/go-ioutil"
-	wof_reader "github.com/whosonfirst/go-reader"
 	"io"
-	_ "log"
 	"net/url"
 	"regexp"
+	"strconv"
 	"strings"
+
+	"github.com/whosonfirst/go-ioutil"
+	wof_reader "github.com/whosonfirst/go-reader"
+	wof_uri "github.com/whosonfirst/go-whosonfirst-uri"
 )
 
 type readFunc func(string) (string, error)
@@ -66,7 +67,7 @@ func NewSQLReader(ctx context.Context, uri string) (wof_reader.Reader, error) {
 	parts := strings.Split(path, "/")
 
 	if len(parts) != 3 {
-		return nil, errors.New("Invalid path")
+		return nil, fmt.Errorf("Invalid path")
 	}
 
 	table := parts[0]
@@ -76,7 +77,7 @@ func NewSQLReader(ctx context.Context, uri string) (wof_reader.Reader, error) {
 	dsn := q.Get("dsn")
 
 	if dsn == "" {
-		return nil, errors.New("Missing dsn parameter")
+		return nil, fmt.Errorf("Missing dsn parameter")
 	}
 
 	conn, err := sql.Open(driver, dsn)
@@ -86,15 +87,38 @@ func NewSQLReader(ctx context.Context, uri string) (wof_reader.Reader, error) {
 	}
 
 	if !VALID_TABLE.MatchString(table) {
-		return nil, errors.New("Invalid table")
+		return nil, fmt.Errorf("Invalid table")
 	}
 
 	if !VALID_KEY.MatchString(key) {
-		return nil, errors.New("Invalid key")
+		return nil, fmt.Errorf("Invalid key")
 	}
 
 	if !VALID_VALUE.MatchString(value) {
-		return nil, errors.New("Invalid value")
+		return nil, fmt.Errorf("Invalid value")
+	}
+
+	if q.Has("parse-uri") {
+
+		v, err := strconv.ParseBool(q.Get("parse-uri"))
+
+		if err != nil {
+			return nil, fmt.Errorf("Failed to parse ?parse-uri= parameter, %w", err)
+		}
+
+		if v {
+
+			URI_READFUNC = func(k string) (string, error) {
+
+				id, _, err := wof_uri.ParseURI(k)
+
+				if err != nil {
+					return "", err
+				}
+
+				return strconv.FormatInt(id, 10), nil
+			}
+		}
 	}
 
 	r := &SQLReader{