From 68a010a4763ad4d08ff40d860c307943a85cfd18 Mon Sep 17 00:00:00 2001 From: DanB Date: Mon, 4 Nov 2013 20:32:18 +0100 Subject: [PATCH] Minor variable corrections --- cmd/cgr-loader/cgr-loader.go | 2 +- engine/loader_helpers.go | 4 ++-- engine/storage_sql.go | 12 ++++++------ engine/tpimporter_csv.go | 6 +++--- utils/consts.go | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index 311c199ec..8e8a35aa8 100644 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -110,7 +110,7 @@ func main() { log.Fatal(err, "\n\t", v.Message) } } - loader = engine.NewFileCSVReader(dataDb, ',', utils.DESTINATIONS_CSV, utils.TIMINGS_CSV, utils.RATES_CSV, utils.DESTINATION_RATES_CSV, utils.DESTRATE_TIMINGS_CSV, utils.RATE_PROFILES_CSV, utils.ACTIONS_CSV, utils.ACTION_TIMINGS_CSV, utils.ACTION_TRIGGERS_CSV, utils.ACCOUNT_ACTIONS_CSV) + loader = engine.NewFileCSVReader(dataDb, ',', utils.DESTINATIONS_CSV, utils.TIMINGS_CSV, utils.RATES_CSV, utils.DESTINATION_RATES_CSV, utils.RATING_PLANS_CSV, utils.RATING_PROFILES_CSV, utils.ACTIONS_CSV, utils.ACTION_TIMINGS_CSV, utils.ACTION_TRIGGERS_CSV, utils.ACCOUNT_ACTIONS_CSV) } if *historyServer != "" { diff --git a/engine/loader_helpers.go b/engine/loader_helpers.go index 9e6deadb3..610e4d990 100644 --- a/engine/loader_helpers.go +++ b/engine/loader_helpers.go @@ -239,10 +239,10 @@ var FileValidators = map[string]*FileLineRegexValidator{ utils.DESTINATION_RATES_CSV: &FileLineRegexValidator{utils.DESTINATION_RATES_NRCOLS, regexp.MustCompile(`(?:\w+\s*,?\s*){3}$`), "Tag([0-9A-Za-z_]),DestinationsTag([0-9A-Za-z_]),RateTag([0-9A-Za-z_])"}, - utils.DESTRATE_TIMINGS_CSV: &FileLineRegexValidator{utils.DESTRATE_TIMINGS_NRCOLS, + utils.RATING_PLANS_CSV: &FileLineRegexValidator{utils.DESTRATE_TIMINGS_NRCOLS, regexp.MustCompile(`(?:\w+\s*,\s*){3}(?:\d+.?\d*){1}$`), "Tag([0-9A-Za-z_]),DestinationRatesTag([0-9A-Za-z_]),TimingProfile([0-9A-Za-z_]),Weight([0-9.])"}, - utils.RATE_PROFILES_CSV: &FileLineRegexValidator{utils.RATE_PROFILES_NRCOLS, + utils.RATING_PROFILES_CSV: &FileLineRegexValidator{utils.RATE_PROFILES_NRCOLS, regexp.MustCompile(`(?:\w+\s*,\s*){2}(?:\*out\s*,\s*){1}(?:\*any\s*,\s*|\w+\s*,\s*){1}(?:\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z){1}(?:\w*\s*,?\s*){2}$`), "Tenant([0-9A-Za-z_]),TOR([0-9A-Za-z_]),Direction(*out),Subject([0-9A-Za-z_]|*all),RatesFallbackSubject([0-9A-Za-z_]|),RatesTimingTag([0-9A-Za-z_]),ActivationTime([0-9T:X])"}, utils.ACTIONS_CSV: &FileLineRegexValidator{utils.ACTIONS_NRCOLS, diff --git a/engine/storage_sql.go b/engine/storage_sql.go index 90724d214..52b9633a8 100644 --- a/engine/storage_sql.go +++ b/engine/storage_sql.go @@ -434,7 +434,7 @@ func (self *SQLStorage) SetTPRatingProfiles(tpid string, rps map[string][]*Ratin if len(rps) == 0 { return nil //Nothing to set } - qry := fmt.Sprintf("INSERT INTO %s (tpid,tag,tenant,tor,direction,subject,activation_time,destrates_timing_tag,rates_fallback_subject) VALUES ", + qry := fmt.Sprintf("INSERT INTO %s (tpid,tag,tenant,tor,direction,subject,activation_time,rating_plan_tag,fallback_subject) VALUES ", utils.TBL_TP_RATE_PROFILES) i := 0 for rpId, rp := range rps { @@ -455,7 +455,7 @@ func (self *SQLStorage) SetTPRatingProfiles(tpid string, rps map[string][]*Ratin } func (self *SQLStorage) GetTPRatingProfile(tpid, rpId string) (*utils.TPRatingProfile, error) { - rows, err := self.Db.Query(fmt.Sprintf("SELECT tenant,tor,direction,subject,activation_time,destrates_timing_tag,rates_fallback_subject FROM %s WHERE tpid='%s' AND tag='%s'", utils.TBL_TP_RATE_PROFILES, tpid, rpId)) + rows, err := self.Db.Query(fmt.Sprintf("SELECT tenant,tor,direction,subject,activation_time,rating_plan_tag,fallback_subject FROM %s WHERE tpid='%s' AND tag='%s'", utils.TBL_TP_RATE_PROFILES, tpid, rpId)) if err != nil { return nil, err } @@ -1043,7 +1043,7 @@ func (self *SQLStorage) GetTpDestinationRateTimings(tpid, tag string) ([]*Destin func (self *SQLStorage) GetTpRatingProfiles(tpid, tag string) (map[string]*RatingProfile, error) { rpfs := make(map[string]*RatingProfile) - q := fmt.Sprintf("SELECT tag,tenant,tor,direction,subject,activation_time,destrates_timing_tag,rates_fallback_subject FROM %s WHERE tpid='%s'", + q := fmt.Sprintf("SELECT tag,tenant,tor,direction,subject,activation_time,rating_plan_tag,fallback_subject FROM %s WHERE tpid='%s'", utils.TBL_TP_RATE_PROFILES, tpid) if tag != "" { q += fmt.Sprintf(" AND tag='%s'", tag) @@ -1054,8 +1054,8 @@ func (self *SQLStorage) GetTpRatingProfiles(tpid, tag string) (map[string]*Ratin } defer rows.Close() for rows.Next() { - var tag, tenant, tor, direction, subject, fallback_subject, destrates_timing_tag, activation_time string - if err := rows.Scan(&tag, &tenant, &tor, &direction, &subject, &activation_time, &destrates_timing_tag, &fallback_subject); err != nil { + var tag, tenant, tor, direction, subject, fallback_subject, rating_plan_tag, activation_time string + if err := rows.Scan(&tag, &tenant, &tor, &direction, &subject, &activation_time, &rating_plan_tag, &fallback_subject); err != nil { return nil, err } key := fmt.Sprintf("%s:%s:%s:%s", direction, tenant, tor, subject) @@ -1064,7 +1064,7 @@ func (self *SQLStorage) GetTpRatingProfiles(tpid, tag string) (map[string]*Ratin rp = &RatingProfile{Id: key, Tag: tag} rpfs[key] = rp } - rp.DestRatesTimingTag = destrates_timing_tag + rp.DestRatesTimingTag = rating_plan_tag rp.ActivationTime = activation_time if fallback_subject != "" { for _, fbs := range strings.Split(fallback_subject, ";") { diff --git a/engine/tpimporter_csv.go b/engine/tpimporter_csv.go index f5acc337d..726d7e771 100644 --- a/engine/tpimporter_csv.go +++ b/engine/tpimporter_csv.go @@ -43,8 +43,8 @@ var fileHandlers = map[string]func(*TPCSVImporter, string) error{ utils.DESTINATIONS_CSV: (*TPCSVImporter).importDestinations, utils.RATES_CSV: (*TPCSVImporter).importRates, utils.DESTINATION_RATES_CSV: (*TPCSVImporter).importDestinationRates, - utils.DESTRATE_TIMINGS_CSV: (*TPCSVImporter).importDestRateTimings, - utils.RATE_PROFILES_CSV: (*TPCSVImporter).importRatingProfiles, + utils.RATING_PLANS_CSV: (*TPCSVImporter).importRatingPlans, + utils.RATING_PROFILES_CSV: (*TPCSVImporter).importRatingProfiles, utils.ACTIONS_CSV: (*TPCSVImporter).importActions, utils.ACTION_TIMINGS_CSV: (*TPCSVImporter).importActionTimings, utils.ACTION_TRIGGERS_CSV: (*TPCSVImporter).importActionTriggers, @@ -180,7 +180,7 @@ func (self *TPCSVImporter) importDestinationRates(fn string) error { return nil } -func (self *TPCSVImporter) importDestRateTimings(fn string) error { +func (self *TPCSVImporter) importRatingPlans(fn string) error { log.Printf("Processing file: <%s> ", fn) fParser, err := NewTPCSVFileParser(self.DirPath, fn) if err != nil { diff --git a/utils/consts.go b/utils/consts.go index 73588cc28..6748012d6 100644 --- a/utils/consts.go +++ b/utils/consts.go @@ -35,8 +35,8 @@ const ( DESTINATIONS_CSV = "Destinations.csv" RATES_CSV = "Rates.csv" DESTINATION_RATES_CSV = "DestinationRates.csv" - DESTRATE_TIMINGS_CSV = "DestinationRateTimings.csv" - RATE_PROFILES_CSV = "RatingProfiles.csv" + RATING_PLANS_CSV = "RatingPlans.csv" + RATING_PROFILES_CSV = "RatingProfiles.csv" ACTIONS_CSV = "Actions.csv" ACTION_TIMINGS_CSV = "ActionTimings.csv" ACTION_TRIGGERS_CSV = "ActionTriggers.csv"