simple pagination für tag-ansicht. außerdem wird nun ein leeres array bei grils.FromIDs zurückgegeben anstatt lustige sql fehler zu provozieren, wenn der ids array leer ist.

2 files changed, 24 insertions, 4 deletions

diff --git a/modules/grils/grils.go b/modules/grils/grils.go
index 0df93a0..5d548e6 100644
--- a/modules/grils/grils.go
+++ b/modules/grils/grils.go
@@ -153,6 +153,10 @@ func (m *GrilsModule) FromID(id int) (*Gril, error) {
 }
 
 func (m *GrilsModule) FromIDs(ids []int) ([]*Gril, error) {
+        if len(ids) == 0 {
+                return make([]*Gril, 0), nil
+        }
+
         idList := "("
         first := true
         for _, v := range ids {
diff --git a/modules/tags/tags.go b/modules/tags/tags.go
index 9412e24..aca1b44 100644
--- a/modules/tags/tags.go
+++ b/modules/tags/tags.go
@@ -3,6 +3,7 @@ package tags
 import (
         "log"
         "net/http"
+        "strconv"
 
         "fagott.pw/charakterin"
         "fagott.pw/grilist/frontend"
@@ -33,6 +34,7 @@ func (m *Module) Init(g *grilist.Grilist) {
         }
         m.grils = gm.(*grils.GrilsModule)
         m.g.Router.GET("/tag/:tag", m.viewTag)
+        m.g.Router.GET("/tag/:tag/:page", m.viewTagPage)
 }
 
 func (m *Module) Interface() interface{} {
@@ -44,21 +46,35 @@ func (m *Module) ProvideDashboardData(user *charakterin.User) []grilist.Dashboar
 }
 
 func (m *Module) viewTag(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+        p = append(p, httprouter.Param{
+                Key:   "page",
+                Value: "1",
+        })
+        m.viewTagPage(w, r, p)
+}
+
+func (m *Module) viewTagPage(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
         user, _ := m.g.Charakterin.GetUserFromRequest(r)
         tag := p.ByName("tag")
         var tagID int
         row := m.g.DB.QueryRow("SELECT id FROM grilist.tags WHERE name = $1;", tag)
         if err := row.Scan(&tagID); err != nil {
-                log.Println(err)
+                log.Println("error getting tag id", err)
                 http.Redirect(w, r, "/", 302)
                 return
         }
+
+        pageNumber, err := strconv.Atoi(p.ByName("page"))
+        if err != nil || pageNumber < 1 {
+                pageNumber = 1
+        }
+
         idList := make([]int, 0)
         rows, err := m.g.DB.Query(
-                "SELECT gril_id FROM grilist.grils_tags WHERE tag_id = $1",
-                tagID)
+                "SELECT gril_id FROM grilist.grils_tags WHERE tag_id = $1 LIMIT 12 OFFSET $2",
+                tagID, (pageNumber-1)*12)
         if err != nil {
-                log.Println(err)
+                log.Println("error getting idList", err)
                 http.Redirect(w, r, "/", 302)
                 return
         }