Diff
Modified: freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc.conf.xml (14131 => 14132)
--- 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)
@@ -22,7 +22,11 @@
</template>
<template name="configuration">
- <xml-odbc-do name="break-to" value="${section}" on-no-template-break-to="simple_configuration"/>
+ <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>
</template>
<template name="simple_configuration">
Modified: freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc_templates/console.conf.xml (14131 => 14132)
--- 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)
@@ -9,7 +9,7 @@
FROM
cnf_console_mappings
WHERE
- hostname = '${hostname}';">
+ hostname = '${FreeSWITCH-Hostname}';">
<mapping name="${name}" value="${value}"/>
</xml-odbc-do>
</mappings>
@@ -20,7 +20,7 @@
FROM
cnf_settings
WHERE
- hostname = '${hostname}' AND
+ hostname = '${FreeSWITCH-Hostname}' AND
section = '${section}';">
<param name="${name}" value="${value}"/>
</xml-odbc-do>
Modified: freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc_templates/dialplan.xml (14131 => 14132)
--- 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)
@@ -1,17 +1,5 @@
<include> <!-- NOT FINISHED ! -->
<template name="dialplan">
- <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>
+ <xml-odbc-do name="break-to" value="not-found"/>
</template>
</include>