1 files changed, 2 insertions, 30 deletions

diff --git a/modules/grils/grils.go b/modules/grils/grils.go
index 0ba4c61..0fac5df 100644
--- a/modules/grils/grils.go
+++ b/modules/grils/grils.go
@@ -4,9 +4,7 @@ import (
         "fmt"
         "log"
         "net/http"
-        "regexp"
         "strconv"
-        "strings"
         "time"
 
         "fagott.pw/charakterin"
@@ -20,20 +18,6 @@ import (
         "github.com/julienschmidt/httprouter"
 )
 
-var (
-        pgArrayReg = regexp.MustCompile(`(((?P<value>(([^",\\{}\s(NULL)])+|"([^"\\]|\\"|\\\\)*")))(,)?)`)
-        pgValueIdx int
-)
-
-func findIdx() {
-        for i, subexp := range pgArrayReg.SubexpNames() {
-                if subexp == "value" {
-                        pgValueIdx = i
-                        break
-                }
-        }
-}
-
 type GrilsModule struct {
         g *grilist.Grilist
         c *cache.Cache
@@ -44,7 +28,6 @@ func (m *GrilsModule) Name() string {
 }
 
 func (m *GrilsModule) Init(g *grilist.Grilist) {
-        findIdx()
         m.g = g
         m.g.Router.GET("/gril/:id", m.viewGril)
         m.g.Router.GET("/gril/:id/*rest", m.viewGril)
@@ -77,8 +60,8 @@ func (m *GrilsModule) getGrils(whereClause string, params ...interface{}) ([]*mo
                         gril.KanjiName = *kanjiName
                 }
 
-                gril.Tags = pgArray(tags)
-                gril.OtherNames = pgArray(otherNames)
+                gril.Tags = util.PGArray(tags)
+                gril.OtherNames = util.PGArray(otherNames)
 
                 m.c.Insert(gril.ID, gril)
 
@@ -285,17 +268,6 @@ func (m *GrilsModule) viewGril(w http.ResponseWriter, r *http.Request, p httprou
         })
 }
 
-func pgArray(array []byte) []string {
-        var results []string
-        matches := pgArrayReg.FindAllStringSubmatch(string(array), -1)
-        for _, match := range matches {
-                s := match[pgValueIdx]
-                s = strings.Trim(s, "\"")
-                results = append(results, s)
-        }
-        return results
-}
-
 func New() *GrilsModule {
         return &GrilsModule{}
 }