paulbsd/qrz
1
0
Fork 0
Code Issues Pull Requests Releases 14 Wiki Activity

fix in qrzws
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Paul 2020-06-02 02:21:33 +02:00
parent bf1a033725
commit c23395555d
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/qrzws/main.go
View File

@ -120,12 +120,7 @@ func BuildQuery(config config.Config, qrzdt QrzDatatableInput) (rows *sqlx.Rows,
} }
// BuildQueryCountFiltered builds query for counting filtered // BuildQueryCountFiltered builds query for counting filtered
<<<<<<< Updated upstream
func BuildQueryCountFiltered(config config.Config, qrzdt QrzDatatableInput) (cnt int, err error) { func BuildQueryCountFiltered(config config.Config, qrzdt QrzDatatableInput) (cnt int, err error) {
searchstatement, err := SetSearchStatement(config, qrzdt)
err = config.Db.Get(&cnt, fmt.Sprintf("SELECT COUNT(*) FROM %s WHERE %s;", config.DbTable, searchstatement))
=======
func BuildQueryCountFiltered(config config.Config, qrzdt DatatableInput) (cnt int, err error) {
searchstatement, err := SetSearchLikeStatement(config, qrzdt) searchstatement, err := SetSearchLikeStatement(config, qrzdt)
query := ` query := `
@ -134,22 +129,16 @@ func BuildQueryCountFiltered(config config.Config, qrzdt DatatableInput) (cnt in
WHERE %s;` WHERE %s;`
err = config.Db.Get(&cnt, fmt.Sprintf(query, config.DbTable, searchstatement)) err = config.Db.Get(&cnt, fmt.Sprintf(query, config.DbTable, searchstatement))
>>>>>>> Stashed changes
return return
} }
// BuildQueryCountTotal builds query for counting totals // BuildQueryCountTotal builds query for counting totals
<<<<<<< Updated upstream
func BuildQueryCountTotal(config config.Config, qrzdt QrzDatatableInput) (cnt int, err error) { func BuildQueryCountTotal(config config.Config, qrzdt QrzDatatableInput) (cnt int, err error) {
err = config.Db.Get(&cnt, fmt.Sprintf("SELECT COUNT(*) FROM %s;", config.DbTable))
=======
func BuildQueryCountTotal(config config.Config, qrzdt DatatableInput) (cnt int, err error) {
query := ` query := `
SELECT COUNT(*) FROM %s; SELECT COUNT(*) FROM %s;
` `
err = config.Db.Get(&cnt, fmt.Sprintf(query, config.DbTable)) err = config.Db.Get(&cnt, fmt.Sprintf(query, config.DbTable))
>>>>>>> Stashed changes
return return
} }
@ -210,13 +199,8 @@ func SetLimitStatement(config config.Config, qrzdt QrzDatatableInput) (limitstmt
return return
} }
<<<<<<< Updated upstream
// SetSearchStatement build the where clause in sql statement
func SetSearchStatement(config config.Config, qrzdt QrzDatatableInput) (searchstmt string, err error) {
=======
// SetSearchLikeStatement build the where clause in sql statement // SetSearchLikeStatement build the where clause in sql statement
func SetSearchLikeStatement(config config.Config, qrzdt DatatableInput) (searchstmt string, err error) { func SetSearchLikeStatement(config config.Config, qrzdt QrzDatatableInput) (searchstmt string, err error) {
>>>>>>> Stashed changes
var searchstmtslice []string var searchstmtslice []string
if len(qrzdt.Columns) > 0 { if len(qrzdt.Columns) > 0 {
for id, i := range qrzdt.Columns { for id, i := range qrzdt.Columns {
@ -234,7 +218,7 @@ func SetSearchLikeStatement(config config.Config, qrzdt DatatableInput) (searchs
} }
// SetSearchFTSStatement build the where clause in sql statement // SetSearchFTSStatement build the where clause in sql statement
func SetSearchFTSStatement(config config.Config, qrzdt DatatableInput) (searchstmt string, err error) { func SetSearchFTSStatement(config config.Config, qrzdt QrzDatatableInput) (searchstmt string, err error) {
if len(qrzdt.Columns) > 0 { if len(qrzdt.Columns) > 0 {
searchstmt = fmt.Sprintf("fts @@ plainto_tsquery('%s')", qrzdt.Search.Value) searchstmt = fmt.Sprintf("fts @@ plainto_tsquery('%s')", qrzdt.Search.Value)
} else { } else {

8
src/qrzws/qrzws-packr.go Normal file
View File

@ -0,0 +1,8 @@
// +build !skippackr
// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
// You can use the "packr clean" command to clean up this,
// and any other packr generated files.
package qrzws
import _ "git.paulbsd.com/paulbsd/qrz/packrd"