From bfcb317501ff1566a269c6140a5ecdf32ffe8a10 Mon Sep 17 00:00:00 2001 From: DanB Date: Mon, 22 Sep 2014 18:41:24 +0200 Subject: [PATCH] ExportCdrsToZipString API when there are no records to be exported --- apier/v1/cdre.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apier/v1/cdre.go b/apier/v1/cdre.go index 31c0fed1f..63e5fe101 100644 --- a/apier/v1/cdre.go +++ b/apier/v1/cdre.go @@ -22,6 +22,7 @@ import ( "archive/zip" "bytes" "encoding/base64" + "errors" "fmt" "io/ioutil" "path" @@ -31,7 +32,6 @@ import ( "github.com/cgrates/cgrates/cdre" "github.com/cgrates/cgrates/config" - "github.com/cgrates/cgrates/engine" "github.com/cgrates/cgrates/utils" ) @@ -39,6 +39,8 @@ func (self *ApierV1) ExportCdrsToZipString(attr utils.AttrExpFileCdrs, reply *st efc := utils.ExportedFileCdrs{} if err := self.ExportCdrsToFile(attr, &efc); err != nil { return err + } else if efc.TotalRecords == 0 || len(efc.ExportedFilePath) == 0 { + return errors.New("NO_CDR_RECORDS") } // Create a buffer to write our archive to. buf := new(bytes.Buffer) @@ -72,7 +74,6 @@ func (self *ApierV1) ExportCdrsToZipString(attr utils.AttrExpFileCdrs, reply *st func (self *ApierV1) ExportCdrsToFile(attr utils.AttrExpFileCdrs, reply *utils.ExportedFileCdrs) error { var tStart, tEnd time.Time var err error - engine.Logger.Debug(fmt.Sprintf("ExportCdrsToFile: %+v", attr)) if len(attr.TimeStart) != 0 { if tStart, err = utils.ParseTimeDetectLayout(attr.TimeStart); err != nil { return err