[Freeswitch-svn] [commit] r10214 - in freeswitch/trunk/src: . include mod/applications/mod_commands mod/applications/mod_voicemail mod/say/mod_say_en
Freeswitch SVN
anthm at freeswitch.org
Fri Oct 31 16:24:07 EDT 2008
Author: anthm
Date: Fri Oct 31 16:24:06 2008
New Revision: 10214
Modified:
freeswitch/trunk/src/include/switch_core.h
freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c
freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c
freeswitch/trunk/src/switch_time.c
Log:
add tz stuff to mod_say_en, other langs need similar code
Modified: freeswitch/trunk/src/include/switch_core.h
==============================================================================
--- freeswitch/trunk/src/include/switch_core.h (original)
+++ freeswitch/trunk/src/include/switch_core.h Fri Oct 31 16:24:06 2008
@@ -1655,7 +1655,8 @@
SWITCH_DECLARE(void) switch_core_setrlimits(void);
SWITCH_DECLARE(void) switch_time_sync(void);
SWITCH_DECLARE(time_t) switch_timestamp(time_t *t);
-SWITCH_DECLARE(switch_status_t) switch_strftime_tz(const char *tz, const char *format, char *date, size_t len);
+SWITCH_DECLARE(switch_status_t) switch_strftime_tz(const char *tz, const char *format, char *date, size_t len, switch_time_t thetime);
+SWITCH_DECLARE(switch_status_t) switch_time_exp_tz_name(const char *tz, switch_time_exp_t *tm, switch_time_t thetime);
SWITCH_DECLARE(void) switch_load_network_lists(switch_bool_t reload);
SWITCH_DECLARE(switch_bool_t) switch_check_network_list_ip_token(const char *ip_str, const char *list_name, const char **token);
#define switch_check_network_list_ip(_ip_str, _list_name) switch_check_network_list_ip_token(_ip_str, _list_name, NULL)
Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri Oct 31 16:24:06 2008
@@ -2763,7 +2763,7 @@
}
}
- if (switch_strftime_tz(tz_name, format, date, sizeof(date)) == SWITCH_STATUS_SUCCESS) { /* The lookup of the zone may fail. */
+ if (switch_strftime_tz(tz_name, format, date, sizeof(date), 0) == SWITCH_STATUS_SUCCESS) { /* The lookup of the zone may fail. */
stream->write_function(stream, "%s", date);
} else {
stream->write_function(stream, "-ERR Invalid Timezone\n");
Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original)
+++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Oct 31 16:24:06 2008
@@ -1983,11 +1983,23 @@
}
- x_params = switch_xml_child(x_user, "params");
+
thepass = thehash = NULL;
switch_snprintf(sql, sizeof(sql), "select * from voicemail_prefs where username='%s' and domain='%s'", myid, domain_name);
vm_execute_sql_callback(profile, profile->mutex, sql, prefs_callback, &cbt);
+
+ x_params = switch_xml_child(x_user, "variables");
+ for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) {
+ const char *var = switch_xml_attr_soft(x_param, "name");
+ const char *val = switch_xml_attr_soft(x_param, "value");
+
+ if (!strcasecmp(var, "timezone")) {
+ switch_channel_set_variable(channel, var, val);
+ }
+ }
+
+ x_params = switch_xml_child(x_user, "params");
for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) {
const char *var = switch_xml_attr_soft(x_param, "name");
const char *val = switch_xml_attr_soft(x_param, "value");
@@ -2012,6 +2024,9 @@
vm_email = switch_core_session_strdup(session, val);
} else if (!strcasecmp(var, "storage-dir")) {
vm_storage_dir = switch_core_session_strdup(session, val);
+
+ } else if (!strcasecmp(var, "timezone")) {
+ switch_channel_set_variable(channel, var, val);
}
}
@@ -2188,6 +2203,16 @@
filename = path;
}
+ x_params = switch_xml_child(x_user, "variables");
+ for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) {
+ const char *var = switch_xml_attr_soft(x_param, "name");
+ const char *val = switch_xml_attr_soft(x_param, "value");
+
+ if (!strcasecmp(var, "timezone")) {
+ vm_timezone = switch_core_strdup(pool, val);
+ }
+ }
+
x_params = switch_xml_child(x_user, "params");
for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) {
@@ -2297,7 +2322,7 @@
message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages,
&total_new_urgent_messages, &total_saved_urgent_messages);
- if (switch_strlen_zero(vm_timezone) || (switch_strftime_tz(vm_timezone, profile->date_fmt, date, sizeof(date)) != SWITCH_STATUS_SUCCESS)) {
+ if (switch_strlen_zero(vm_timezone) || (switch_strftime_tz(vm_timezone, profile->date_fmt, date, sizeof(date), 0) != SWITCH_STATUS_SUCCESS)) {
switch_time_exp_lt(&tm, switch_timestamp_now());
switch_strftime(date, &retsize, sizeof(date), profile->date_fmt, &tm);
}
Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c
==============================================================================
--- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original)
+++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Fri Oct 31 16:24:06 2008
@@ -266,7 +266,9 @@
switch_time_t target = 0;
switch_time_exp_t tm;
uint8_t say_date = 0, say_time = 0;
-
+ switch_channel_t *channel = switch_core_session_get_channel(session);
+ const char *tz = switch_channel_get_variable(channel, "timezone");
+
if (type == SST_TIME_MEASUREMENT) {
int64_t hours = 0;
int64_t minutes = 0;
@@ -291,7 +293,7 @@
}
}
} else {
- if ((seconds = atoi(tosay)) <= 0) {
+ if ((seconds = atol(tosay)) <= 0) {
seconds = (int64_t) switch_timestamp(NULL);
}
@@ -347,12 +349,22 @@
return SWITCH_STATUS_SUCCESS;
}
- if ((t = atoi(tosay)) > 0) {
+ if ((t = atol(tosay)) > 0) {
target = switch_time_make(t, 0);
} else {
target = switch_timestamp_now();
}
- switch_time_exp_lt(&tm, target);
+
+ if (tz) {
+ int check = atoi(tz);
+ if (check) {
+ switch_time_exp_tz(&tm, target, check);
+ } else {
+ switch_time_exp_tz_name(tz, &tm, target);
+ }
+ } else {
+ switch_time_exp_lt(&tm, target);
+ }
switch (type) {
case SST_CURRENT_DATE_TIME:
Modified: freeswitch/trunk/src/switch_time.c
==============================================================================
--- freeswitch/trunk/src/switch_time.c (original)
+++ freeswitch/trunk/src/switch_time.c Fri Oct 31 16:24:06 2008
@@ -543,9 +543,39 @@
static void tztime(const time_t * const timep, const char *tzstring, struct tm * const tmp );
-SWITCH_DECLARE(switch_status_t) switch_strftime_tz(const char *tz, const char *format, char *date, size_t len)
+SWITCH_DECLARE(switch_status_t) switch_time_exp_tz_name(const char *tz, switch_time_exp_t *tm, switch_time_t thetime)
+{
+ struct tm xtm = { 0 };
+ const char *tz_name = tz;
+ const char *tzdef;
+ time_t timep;
+
+ if (!thetime) {
+ thetime = switch_timestamp_now();
+ }
+
+ timep = (thetime) / (int64_t) (1000000);
+
+ if (!switch_strlen_zero(tz_name)) {
+ tzdef = switch_lookup_timezone( tz_name );
+ } else {
+ /* We set the default timezone to GMT. */
+ tz_name="GMT";
+ tzdef="GMT";
+ }
+
+ if (tzdef) { /* The lookup of the zone may fail. */
+ tztime( &timep, tzdef, &xtm );
+ tm2switchtime( &xtm, tm);
+ return SWITCH_STATUS_SUCCESS;
+ }
+
+ return SWITCH_STATUS_FALSE;
+
+}
+
+SWITCH_DECLARE(switch_status_t) switch_strftime_tz(const char *tz, const char *format, char *date, size_t len, switch_time_t thetime)
{
- switch_time_t thetime;
time_t timep;
const char *tz_name = tz;
@@ -556,7 +586,9 @@
struct tm tm = { 0 };
switch_time_exp_t stm;
- thetime = switch_timestamp_now();
+ if (!thetime) {
+ thetime = switch_timestamp_now();
+ }
timep = (thetime) / (int64_t) (1000000);
More information about the Freeswitch-svn
mailing list