<!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][14798] </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=14798">14798</a></dd>
<dt>Author</dt> <dd>ledr</dd>
<dt>Date</dt> <dd>2009-09-09 14:56:22 -0500 (Wed, 09 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixed rowcount for nested queries</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribmodxml_intmod_xml_odbcmod_xml_odbcc">freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c</a></li>
<li><a href="#freeswitchtrunkcontribmodxml_intmod_xml_odbcxml_odbc_templatesdirectorygatewaysxml">freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc_templates/directory-gateways.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribmodxml_intmod_xml_odbcmod_xml_odbcc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c (14797 => 14798)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c 2009-09-09 18:51:29 UTC (rev 14797)
+++ freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c 2009-09-09 19:56:22 UTC (rev 14798)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> * Leon de Rooij <leon@scarlet-internet.nl>
</span><span class="cx"> *
</span><span class="cx"> * Also thanks to:
</span><del>- * Scarlet Nederland for donating time and money
</del><ins>+ * Scarlet Telecom Nederland for funding this work.
</ins><span class="cx"> *
</span><span class="cx"> *
</span><span class="cx"> * mod_xml_odbc.c -- Simple templating that can use ODBC to generate XML at search-time
</span><span class="lines">@@ -59,15 +59,15 @@
</span><span class="cx"> } globals;
</span><span class="cx">
</span><span class="cx"> typedef struct xml_odbc_session_helper {
</span><del>- switch_memory_pool_t *pool; /* memory pool that is destroyed at the end of the session to ease free'ing */
- char *next_template_name; /* the name of the next template that has to be rendered */
- switch_event_t *event; /* contains headers which is a hash that can easily be expanded ${var} to *chars */
- switch_xml_t xml_in_cur; /* current tag in xml template that is rendered from */
- switch_xml_t xml_out; /* root tag of xml that is rendered to */
- switch_xml_t xml_out_cur; /* current tag in xml that is rendered to */
- int xml_out_cur_off; /* depth counter of xml_out_cur */
- int render_template_count; /* when this counter > globals.max_render_template_count then stop because there's probably a loop */
- int tmp_i; /* temporary counter, used for counting rows in the callback */
</del><ins>+ switch_memory_pool_t *pool; /* memory pool that is destroyed at the end of the session to ease free'ing */
+ char *next_template_name; /* the name of the next template that has to be rendered */
+ switch_event_t *event; /* contains headers which is a hash that can easily be expanded ${var} to *chars */
+ switch_xml_t xml_in_cur; /* current tag in xml template that is rendered from */
+ switch_xml_t xml_out; /* root tag of xml that is rendered to */
+ switch_xml_t xml_out_cur; /* current tag in xml that is rendered to */
+ int xml_out_cur_off; /* depth counter of xml_out_cur */
+ int render_template_count; /* when this counter > globals.max_render_template_count then stop because there's probably a loop */
+ int rowcount; /* temporary counter, used for counting rows in the callback */
</ins><span class="cx"> } xml_odbc_session_helper_t;
</span><span class="cx">
</span><span class="cx"> static switch_status_t xml_odbc_render_tag(xml_odbc_session_helper_t *helper);
</span><span class="lines">@@ -107,36 +107,42 @@
</span><span class="cx"> char *bindings;
</span><span class="cx"> } xml_binding_t;
</span><span class="cx">
</span><del>-static char* switch_event_expand_headers_by_pool(switch_memory_pool_t *pool, switch_event_t *event, const char *in) /* perhaps it's handy if this is moved to switch_event.c ? */
</del><ins>+static char* switch_event_expand_headers_by_pool(switch_memory_pool_t *pool, switch_event_t *event, const char *in)
</ins><span class="cx"> {
</span><del>- char *tmp, *out;
</del><ins>+ char *tmp, *out;
</ins><span class="cx">
</span><del>- tmp = switch_event_expand_headers(event, in);
- out = switch_core_strdup(pool, tmp);
- if (tmp != in) switch_safe_free(tmp);
</del><ins>+ tmp = switch_event_expand_headers(event, in);
+ out = switch_core_strdup(pool, tmp);
+ if (tmp != in) switch_safe_free(tmp);
</ins><span class="cx">
</span><del>- return out;
</del><ins>+ return out;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static int xml_odbc_query_callback(void *pArg, int argc, char **argv, char **columnName)
</span><span class="cx"> {
</span><span class="cx"> xml_odbc_session_helper_t *helper = (xml_odbc_session_helper_t *) pArg;
</span><del>- int i;
</del><ins>+ int i, tmp_rowcount;
</ins><span class="cx">
</span><span class="cx"> if (!switch_strlen_zero(helper->next_template_name)) goto done;
</span><span class="cx">
</span><del>- /* up the row counter */
- helper->tmp_i++; /* TODO: WILL THIS GO WRONG FOR NESTED QUERIES ?? THINK ABOUT IT !!! */
-
</del><span class="cx"> /* loop through all columns and store them in helper->event->headers */
</span><span class="cx"> for (i = 0; i < argc; i++) {
</span><span class="cx"> switch_event_del_header(helper->event, columnName[i]);
</span><span class="cx"> switch_event_add_header_string(helper->event, SWITCH_STACK_BOTTOM, columnName[i], argv[i]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* up the rowcount, store it in a temporary variable and set rowcount to zero as children may use it */
+ helper->rowcount++;
+ tmp_rowcount = helper->rowcount;
+ helper->rowcount = 0;
+
+ /* render all children */
</ins><span class="cx"> xml_odbc_render_children(helper);
</span><span class="cx">
</span><del>- done:
</del><ins>+ /* restore the rowcounter - it may have been changed by a child */
+ helper->rowcount = tmp_rowcount;
+
+ done:
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -202,7 +208,7 @@
</span><span class="cx">
</span><span class="cx"> status = xml_odbc_render_children(helper);
</span><span class="cx">
</span><del>- done:
</del><ins>+ done:
</ins><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -222,13 +228,13 @@
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!switch_strlen_zero(empty_result_break_to) && helper->tmp_i == 0) {
</del><ins>+ if (!switch_strlen_zero(empty_result_break_to) && helper->rowcount == 0) {
</ins><span class="cx"> helper->next_template_name = empty_result_break_to;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx">
</span><del>- done:
</del><ins>+ done:
</ins><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -278,7 +284,7 @@
</span><span class="cx">
</span><span class="cx"> status = xml_odbc_render_children(helper);
</span><span class="cx">
</span><del>- done:
</del><ins>+ done:
</ins><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -306,7 +312,7 @@
</span><span class="cx">
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx">
</span><del>- done:
</del><ins>+ done:
</ins><span class="cx"> /* restore helper->xml_in_cur in case it was changed during render_tag */
</span><span class="cx"> helper->xml_in_cur = xml_in_cur_tmp;
</span><span class="cx">
</span><span class="lines">@@ -358,7 +364,7 @@
</span><span class="cx"> reset:
</span><span class="cx"> status = xml_odbc_render_template(helper);
</span><span class="cx">
</span><del>- done:
</del><ins>+ done:
</ins><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -585,7 +591,7 @@
</span><span class="cx"> /* all went fine */
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx">
</span><del>- done:
</del><ins>+ done:
</ins><span class="cx"> switch_xml_free(xml);
</span><span class="cx"> return status;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribmodxml_intmod_xml_odbcxml_odbc_templatesdirectorygatewaysxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc_templates/directory-gateways.xml (14797 => 14798)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc_templates/directory-gateways.xml 2009-09-09 18:51:29 UTC (rev 14797)
+++ freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/xml_odbc_templates/directory-gateways.xml 2009-09-09 19:56:22 UTC (rev 14798)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> <document type="freeswitch/xml">
</span><span class="cx"> <section name="directory">
</span><span class="cx"> <xml-odbc-do name="set-event-header" to-name="where-clause" to-value="`${key_name}`='${key_value}'"/>
</span><del>- <xml-odbc-do name="set-event-header" if-name="where-clause" if-value="``=''" to-value="1"/>
</del><ins>+ <xml-odbc-do name="set-event-header" if-name="where-clause" if-value="``=''" to-value="1"/>
</ins><span class="cx"> <xml-odbc-do name="query" on-empty-result-break-to="not-found"
</span><span class="cx"> value="SELECT name AS domain_name FROM dir_domains WHERE ${where-clause};">
</span><span class="cx"> <domain name="${domain_name}"/>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>