Merge pull request #30 from knadh/29-search-by-just-tags

Allow searching by just tags without having to provide a search query

cmd/dictpress/handlers.go

@@ -194,10 +194,6 @@ func getGlossaryWords(lang, initial string, pg paginator.Set, app *App) (*glossa
 // validateSearchQuery does basic validation and sanity checks
 // on data.Query (useful for params coming from the outside world).
 func validateSearchQuery(q data.Query, langs data.LangMap) error {
-	if q.Query == "" {
-		return errors.New("empty search query")
-	}
-
 	for _, t := range q.Types {
 		if _, ok := langs[q.FromLang].Types[t]; !ok {
 			return fmt.Errorf("unknown type %s", t)

cmd/dictpress/init.go

@@ -163,6 +163,7 @@ func initHTTPServer(app *App, ko *koanf.Koanf) *echo.Echo {
 	}
 
 	// Admin handlers and APIs.
+	a.GET("/api/entries/:fromLang/:toLang", handleSearch)
 	a.GET("/api/entries/:fromLang/:toLang/:q", handleSearch)
 	a.GET("/admin/static/*", echo.WrapHandler(app.fs.FileServer()))
 	a.GET("/admin", adminPage("index"))

queries.sql

@@ -15,8 +15,10 @@ directMatch AS (
         ($4 = '' OR lang=$4)
         AND (COALESCE(CARDINALITY($5::TEXT[]), 0) = 0 OR tags && $5)
         AND (
-            LOWER(SUBSTRING(content, 0, 50))=LOWER(SUBSTRING($1, 0, 50))
-            OR tokens @@ PLAINTO_TSQUERY('simple', $1)
+            CASE WHEN $1 = '' THEN TRUE ELSE
+                LOWER(SUBSTRING(content, 0, 50))=LOWER(SUBSTRING($1, 0, 50))
+                OR tokens @@ PLAINTO_TSQUERY('simple', $1)
+            END
         )
         AND (CASE WHEN $6 != '' THEN status = $6::entry_status ELSE TRUE END)
 ),