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

Merge branch 'master' of https://github.com/cgrates/cgrates

Browse Source
This commit is contained in:
DanB
2013-07-08 15:16:11 +02:00
parent 56b5ce9a49 0401809d0d
commit d2baf4fa08
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rater/loader_db.go
View File

@@ -137,7 +137,19 @@ func (dbr *DbReader) LoadRates() (err error) {
func (dbr *DbReader) LoadDestinationRates() (err error) {
dbr.destinationRates, err = dbr.storDB.GetTpDestinationRates(dbr.tpid, "")
return err
if err != nil {
return err
}
for _, drs := range dbr.destinationRates {
for _, dr := range drs {
rate, exists := dbr.rates[dr.RateTag]
if !exists {
return errors.New(fmt.Sprintf("Could not find rate for tag %v", dr.RateTag))
}
dr.Rate = rate
}
}
return nil
}
func (dbr *DbReader) LoadDestinationRateTimings() error {
@@ -214,17 +226,17 @@ func (dbr *DbReader) LoadRatingProfileByTag(tag string) (*RatingProfile, error)
return nil, err
}
rateTiming.timing = tm[rateTiming.TimingsTag]
rm, err := dbr.storDB.GetTpDestinationRates(dbr.tpid, rateTiming.DestinationRatesTag)
drm, err := dbr.storDB.GetTpDestinationRates(dbr.tpid, rateTiming.DestinationRatesTag)
if err != nil {
return nil, err
}
for _, rate := range rm[rateTiming.DestinationRatesTag] {
for _, drate := range drm[rateTiming.DestinationRatesTag] {
_, exists := activationPeriods[rateTiming.Tag]
if !exists {
activationPeriods[rateTiming.Tag] = &ActivationPeriod{}
}
activationPeriods[rateTiming.Tag].AddIntervalIfNotPresent(rateTiming.GetInterval(rate))
dm, err := dbr.storDB.GetTpDestinations(dbr.tpid, rate.DestinationsTag)
activationPeriods[rateTiming.Tag].AddIntervalIfNotPresent(rateTiming.GetInterval(drate))
dm, err := dbr.storDB.GetTpDestinations(dbr.tpid, drate.DestinationsTag)
if err != nil {
return nil, err
}