*/
CREATE TABLE ast_config (
id INTEGER,
+ cat_metric INT(11) NOT NULL DEFAULT 0,
+ var_metric INT(11) NOT NULL DEFAULT 0,
commented TINYINT(1) NOT NULL DEFAULT 0,
filename VARCHAR(128) NOT NULL DEFAULT '',
category VARCHAR(128) NOT NULL DEFAULT 'default',
PRIMARY KEY (id)
);
+CREATE INDEX ast_config__idx__cat_metric ON ast_config(cat_metric);
+CREATE INDEX ast_config__idx__var_metric ON ast_config(var_metric);
CREATE INDEX ast_config__idx__filename_commented ON ast_config(filename, commented);
-CREATE INDEX ast_config__idx__category ON ast_config(category);
/*
* CDR table (this table is automatically created if non existent).
enum {
RES_CONFIG_SQLITE_CONFIG_ID,
+ RES_CONFIG_SQLITE_CONFIG_CAT_METRIC,
+ RES_CONFIG_SQLITE_CONFIG_VAR_METRIC,
RES_CONFIG_SQLITE_CONFIG_COMMENTED,
RES_CONFIG_SQLITE_CONFIG_FILENAME,
RES_CONFIG_SQLITE_CONFIG_CATEGORY,
struct ast_config *cfg;
struct ast_category *cat;
char *cat_name;
+ struct ast_flags flags;
};
/*!
"SELECT *"
" FROM '%q'"
" WHERE filename = '%q' AND commented = 0"
-" ORDER BY category;";
+" ORDER BY cat_metric ASC, var_metric ASC;";
static int set_var(char **var, char *name, char *value)
{
args = arg;
+ if (!strcmp(argv[RES_CONFIG_SQLITE_CONFIG_VAR_NAME], "#include")) {
+ struct ast_config *cfg;
+ char *val;
+
+ val = argv[RES_CONFIG_SQLITE_CONFIG_VAR_VAL];
+ cfg = ast_config_internal_load(val, args->cfg, args->flags, "");
+
+ if (!cfg) {
+ ast_log(LOG_WARNING, "Unable to include %s\n", val);
+ return 1;
+ } else {
+ args->cfg = cfg;
+ return 0;
+ }
+ }
+
if (!args->cat_name || strcmp(args->cat_name, argv[RES_CONFIG_SQLITE_CONFIG_CATEGORY])) {
args->cat = ast_category_new(argv[RES_CONFIG_SQLITE_CONFIG_CATEGORY], "", 99999);
args.cfg = cfg;
args.cat = NULL;
args.cat_name = NULL;
+ args.flags = flags;
ast_mutex_lock(&mutex);