<!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][14138] </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=14138">14138</a></dd>
<dt>Author</dt> <dd>ledr</dd>
<dt>Date</dt> <dd>2009-07-06 14:09:12 -0500 (Mon, 06 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>factored out xml_odbc_render_children</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>
</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 (14137 => 14138)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c 2009-07-06 18:31:23 UTC (rev 14137)
+++ freeswitch/trunk/contrib/mod/xml_int/mod_xml_odbc/mod_xml_odbc.c 2009-07-06 19:09:12 UTC (rev 14138)
</span><span class="lines">@@ -62,7 +62,6 @@
</span><span class="cx"> switch_memory_pool_t *pool; /* memory pool that is destroyed at the end of the session to ease free'ing */
</span><span class="cx"> char *next_template_name; /* the name of the next template that has to be rendered */
</span><span class="cx"> switch_event_t *event; /* contains headers which is a hash that can easily be expanded ${var} to *chars */
</span><del>- switch_xml_t xml_in; /* root tag of xml template that is rendered from */
</del><span class="cx"> switch_xml_t xml_in_cur; /* current tag in xml template that is rendered from */
</span><span class="cx"> switch_xml_t xml_out; /* root tag of xml that is rendered to */
</span><span class="cx"> switch_xml_t xml_out_cur; /* current tag in xml that is rendered to */
</span><span class="lines">@@ -71,8 +70,9 @@
</span><span class="cx"> int tmp_i; /* temporary counter, used for counting rows in the callback */
</span><span class="cx"> } xml_odbc_session_helper_t;
</span><span class="cx">
</span><del>-static switch_status_t xml_odbc_render_template(xml_odbc_session_helper_t *helper);
</del><span class="cx"> static switch_status_t xml_odbc_render_tag(xml_odbc_session_helper_t *helper);
</span><ins>+static switch_status_t xml_odbc_render_children(xml_odbc_session_helper_t *helper);
+static switch_status_t xml_odbc_render_template(xml_odbc_session_helper_t *helper);
</ins><span class="cx">
</span><span class="cx"> #define XML_ODBC_SYNTAX "[debug_on|debug_off]"
</span><span class="cx">
</span><span class="lines">@@ -121,15 +121,12 @@
</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>- switch_xml_t xml_in_cur_tmp, xml_out_cur_tmp, xml_in_child;
</del><span class="cx"> int i;
</span><span class="cx">
</span><del>-switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "INSIDE CALLBACK FUNCTION\n");
-
</del><span class="cx"> if (!switch_strlen_zero(helper->next_template_name)) goto done;
</span><span class="cx">
</span><span class="cx"> /* up the row counter */
</span><del>- helper->tmp_i++; // TODO: THIS WILL GO WRONG FOR NESTED QUERIES.. THINK ABOUT IT !!!
</del><ins>+ helper->tmp_i++; // TODO: WILL THIS GO WRONG FOR NESTED QUERIES ?? THINK ABOUT IT !!!
</ins><span class="cx">
</span><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="lines">@@ -137,21 +134,8 @@
</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><del>- /* temporarily save helper->xml_in_cur and helper->xml_out_cur so they can be restored later */
- xml_in_cur_tmp = helper->xml_in_cur;
- xml_out_cur_tmp = helper->xml_out_cur;
</del><ins>+ xml_odbc_render_children(helper);
</ins><span class="cx">
</span><del>- /* render all children of xml_in_cur */
- for (xml_in_child = helper->xml_in_cur->child; xml_in_child; xml_in_child = xml_in_child->ordered) {
- helper->xml_in_cur = xml_in_child;
- xml_odbc_render_tag(helper);
- if (!switch_strlen_zero(helper->next_template_name)) goto done;
- }
-
- /* restore helper->xml_in_cur and helper->xml_out_cur */
- helper->xml_in_cur = xml_in_cur_tmp;
- helper->xml_out_cur = xml_out_cur_tmp;
-
</del><span class="cx"> done:
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -172,7 +156,7 @@
</span><span class="cx"> char *if_name = (char *) switch_xml_attr_soft(helper->xml_in_cur, "if-name");
</span><span class="cx"> char *if_value = (char *) switch_xml_attr_soft(helper->xml_in_cur, "if-value");
</span><span class="cx"> char *tmp_value;
</span><del>- switch_xml_t xml_in_tmp;
</del><ins>+ switch_status_t status = SWITCH_STATUS_FALSE;
</ins><span class="cx">
</span><span class="cx"> if (switch_strlen_zero(if_name)) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ignoring xml-odbc-do name=[%s] because no if-name is given\n", name);
</span><span class="lines">@@ -182,18 +166,13 @@
</span><span class="cx"> if ((tmp_value = switch_event_get_header(helper->event, if_name))) {
</span><span class="cx"> if (!switch_strlen_zero(tmp_value)) {
</span><span class="cx"> if (switch_strlen_zero(if_value) || !strcasecmp(if_value, tmp_value)) {
</span><del>- for (xml_in_tmp = helper->xml_in_cur->child; xml_in_tmp; xml_in_tmp = xml_in_tmp->ordered) {
- helper->xml_in_cur = xml_in_tmp;
- xml_odbc_render_tag(helper);
-
- if (!switch_strlen_zero(helper->next_template_name)) goto done;
- }
</del><ins>+ status = xml_odbc_render_children(helper);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> done:
</span><del>- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return status;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static switch_status_t xml_odbc_do_set_event_header(xml_odbc_session_helper_t *helper)
</span><span class="lines">@@ -250,9 +229,9 @@
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* render tag helper->xml_in_cur */
</ins><span class="cx"> static switch_status_t xml_odbc_render_tag(xml_odbc_session_helper_t *helper)
</span><span class="cx"> {
</span><del>- switch_xml_t xml_in_tmp, xml_out_tmp;
</del><span class="cx"> switch_status_t status = SWITCH_STATUS_FALSE;
</span><span class="cx"> int i;
</span><span class="cx">
</span><span class="lines">@@ -294,32 +273,47 @@
</span><span class="cx"> switch_xml_set_attr(helper->xml_out_cur, helper->xml_in_cur->attr[i], tmp_value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* render all children */
- xml_out_tmp = helper->xml_out_cur;
- for (xml_in_tmp = helper->xml_in_cur->child; xml_in_tmp; xml_in_tmp = xml_in_tmp->ordered) {
- helper->xml_in_cur = xml_in_tmp;
- if (xml_odbc_render_tag(helper) != SWITCH_STATUS_SUCCESS) {
- goto done;
- }
</del><ins>+ status = xml_odbc_render_children(helper);
</ins><span class="cx">
</span><del>- if (!switch_strlen_zero(helper->next_template_name)) {
- status = SWITCH_STATUS_SUCCESS;
- goto done;
- }
</del><ins>+ done:
+ return status;
+}
</ins><span class="cx">
</span><del>- helper->xml_out_cur = xml_out_tmp;
</del><ins>+/* render all children of helper->xml_in_cur */
+static switch_status_t xml_odbc_render_children(xml_odbc_session_helper_t *helper)
+{
+ switch_xml_t xml_in_cur_tmp, xml_out_cur_tmp, xml_in_cur_child;
+ switch_status_t status = SWITCH_STATUS_FALSE;
+
+ /* temporarily save helper->xml_in_cur and helper->xml_out_cur so they can be restored later */
+ xml_in_cur_tmp = helper->xml_in_cur;
+ xml_out_cur_tmp = helper->xml_out_cur;
+
+ /* render all children of xml_in_cur */
+ for (xml_in_cur_child = helper->xml_in_cur->child; xml_in_cur_child; xml_in_cur_child = xml_in_cur_child->ordered) {
+ helper->xml_in_cur = xml_in_cur_child;
+
+ xml_odbc_render_tag(helper);
+
+ /* restore helper->xml_out_cur in case it was changed during render_tag */
+ helper->xml_out_cur = xml_out_cur_tmp;
+
+ if (!switch_strlen_zero(helper->next_template_name)) goto done;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx">
</span><span class="cx"> done:
</span><del>- return status;
</del><ins>+ /* restore helper->xml_in_cur in case it was changed during render_tag */
+ helper->xml_in_cur = xml_in_cur_tmp;
+
+ return status;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+/* free xml_out and render template given by name helper->next_template_name */
</ins><span class="cx"> static switch_status_t xml_odbc_render_template(xml_odbc_session_helper_t *helper)
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_FALSE;
</span><del>- switch_xml_t xml_tmp;
</del><span class="cx">
</span><span class="cx"> if (globals.debug == SWITCH_TRUE) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "DEBUG GOING TO RENDER TEMPLATE [%s]\n", helper->next_template_name);
</span><span class="lines">@@ -336,7 +330,7 @@
</span><span class="cx"> /* free helper -> xml_out */
</span><span class="cx"> switch_xml_free(helper->xml_out);
</span><span class="cx">
</span><del>- /* init helper-> xml_out and xml_out_cur */
</del><ins>+ /* init helper-> xml_out xml_out_cur to the same address */
</ins><span class="cx"> if (!(helper->xml_out = helper->xml_out_cur = switch_xml_new(""))) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Allocation Error!\n");
</span><span class="cx"> helper->next_template_name = "";
</span><span class="lines">@@ -347,28 +341,18 @@
</span><span class="cx"> helper->xml_out_cur_off = 0;
</span><span class="cx">
</span><span class="cx"> /* render children */
</span><del>- if ((helper->xml_in = helper->xml_in_cur = switch_xml_find_child(globals.templates_tag, "template", "name", helper->next_template_name))) {
- for (xml_tmp = helper->xml_in_cur->child; xml_tmp; xml_tmp = xml_tmp->ordered) {
- helper->xml_in_cur = xml_tmp;
- helper->next_template_name = "";
- if (xml_odbc_render_tag(helper) != SWITCH_STATUS_SUCCESS) {
- goto done;
- }
-
- if (!switch_strlen_zero(helper->next_template_name)) {
- goto reset;
- }
- }
</del><ins>+ if ((helper->xml_in_cur = switch_xml_find_child(globals.templates_tag, "template", "name", helper->next_template_name))) {
+ helper->next_template_name = "";
+ status = xml_odbc_render_children(helper);
+ if (!switch_strlen_zero(helper->next_template_name)) goto reset;
</ins><span class="cx"> } else {
</span><span class="cx"> helper->next_template_name = "not-found";
</span><span class="cx"> goto reset;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- status = SWITCH_STATUS_SUCCESS;
</del><span class="cx"> goto done;
</span><span class="cx">
</span><span class="cx"> reset:
</span><del>- /* remove all children of helper->xml_out here */
</del><span class="cx"> status = xml_odbc_render_template(helper);
</span><span class="cx">
</span><span class="cx"> done:
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>