uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-25 00:58:45 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix paginator conversion between CDR filters, paginator tests for both mysql and postgres

Browse Source
This commit is contained in:
DanB
2015-03-02 19:00:31 +01:00
parent d3b3794770
commit 4963c70b48
3 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
utils/apitpdata.go
View File

@@ -33,11 +33,11 @@ func (tpdi TPDistinctIds) String() string {
return strings.Join(tpdi, ",")
}
// To paginate stuff from stordb (e.g. ids)
// Paginate stuff around items returned
type Paginator struct {
Limit *int
Offset *int
SearchTerm string
Limit *int // Limit the number of items returned
Offset *int // Offset of the first item returned (eg: use Limit*Page in case of PerPage items)
SearchTerm string // Global matching pattern in items returned, partially used in some APIs
}
/*func (pag *Paginator) GetLimits() (low, high int) {
@@ -691,6 +691,7 @@ type AttrExpFileCdrs struct {
SkipErrors bool // Do not export errored CDRs
SkipRated bool // Do not export rated CDRs
SuppressCgrIds bool // Disable CgrIds reporting in reply/ExportedCgrIds and reply/UnexportedCgrIds
Paginator
}
func (self *AttrExpFileCdrs) AsCdrsFilter() (*CdrsFilter, error) {
@@ -711,6 +712,7 @@ func (self *AttrExpFileCdrs) AsCdrsFilter() (*CdrsFilter, error) {
RatedSubjects: self.RatedSubjects,
OrderIdStart: self.OrderIdStart,
OrderIdEnd: self.OrderIdEnd,
Paginator: self.Paginator,
}
if len(self.TimeStart) != 0 {
if answerTimeStart, err := ParseTimeDetectLayout(self.TimeStart); err != nil {
@@ -786,6 +788,7 @@ func (self *AttrGetCdrs) AsCdrsFilter() (*CdrsFilter, error) {
RatedSubjects: self.RatedSubjects,
OrderIdStart: self.OrderIdStart,
OrderIdEnd: self.OrderIdEnd,
Paginator: self.Paginator,
}
if len(self.TimeStart) != 0 {
if answerTimeStart, err := ParseTimeDetectLayout(self.TimeStart); err != nil {