started cdrexporter and fallback list by ; not |

This commit is contained in:
Radu Ioan Fericean
2013-06-26 18:33:46 +03:00
parent 3380bf8492
commit 15e5709e29
5 changed files with 107 additions and 1 deletions

1
.gitignore vendored
View File

@@ -9,3 +9,4 @@ a.out
docs/_*
bin
.idea
dean*

View File

@@ -0,0 +1,24 @@
/*
Rating system designed to be used in VoIP Carriers World
Copyright (C) 2013 ITsysCOM
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
*/
package cdrexporter
type CdrWriter interface {
Write(cdr map[string]string) string
Close()
}

44
cdrexporter/csv.go Normal file
View File

@@ -0,0 +1,44 @@
/*
Rating system designed to be used in VoIP Carriers World
Copyright (C) 2013 ITsysCOM
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
*/
package cdrexporter
import (
"encoding/csv"
"io"
)
type CsvCdrWriter struct {
writer *csv.Writer
}
func NewCsvCdrWriter(writer io.Writer) *CsvCdrWriter {
return &CsvCdrWriter{csv.NewWriter(writer)}
}
func (dcw *CsvCdrWriter) Write(cdr map[string]string) error {
var row []string
for _, v := range cdr {
row = append(row, v)
}
return dcw.writer.Write(row)
}
func (dcw *CsvCdrWriter) Close() {
dcw.writer.Flush()
}

37
cdrexporter/csv_test.go Normal file
View File

@@ -0,0 +1,37 @@
/*
Rating system designed to be used in VoIP Carriers World
Copyright (C) 2013 ITsysCOM
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
*/
package cdrexporter
import (
"bytes"
"strings"
"testing"
)
func TestCsv(t *testing.T) {
writer := &bytes.Buffer{}
csvCdrWriter := NewCsvCdrWriter(writer)
csvCdrWriter.Write(map[string]string{"First": "test", "Second": "the", "Third": "cdr"})
csvCdrWriter.Close()
expected := "test,the,cdr"
result := strings.TrimSpace(writer.String())
if result != expected {
t.Errorf("Expected %s was %s.", expected, result)
}
}

View File

@@ -170,7 +170,7 @@ func (cd *CallDescriptor) getActivationPeriodsForPrefix(key string, recursionDep
if err != nil {
if rp.FallbackKey != "" {
recursionDepth++
for _, fbk := range strings.Split(rp.FallbackKey, "|") {
for _, fbk := range strings.Split(rp.FallbackKey, ";") {
if destPrefix, values, err := cd.getActivationPeriodsForPrefix(fbk, recursionDepth); err == nil {
return destPrefix, values, err
}