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

replaced hard coded strings with const

Browse Source
This commit is contained in:
adragusin
2020-01-21 14:06:11 +02:00
parent ef949d7a18
commit f9a79edfe3
18 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apier/v1/tp.go
View File

@@ -80,7 +80,7 @@ func (self *ApierV1) ImportTPZipFile(attrs AttrImportTPZipFile, reply *string) e
TPid: attrs.TPid,
StorDb: self.StorDb,
DirPath: path,
Sep: ',',
Sep: utils.CSV_SEP,
Verbose: false,
ImportId: "",
}

2
config/cdrccfg_test.go
View File

@@ -29,7 +29,7 @@ var cdrcCfg = CdrcCfg{
ID: utils.MetaDefault,
CdrsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs)},
CdrFormat: "csv",
FieldSeparator: utils.FIELDS_SEP,
FieldSeparator: utils.CSV_SEP,
MaxOpenFiles: 1024,
CDRInPath: "/var/spool/cgrates/cdrc/in",
CDROutPath: "/var/spool/cgrates/cdrc/out",

6
config/cdrecfg_test.go
View File

@@ -43,7 +43,7 @@ func TestCdreCfgClone(t *testing.T) {
ExportPath: "/var/spool/cgrates/cdre",
Synchronous: true,
Attempts: 2,
FieldSeparator: rune(','),
FieldSeparator: rune(utils.CSV_SEP),
ContentFields: initContentFlds,
}
eClnContentFlds := []*FCTemplate{
@@ -62,7 +62,7 @@ func TestCdreCfgClone(t *testing.T) {
Synchronous: true,
Attempts: 2,
Filters: []string{},
FieldSeparator: rune(','),
FieldSeparator: rune(utils.CSV_SEP),
HeaderFields: emptyFields,
ContentFields: eClnContentFlds,
TrailerFields: emptyFields,
@@ -122,7 +122,7 @@ func TestCdreCfgloadFromJsonCfg(t *testing.T) {
Filters: []string{},
Tenant: "cgrates.org",
Attempts: 1,
FieldSeparator: ',',
FieldSeparator: utils.CSV_SEP,
HeaderFields: []*FCTemplate{},
ContentFields: []*FCTemplate{{
Tag: "CGRID",

10
config/config_test.go
View File

@@ -209,7 +209,7 @@ func TestCgrCfgCDRC(t *testing.T) {
DryRun: false,
CdrsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs)},
CdrFormat: utils.MetaFileCSV,
FieldSeparator: rune(','),
FieldSeparator: rune(utils.CSV_SEP),
Timezone: "",
RunDelay: 0,
MaxOpenFiles: 1024,
@@ -372,7 +372,7 @@ func TestCgrCfgJSONDefaultsGeneral(t *testing.T) {
t.Errorf("Expected: 6, received: %+v", cgrCfg.GeneralCfg().LogLevel)
}
if cgrCfg.GeneralCfg().DigestSeparator != "," {
t.Errorf("Expected: ',' , received: %+v", cgrCfg.GeneralCfg().DigestSeparator)
t.Errorf("Expected: utils.CSV_SEP , received: %+v", cgrCfg.GeneralCfg().DigestSeparator)
}
if cgrCfg.GeneralCfg().DigestEqual != ":" {
t.Errorf("Expected: ':' , received: %+v", cgrCfg.GeneralCfg().DigestEqual)
@@ -613,7 +613,7 @@ func TestCgrCfgJSONDefaultsCdreProfiles(t *testing.T) {
Synchronous: false,
Attempts: 1,
AttributeSContext: "",
FieldSeparator: ',',
FieldSeparator: utils.CSV_SEP,
HeaderFields: eFields,
ContentFields: eContentFlds,
TrailerFields: eFields,
@@ -1539,7 +1539,7 @@ func TestCgrLoaderCfgDefault(t *testing.T) {
TpID: "",
DataPath: "./",
DisableReverse: false,
FieldSeparator: rune(','),
FieldSeparator: rune(utils.CSV_SEP),
CachesConns: []string{utils.MetaLocalHost},
SchedulerConns: []string{utils.MetaLocalHost},
}
@@ -1578,7 +1578,7 @@ func TestCDRCWithDefault(t *testing.T) {
DryRun: false,
CdrsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs)},
CdrFormat: utils.MetaFileCSV,
FieldSeparator: rune(','),
FieldSeparator: rune(utils.CSV_SEP),
Timezone: "",
RunDelay: 0,
MaxOpenFiles: 1024,

8
config/configcdrc_test.go
View File

@@ -39,7 +39,7 @@ func TestLoadCdrcConfigMultipleFiles(t *testing.T) {
Enabled: false,
CdrsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs)},
CdrFormat: "*file_csv",
FieldSeparator: ',',
FieldSeparator: utils.CSV_SEP,
RunDelay: 0,
MaxOpenFiles: 1024,
CDRInPath: "/var/spool/cgrates/cdrc/in",
@@ -116,7 +116,7 @@ func TestLoadCdrcConfigMultipleFiles(t *testing.T) {
Enabled: true,
CdrsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs)},
CdrFormat: "*file_csv",
FieldSeparator: ',',
FieldSeparator: utils.CSV_SEP,
RunDelay: 0,
MaxOpenFiles: 1024,
CDRInPath: "/tmp/cgrates/cdrc1/in",
@@ -193,7 +193,7 @@ func TestLoadCdrcConfigMultipleFiles(t *testing.T) {
Enabled: true,
CdrsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs)},
CdrFormat: "*file_csv",
FieldSeparator: ',',
FieldSeparator: utils.CSV_SEP,
RunDelay: 1000000000,
MaxOpenFiles: 1024,
CDRInPath: "/tmp/cgrates/cdrc2/in",
@@ -254,7 +254,7 @@ func TestLoadCdrcConfigMultipleFiles(t *testing.T) {
Enabled: true,
CdrsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs)},
CdrFormat: utils.MetaFileCSV,
FieldSeparator: ',',
FieldSeparator: utils.CSV_SEP,
RunDelay: 0,
MaxOpenFiles: 1024,
CDRInPath: "/tmp/cgrates/cdrc3/in",

6
config/rjreader.go
View File

@@ -112,7 +112,7 @@ func (rjr *rjReader) ReadByte() (bit byte, err error) {
if err != nil {
return
}
if bit == ',' {
if bit == utils.CSV_SEP {
var bit2 byte
bit2, err = rjr.PeekByteWC()
if err != nil {
@@ -378,8 +378,8 @@ func (rjr *rjReader) getJsonOffsetLine(offset int64) (line, character int64) {
line++
character = 0
}
if (b == ']' || b == '}') && lastChar == ',' {
i-- //ignore ',' if is followed by ] or }
if (b == ']' || b == '}') && lastChar == utils.CSV_SEP {
i-- //ignore utils.CSV_SEP if is followed by ] or }
}
if !isWhiteSpace(b) {
i++

2
engine/cdrecsv_test.go
View File

@@ -45,7 +45,7 @@ func TestCsvCdrWriter(t *testing.T) {
}
cdre, err := NewCDRExporter([]*CDR{storedCdr1},
cfg.CdreProfiles[utils.MetaDefault], utils.MetaFileCSV, "", "", "firstexport",
true, 1, ',', cfg.GeneralCfg().HttpSkipTlsVerify, nil, nil, nil)
true, 1, utils.CSV_SEP, cfg.GeneralCfg().HttpSkipTlsVerify, nil, nil, nil)
if err != nil {
t.Error("Unexpected error received: ", err)
}

2
engine/cdrefwv_test.go
View File

@@ -369,7 +369,7 @@ func TestWriteCdrs(t *testing.T) {
}
cfg, _ := config.NewDefaultCGRConfig()
cdre, err := NewCDRExporter([]*CDR{cdr1, cdr2, cdr3, cdr4}, cdreCfg,
utils.MetaFileFWV, "", "", "fwv_1", true, 1, ',',
utils.MetaFileFWV, "", "", "fwv_1", true, 1, utils.CSV_SEP,
cfg.GeneralCfg().HttpSkipTlsVerify, nil, nil, nil)
if err != nil {
t.Error(err)

2
engine/loader_csv_test.go
View File

@@ -36,7 +36,7 @@ var csvr *TpReader
func init() {
var err error
csvr, err = NewTpReader(dm.dataDB, NewStringCSVStorage(',',
csvr, err = NewTpReader(dm.dataDB, NewStringCSVStorage(utils.CSV_SEP,
DestinationsCSVContent, TimingsCSVContent, RatesCSVContent, DestinationRatesCSVContent,
RatingPlansCSVContent, RatingProfilesCSVContent, SharedGroupsCSVContent,
ActionsCSVContent, ActionPlansCSVContent, ActionTriggersCSVContent, AccountActionsCSVContent,

2
ers/filecsv.go
View File

@@ -124,7 +124,7 @@ func (rdr *CSVFileER) processFile(fPath, fName string) (err error) {
}
defer file.Close()
csvReader := csv.NewReader(bufio.NewReader(file))
csvReader.Comma = ','
csvReader.Comma = utils.CSV_SEP
if len(rdr.Config().FieldSep) > 0 {
csvReader.Comma = rune(rdr.Config().FieldSep[0])
}

2
general_tests/acntacts_test.go
View File

@@ -55,7 +55,7 @@ ENABLE_ACNT,*enable_account,,,,,,,,,,,,,false,false,10`
suppliers := ``
attrProfiles := ``
chargerProfiles := ``
csvr, err := engine.NewTpReader(dbAcntActs.DataDB(), engine.NewStringCSVStorage(',', destinations, timings,
csvr, err := engine.NewTpReader(dbAcntActs.DataDB(), engine.NewStringCSVStorage(utils.CSV_SEP, destinations, timings,
rates, destinationRates, ratingPlans, ratingProfiles, sharedGroups,
actions, actionPlans, actionTriggers, accountActions,
resLimits, stats, thresholds, filters, suppliers, attrProfiles, chargerProfiles, ``, ""), "", "", nil, nil)

2
general_tests/auth_test.go
View File

@@ -62,7 +62,7 @@ cgrates.org,call,*any,2013-01-06T00:00:00Z,RP_ANY,`
suppliers := ``
attrProfiles := ``
chargerProfiles := ``
csvr, err := engine.NewTpReader(dbAuth.DataDB(), engine.NewStringCSVStorage(',', destinations, timings, rates, destinationRates,
csvr, err := engine.NewTpReader(dbAuth.DataDB(), engine.NewStringCSVStorage(utils.CSV_SEP, destinations, timings, rates, destinationRates,
ratingPlans, ratingProfiles, sharedGroups, actions, actionPlans, actionTriggers, accountActions,
resLimits, stats, thresholds, filters, suppliers, attrProfiles, chargerProfiles, ``, ""), "", "", nil, nil)
if err != nil {

2
general_tests/costs1_test.go
View File

@@ -52,7 +52,7 @@ RP_SMS1,DR_SMS_1,ALWAYS,10`
ratingProfiles := `cgrates.org,call,*any,2012-01-01T00:00:00Z,RP_RETAIL,
cgrates.org,data,*any,2012-01-01T00:00:00Z,RP_DATA1,
cgrates.org,sms,*any,2012-01-01T00:00:00Z,RP_SMS1,`
csvr, err := engine.NewTpReader(dataDB.DataDB(), engine.NewStringCSVStorage(',', dests, timings, rates, destinationRates, ratingPlans, ratingProfiles,
csvr, err := engine.NewTpReader(dataDB.DataDB(), engine.NewStringCSVStorage(utils.CSV_SEP, dests, timings, rates, destinationRates, ratingPlans, ratingProfiles,
"", "", "", "", "", "", "", "", "", "", "", "", "", ""), "", "", nil, nil)
if err != nil {
t.Error(err)

2
general_tests/datachrg1_test.go
View File

@@ -42,7 +42,7 @@ DR_DATA_2,*any,RT_DATA_1c,*up,4,0,`
ratingPlans := `RP_DATA1,DR_DATA_1,TM1,10
RP_DATA1,DR_DATA_2,TM2,10`
ratingProfiles := `cgrates.org,data,*any,2012-01-01T00:00:00Z,RP_DATA1,`
csvr, err := engine.NewTpReader(dataDB.DataDB(), engine.NewStringCSVStorage(',', "", timings, rates, destinationRates, ratingPlans, ratingProfiles,
csvr, err := engine.NewTpReader(dataDB.DataDB(), engine.NewStringCSVStorage(utils.CSV_SEP, "", timings, rates, destinationRates, ratingPlans, ratingProfiles,
"", "", "", "", "", "", "", "", "", "", "", "", "", ""), "", "", nil, nil)
if err != nil {
t.Error(err)

2
general_tests/ddazmbl1_test.go
View File

@@ -63,7 +63,7 @@ TOPUP10_AT,TOPUP10_AC1,ASAP,10`
attrProfiles := ``
chargerProfiles := ``
csvr, err := engine.NewTpReader(dataDB.DataDB(),
engine.NewStringCSVStorage(',', destinations, timings, rates,
engine.NewStringCSVStorage(utils.CSV_SEP, destinations, timings, rates,
destinationRates, ratingPlans, ratingProfiles,
sharedGroups, actions, actionPlans, actionTriggers, accountActions,
resLimits, stats, thresholds, filters, suppliers,

2
general_tests/ddazmbl2_test.go
View File

@@ -62,7 +62,7 @@ TOPUP10_AT,TOPUP10_AC1,ASAP,10`
suppliers := ``
attrProfiles := ``
chargerProfiles := ``
csvr, err := engine.NewTpReader(dataDB2.DataDB(), engine.NewStringCSVStorage(',', destinations, timings,
csvr, err := engine.NewTpReader(dataDB2.DataDB(), engine.NewStringCSVStorage(utils.CSV_SEP, destinations, timings,
rates, destinationRates, ratingPlans, ratingProfiles, sharedGroups, actions, actionPlans,
actionTriggers, accountActions, resLimits,
stats, thresholds, filters, suppliers, attrProfiles, chargerProfiles, ``, ""), "", "", nil, nil)

2
general_tests/ddazmbl3_test.go
View File

@@ -60,7 +60,7 @@ cgrates.org,call,discounted_minutes,2013-01-06T00:00:00Z,RP_UK_Mobile_BIG5_PKG,`
suppliers := ``
attrProfiles := ``
chargerProfiles := ``
csvr, err := engine.NewTpReader(dataDB3.DataDB(), engine.NewStringCSVStorage(',', destinations, timings, rates,
csvr, err := engine.NewTpReader(dataDB3.DataDB(), engine.NewStringCSVStorage(utils.CSV_SEP, destinations, timings, rates,
destinationRates, ratingPlans, ratingProfiles, sharedGroups, actions, actionPlans, actionTriggers,
accountActions, resLimits, stats,
thresholds, filters, suppliers, attrProfiles, chargerProfiles, ``, ""), "", "", nil, nil)

2
general_tests/smschrg1_test.go
View File

@@ -41,7 +41,7 @@ func TestSMSLoadCsvTpSmsChrg1(t *testing.T) {
destinationRates := `DR_SMS_1,*any,RT_SMS_5c,*up,4,0,`
ratingPlans := `RP_SMS1,DR_SMS_1,ALWAYS,10`
ratingProfiles := `cgrates.org,sms,*any,2012-01-01T00:00:00Z,RP_SMS1,`
csvr, err := engine.NewTpReader(dataDB.DataDB(), engine.NewStringCSVStorage(',', "", timings, rates, destinationRates, ratingPlans, ratingProfiles,
csvr, err := engine.NewTpReader(dataDB.DataDB(), engine.NewStringCSVStorage(utils.CSV_SEP, "", timings, rates, destinationRates, ratingPlans, ratingProfiles,
"", "", "", "", "", "", "", "", "", "", "", "", "", ""), "", "", nil, nil)
if err != nil {
t.Error(err)