<!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][14132] </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=14132">14132</a></dd>
<dt>Author</dt> <dd>ledr</dd>
<dt>Date</dt> <dd>2009-07-04 20:14:40 -0500 (Sat, 04 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixed endless loop in template name=configuration, but that binding still segfaults for some reason</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribmodxml_intmod_xml_odbcxml_odbcconfxml">freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc.conf.xml</a></li>
<li><a href="#freeswitchtrunkcontribmodxml_intmod_xml_odbcxml_odbc_templatesconsoleconfxml">freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc_templates/console.conf.xml</a></li>
<li><a href="#freeswitchtrunkcontribmodxml_intmod_xml_odbcxml_odbc_templatesdialplanxml">freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc_templates/dialplan.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribmodxml_intmod_xml_odbcxml_odbcconfxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc.conf.xml (14131 => 14132)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc.conf.xml 2009-07-04 13:57:40 UTC (rev 14131)
+++ freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc.conf.xml 2009-07-05 01:14:40 UTC (rev 14132)
</span><span class="lines">@@ -22,7 +22,11 @@
</span><span class="cx"> </template>
</span><span class="cx">
</span><span class="cx"> <template name="configuration">
</span><del>- <xml-odbc-do name="break-to" value="${section}" on-no-template-break-to="simple_configuration"/>
</del><ins>+ <xml-odbc-do name="check-event-header" if-name="tag_name" if-value="configuration">
+ <xml-odbc-do name="check-event-header" if-name="key_name" if-value="name">
+ <xml-odbc-do name="break-to" value="${key_value}" on-no-template-break-to="simple-configuration"/>
+ </xml-odbc-do>
+ </xml-odbc-do>
</ins><span class="cx"> </template>
</span><span class="cx">
</span><span class="cx"> <template name="simple_configuration">
</span></span></pre></div>
<a id="freeswitchtrunkcontribmodxml_intmod_xml_odbcxml_odbc_templatesconsoleconfxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc_templates/console.conf.xml (14131 => 14132)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc_templates/console.conf.xml 2009-07-04 13:57:40 UTC (rev 14131)
+++ freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc_templates/console.conf.xml 2009-07-05 01:14:40 UTC (rev 14132)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> FROM
</span><span class="cx"> cnf_console_mappings
</span><span class="cx"> WHERE
</span><del>- hostname = '${hostname}';">
</del><ins>+ hostname = '${FreeSWITCH-Hostname}';">
</ins><span class="cx"> <mapping name="${name}" value="${value}"/>
</span><span class="cx"> </xml-odbc-do>
</span><span class="cx"> </mappings>
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> FROM
</span><span class="cx"> cnf_settings
</span><span class="cx"> WHERE
</span><del>- hostname = '${hostname}' AND
</del><ins>+ hostname = '${FreeSWITCH-Hostname}' AND
</ins><span class="cx"> section = '${section}';">
</span><span class="cx"> <param name="${name}" value="${value}"/>
</span><span class="cx"> </xml-odbc-do>
</span></span></pre></div>
<a id="freeswitchtrunkcontribmodxml_intmod_xml_odbcxml_odbc_templatesdialplanxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc_templates/dialplan.xml (14131 => 14132)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc_templates/dialplan.xml 2009-07-04 13:57:40 UTC (rev 14131)
+++ freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc_templates/dialplan.xml 2009-07-05 01:14:40 UTC (rev 14132)
</span><span class="lines">@@ -1,17 +1,5 @@
</span><span class="cx"> <include> <!-- NOT FINISHED ! -->
</span><span class="cx"> <template name="dialplan">
</span><del>- <document type="freeswitch/xml">
- <xml-odbc-do name="query" on-zero-rows-break-to="not_found" value="
- SELECT * FROM dialplan WHERE dialed_number='${dialed_number}';"/>
- <section name="dialplan" description="RE Dial Plan For FreeSwitch">
- <context name="default">
- <extension name="test9">
- <condition field="destination_number" expression="^83789$">
- <action application="bridge" data="iax/guest@conference.freeswitch.org/888"/>
- </condition>
- </extension>
- </context>
- </section>
- </document>
</del><ins>+ <xml-odbc-do name="break-to" value="not-found"/>
</ins><span class="cx"> </template>
</span><span class="cx"> </include>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>