<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14310] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14310">14310</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-07-21 12:56:12 -0500 (Tue, 21 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>hit the xml registry to look up path information for the say app</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcswitch_ivrc">freeswitch/trunk/src/switch_ivr.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcswitch_ivrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr.c (14309 => 14310)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr.c 2009-07-21 16:26:05 UTC (rev 14309)
+++ freeswitch/trunk/src/switch_ivr.c 2009-07-21 17:56:12 UTC (rev 14310)
</span><span class="lines">@@ -2010,8 +2010,11 @@
</span><span class="cx"> {
</span><span class="cx"> switch_say_interface_t *si;
</span><span class="cx"> switch_channel_t *channel;
</span><del>- switch_status_t status = SWITCH_STATUS_SUCCESS;
- const char *save_path = NULL, *chan_lang = NULL, *lang = NULL;
</del><ins>+ switch_status_t status = SWITCH_STATUS_FALSE;
+ const char *save_path = NULL, *chan_lang = NULL, *lang = NULL, *lname = NULL, *sound_path = NULL;
+ switch_event_t *hint_data;
+ switch_xml_t cfg, xml = NULL, language, macros;
+
</ins><span class="cx">
</span><span class="cx"> switch_assert(session);
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="lines">@@ -2029,13 +2032,60 @@
</span><span class="cx"> chan_lang = lang;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ switch_event_create(&hint_data, SWITCH_EVENT_REQUEST_PARAMS);
+ switch_assert(hint_data);
+
+ switch_event_add_header_string(hint_data, SWITCH_STACK_BOTTOM, "macro_name", "say_app");
+ switch_event_add_header_string(hint_data, SWITCH_STACK_BOTTOM, "lang", chan_lang);
+ switch_channel_event_set_data(channel, hint_data);
+
+ if (switch_xml_locate("phrases", NULL, NULL, NULL, &xml, &cfg, hint_data, SWITCH_TRUE) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of phrases failed.\n");
+ goto done;
+ }
+
+ if (!(macros = switch_xml_child(cfg, "macros"))) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find macros tag.\n");
+ goto done;
+ }
+
+ if (!(language = switch_xml_child(macros, "language"))) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find language tag.\n");
+ goto done;
+ }
+
+ while (language) {
+ if ((lname = (char *) switch_xml_attr(language, "name")) && !strcasecmp(lname, chan_lang)) {
+ const char *tmp;
+
+ if ((tmp = switch_xml_attr(language, "module"))) {
+ module_name = tmp;
+ }
+ break;
+ }
+ language = language->next;
+ }
+
+ if (!language) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find language %s.\n", chan_lang);
+ goto done;
+ }
+
+ if (!(sound_path = (char *) switch_xml_attr(language, "sound-path"))) {
+ sound_path = (char *) switch_xml_attr(language, "sound_path");
+ }
+
</ins><span class="cx"> save_path = switch_channel_get_variable(channel, "sound_prefix");
</span><span class="cx">
</span><del>- switch_channel_set_variable_printf(channel, "sound_prefix", "%s%ssounds%s%s",
- SWITCH_GLOBAL_dirs.base_dir,
- SWITCH_PATH_SEPARATOR,
- SWITCH_PATH_SEPARATOR,
- chan_lang);
</del><ins>+ if (sound_path) {
+ switch_channel_set_variable(channel, "sound_prefix", sound_path);
+ } else {
+ switch_channel_set_variable_printf(channel, "sound_prefix", "%s%ssounds%s%s",
+ SWITCH_GLOBAL_dirs.base_dir,
+ SWITCH_PATH_SEPARATOR,
+ SWITCH_PATH_SEPARATOR,
+ chan_lang);
+ }
</ins><span class="cx">
</span><span class="cx"> if ((si = switch_loadable_module_get_say_interface(module_name))) {
</span><span class="cx"> /* should go back and proto all the say mods to const.... */
</span><span class="lines">@@ -2045,7 +2095,19 @@
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_channel_set_variable(channel, "sound_prefix", save_path);
</del><ins>+ done:
+
+ if (hint_data) {
+ switch_event_destroy(&hint_data);
+ }
+
+ if (save_path) {
+ switch_channel_set_variable(channel, "sound_prefix", save_path);
+ }
+
+ if (xml) {
+ switch_xml_free(xml);
+ }
</ins><span class="cx">
</span><span class="cx"> return status;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>