Container.Get(): clean-up, improvements
This commit is contained in:
parent
9081f93548
commit
4df0a39bf0
1 changed files with 9 additions and 17 deletions
|
@ -61,10 +61,8 @@ func (tr *Track) ScanP(rows *sql.Rows) error {
|
|||
var hv string
|
||||
d = append(d, &hv)
|
||||
}
|
||||
var ts string
|
||||
d = append(d, &ts)
|
||||
var rd string
|
||||
d = append(d, &rd)
|
||||
var ts, rd string
|
||||
d = append(d, &ts, &rd, &tr.trackId)
|
||||
err := rows.Scan(d...)
|
||||
for i, k := range tr.container.HeadFields {
|
||||
tr.Head[k] = *d[i].(*string)
|
||||
|
@ -74,7 +72,6 @@ func (tr *Track) ScanP(rows *sql.Rows) error {
|
|||
if err != nil {
|
||||
log.Error(err).Msg("storage.tracking.ScanP")
|
||||
}
|
||||
fmt.Printf("%+v, %v, %v\n", tr.Head, tr.TimeStamp, tr.Data)
|
||||
return err
|
||||
}
|
||||
|
||||
|
@ -98,27 +95,22 @@ func Tracks(db *sql.Storage) *Container {
|
|||
|
||||
func (cont *Container) Get(id lib.Ident) *Track {
|
||||
db := cont.Storage
|
||||
var trs []*Track
|
||||
processTracks := func(r *sql.Rows) error {
|
||||
var tr *Track
|
||||
proc := func(r *sql.Rows) error {
|
||||
tr := cont.ItemFactory(cont)
|
||||
err := tr.ScanP(r)
|
||||
trs = append(trs, tr)
|
||||
return err
|
||||
return tr.ScanP(r)
|
||||
}
|
||||
qu := lib.Map{
|
||||
"schema": db.Schema,
|
||||
"tablename": cont.TableName,
|
||||
"scols": append(cont.HeadFields, "timestamp", "data"),
|
||||
"scols": append(cont.HeadFields, "timestamp", "data", "trackid"),
|
||||
"qucols": lib.StrSlice{"trackid"},
|
||||
}
|
||||
sql := storage.BuildSql(SqlSelect, qu)
|
||||
print(sql)
|
||||
//tr := cont.ItemFactory(cont)
|
||||
db.Query(processTracks, sql, id)
|
||||
if len(trs) > 0 {
|
||||
return trs[0]
|
||||
}
|
||||
return nil
|
||||
db.Query(proc, sql, id)
|
||||
fmt.Printf("%+v\n", *tr)
|
||||
return tr
|
||||
}
|
||||
|
||||
func (cont *Container) Query(headValues lib.StrSlice) *Track {
|
||||
|
|
Loading…
Add table
Reference in a new issue