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

started modifying call descriptor's methods

Browse Source
This commit is contained in:
Radu Ioan Fericean
2012-08-16 18:46:53 +03:00
parent 3af7590003
commit f6725a0435
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
timespans/calldesc.go
View File

@@ -111,7 +111,7 @@ func (cd *CallDescriptor) GetUserBalanceKey() string {
if cd.Account != "" {
subj = cd.Account
}
return fmt.Sprintf("%s:%s:%s", cd.Direction, cd.Tenant, subj)
return ACCOUNT_PREFIX + fmt.Sprintf("%s:%s:%s", cd.Direction, cd.Tenant, subj)
}
/*
@@ -184,17 +184,17 @@ func (cd *CallDescriptor) SearchStorageForPrefix() (destPrefix string, err error
return
}
func (cd *CallDescriptor) getActivationPeriodsOrFallback(key, base, destPrefix string, recursionDepth int) (values []*ActivationPeriod, err error) {
func (cd *CallDescriptor) getRatinPprofile(key, base, destPrefix string, recursionDepth int) (values []*ActivationPeriod, err error) {
if recursionDepth > RecursionMaxDepth {
err = errors.New("Max fallback recursion depth reached!" + key)
return
}
values, fallbackKey, err := storageGetter.GetActivationPeriodsOrFallback(key)
if fallbackKey != "" {
base = fallbackKey + ":"
rp, err := storageGetter.GetRatingProfile(key)
if rp.FallbackKey != "" {
base = rp.FallbackKey + ":"
key = base + destPrefix
recursionDepth++
return cd.getActivationPeriodsOrFallback(key, base, destPrefix, recursionDepth)
return cd.getRatingProfile(key, base, destPrefix, recursionDepth)
}
//get for a smaller prefix if the orignal one was not found
@@ -203,7 +203,7 @@ func (cd *CallDescriptor) getActivationPeriodsOrFallback(key, base, destPrefix s
base = fallbackKey + ":"
key = base + destPrefix
recursionDepth++
return cd.getActivationPeriodsOrFallback(key, base, destPrefix, recursionDepth)
return cd.getRatingProfile(key, base, destPrefix, recursionDepth)
}
i--
@@ -213,7 +213,7 @@ func (cd *CallDescriptor) getActivationPeriodsOrFallback(key, base, destPrefix s
} else {
break
}
values, fallbackKey, err = storageGetter.GetActivationPeriodsOrFallback(key)
values, fallbackKey, err = storageGetter.GetRatingProfile(key)
}
return
}
@@ -223,7 +223,7 @@ Constructs the key for the storage lookup.
The prefixLen is limiting the length of the destination prefix.
*/
func (cd *CallDescriptor) GetKey() string {
return fmt.Sprintf("%s:%s:%s:%s:%s", cd.Direction, cd.Tenant, cd.TOR, cd.Subject, cd.Destination)
return fmt.Sprintf("%s:%s:%s:%s", cd.Direction, cd.Tenant, cd.TOR, cd.Subject)
}
/*

2
timespans/csvreader.go
View File

@@ -113,7 +113,7 @@ func (csvr *CSVReader) WriteToDatabase(storage StorageGetter, flush, verbose boo
log.Print("Action timings")
}
for k, ats := range csvr.actionsTimings {
err = storage.SetActionTimings(ACTION_TIMING_PREFIX+":"+k, ats)
err = storage.SetActionTimings(ACTION_TIMING_PREFIX+k, ats)
if err != nil {
return err
}

1
timespans/storage_interface.go
View File

@@ -26,6 +26,7 @@ import (
)
const (
ACCOUNT_PREFIX = "account:"
ACTION_TIMING_PREFIX = "acttmg:"
CALL_COST_LOG_PREFIX = "cc:"
LOG_PREFIX = "log:"