From c83453f363bb17def06b1fba9ddc27a14f91c72b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ortega?= <saulortega@users.noreply.github.com>
Date: Thu, 1 Mar 2018 14:45:09 -0500
Subject: [PATCH] Update and rename datatables.go to filter.go

---
 datatables.go => filter.go | 47 ++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 22 deletions(-)
 rename datatables.go => filter.go (84%)

diff --git a/datatables.go b/filter.go
similarity index 84%
rename from datatables.go
rename to filter.go
index c467c8f..ce52262 100644
--- a/datatables.go
+++ b/filter.go
@@ -49,6 +49,10 @@ func MustParse(r *http.Request) Filter {
 	return f
 }
 
+func (f *Filter) PrepareResponse() Response {
+	return Response{Draw: f.Draw}
+}
+
 func parse(r *http.Request) (Filter, error) {
 	var E error
 	var F = Filter{
@@ -60,6 +64,27 @@ func parse(r *http.Request) (Filter, error) {
 	var mapColsTmp = make(map[int]map[string]string)
 	var mapOrdsTmp = make(map[int]map[string]string)
 
+	F.Draw, E = ptoi(r, "draw")
+	if E != nil {
+		errores = append(errores, E.Error())
+	}
+	F.Start, E = ptoi(r, "start")
+	if E != nil {
+		errores = append(errores, E.Error())
+	}
+	F.Length, E = ptoi(r, "length")
+	if E != nil {
+		errores = append(errores, E.Error())
+	}
+	F.SearchValue, E = ptos(r, "search[value]")
+	if E != nil {
+		errores = append(errores, E.Error())
+	}
+	F.SearchRegex, E = ptob(r, "search[regex]")
+	if E != nil {
+		errores = append(errores, E.Error())
+	}
+
 	for ll, v := range r.Form {
 		if regexp.MustCompile(`^columns\[`).MatchString(ll) {
 			a := regexp.MustCompile(`^columns\[([0-9]+)\]\[`).ReplaceAllString(ll, "$1-")
@@ -90,28 +115,6 @@ func parse(r *http.Request) (Filter, error) {
 				mapOrdsTmp[i] = make(map[string]string)
 			}
 			mapOrdsTmp[i][p[1]] = v[0]
-		} else if ll == "search[value]" {
-			F.SearchValue = strings.TrimSpace(v[0])
-		} else if ll == "search[regex]" {
-			F.SearchRegex, E = strconv.ParseBool(v[0])
-			if E != nil {
-				errores = append(errores, E.Error())
-			}
-		} else if ll == "start" {
-			F.Start, E = strconv.Atoi(v[0])
-			if E != nil {
-				errores = append(errores, E.Error())
-			}
-		} else if ll == "length" {
-			F.Length, E = strconv.Atoi(v[0])
-			if E != nil {
-				errores = append(errores, E.Error())
-			}
-		} else if ll == "draw" {
-			F.Draw, E = strconv.Atoi(v[0])
-			if E != nil {
-				errores = append(errores, E.Error())
-			}
 		}
 	}