<!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][14311] </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=14311">14311</a></dd>
<dt>Author</dt> <dd>rupa</dd>
<dt>Date</dt> <dd>2009-07-21 13:43:00 -0500 (Tue, 21 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>add "as xml" option</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_lcrmod_lcrc">freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_lcrmod_lcrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (14310 => 14311)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c 2009-07-21 17:56:12 UTC (rev 14310)
+++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c 2009-07-21 18:43:00 UTC (rev 14311)
</span><span class="lines">@@ -1148,8 +1148,8 @@
</span><span class="cx"> {
</span><span class="cx"> size_t i;
</span><span class="cx">
</span><del>- /*//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "repeating %d of '%s'\n", how_many, what);*/
-
</del><ins>+ /*switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "repeating %d of '%s'\n", (int)how_many, what);*/
+
</ins><span class="cx"> for (i=0; i<how_many; i++) {
</span><span class="cx"> str_stream->write_function(str_stream, "%s", what);
</span><span class="cx"> }
</span><span class="lines">@@ -1258,6 +1258,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void write_data(switch_stream_handle_t *stream, switch_bool_t as_xml, const char *key, const char *data, int indent, int maxlen) {
+ if (as_xml) {
+ str_repeat(indent*2, " ", stream);
+ stream->write_function(stream, "<%s>%s</%s>\n", key, data, key);
+ } else {
+ stream->write_function(stream, " | %s", data);
+ str_repeat((maxlen - strlen(data)), " ", stream);
+ }
+}
+
</ins><span class="cx"> SWITCH_STANDARD_API(dialplan_lcr_function)
</span><span class="cx"> {
</span><span class="cx"> char *argv[4] = { 0 };
</span><span class="lines">@@ -1271,6 +1281,8 @@
</span><span class="cx"> switch_memory_pool_t *pool;
</span><span class="cx"> switch_event_t *event;
</span><span class="cx"> switch_status_t lookup_status = SWITCH_STATUS_SUCCESS;
</span><ins>+ switch_bool_t as_xml = SWITCH_FALSE;
+ int rowcount=0;
</ins><span class="cx">
</span><span class="cx"> if (switch_strlen_zero(cmd)) {
</span><span class="cx"> goto usage;
</span><span class="lines">@@ -1304,6 +1316,13 @@
</span><span class="cx"> if (!strcasecmp(argv[i], "intrastate")) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Select routes based on intrastate rates\n");
</span><span class="cx"> cb_struct.intrastate = SWITCH_TRUE;
</span><ins>+ } else if(!strcasecmp(argv[i], "as")) {
+ i++;
+ if(argv[i] && !strcasecmp(argv[i], "xml")) {
+ as_xml = SWITCH_TRUE;
+ } else {
+ goto usage;
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Caller ID to [%s]\n", argv[i]);
</span><span class="cx"> /* the only other option we have right now is caller id */
</span><span class="lines">@@ -1329,95 +1348,103 @@
</span><span class="cx"> if (cb_struct.head != NULL) {
</span><span class="cx"> size_t len;
</span><span class="cx">
</span><del>- process_max_lengths(&maximum_lengths, cb_struct.head, cb_struct.lookup_number);
</del><ins>+ if (as_xml) {
+ stream->write_function(stream, "<result>\n");
+ } else {
+ process_max_lengths(&maximum_lengths, cb_struct.head, cb_struct.lookup_number);
</ins><span class="cx">
</span><del>- stream->write_function(stream, " | %s", headers[LCR_HEADERS_DIGITS]);
- if ((len = (maximum_lengths.digit_str - strlen(headers[LCR_HEADERS_DIGITS]))) > 0) {
- str_repeat(len, " ", stream);
- }
</del><ins>+ stream->write_function(stream, " | %s", headers[LCR_HEADERS_DIGITS]);
+ if ((len = (maximum_lengths.digit_str - strlen(headers[LCR_HEADERS_DIGITS]))) > 0) {
+ str_repeat(len, " ", stream);
+ }
</ins><span class="cx">
</span><del>- stream->write_function(stream, " | %s", headers[LCR_HEADERS_CARRIER]);
- if ((len = (maximum_lengths.carrier_name - strlen(headers[LCR_HEADERS_CARRIER]))) > 0) {
- str_repeat(len, " ", stream);
- }
</del><ins>+ stream->write_function(stream, " | %s", headers[LCR_HEADERS_CARRIER]);
+ if ((len = (maximum_lengths.carrier_name - strlen(headers[LCR_HEADERS_CARRIER]))) > 0) {
+ str_repeat(len, " ", stream);
+ }
</ins><span class="cx">
</span><del>- stream->write_function(stream, " | %s", headers[LCR_HEADERS_RATE]);
- if ((len = (maximum_lengths.rate - strlen(headers[LCR_HEADERS_RATE]))) > 0) {
- str_repeat(len, " ", stream);
- }
</del><ins>+ stream->write_function(stream, " | %s", headers[LCR_HEADERS_RATE]);
+ if ((len = (maximum_lengths.rate - strlen(headers[LCR_HEADERS_RATE]))) > 0) {
+ str_repeat(len, " ", stream);
+ }
</ins><span class="cx">
</span><del>- stream->write_function(stream, " | %s", headers[LCR_HEADERS_CODEC]);
- if ((len = (maximum_lengths.codec - strlen(headers[LCR_HEADERS_CODEC]))) > 0) {
- str_repeat(len, " ", stream);
- }
</del><ins>+ stream->write_function(stream, " | %s", headers[LCR_HEADERS_CODEC]);
+ if ((len = (maximum_lengths.codec - strlen(headers[LCR_HEADERS_CODEC]))) > 0) {
+ str_repeat(len, " ", stream);
+ }
</ins><span class="cx">
</span><del>- stream->write_function(stream, " | %s", headers[LCR_HEADERS_CID]);
- if ((len = (maximum_lengths.cid - strlen(headers[LCR_HEADERS_CID]))) > 0) {
- str_repeat(len, " ", stream);
- }
</del><ins>+ stream->write_function(stream, " | %s", headers[LCR_HEADERS_CID]);
+ if ((len = (maximum_lengths.cid - strlen(headers[LCR_HEADERS_CID]))) > 0) {
+ str_repeat(len, " ", stream);
+ }
</ins><span class="cx">
</span><del>- stream->write_function(stream, " | %s", headers[LCR_HEADERS_DIALSTRING]);
- if ((len = (maximum_lengths.dialstring - strlen(headers[LCR_HEADERS_DIALSTRING]))) > 0) {
- str_repeat(len, " ", stream);
</del><ins>+ stream->write_function(stream, " | %s", headers[LCR_HEADERS_DIALSTRING]);
+ if ((len = (maximum_lengths.dialstring - strlen(headers[LCR_HEADERS_DIALSTRING]))) > 0) {
+ str_repeat(len, " ", stream);
+ }
+
+ stream->write_function(stream, " |\n");
</ins><span class="cx"> }
</span><del>-
- stream->write_function(stream, " |\n");
-
</del><span class="cx"> current = cb_struct.head;
</span><span class="cx"> while (current) {
</span><span class="cx">
</span><span class="cx"> dialstring = get_bridge_data(pool, cb_struct.lookup_number, cb_struct.cid, current, cb_struct.profile, cb_struct.session);
</span><ins>+ rowcount++;
</ins><span class="cx">
</span><del>- stream->write_function(stream, " | %s", current->digit_str);
- str_repeat((maximum_lengths.digit_str - current->digit_len), " ", stream);
</del><ins>+ if (as_xml) {
+ stream->write_function(stream, " <row id=\"%d\">\n", rowcount);
+ }
</ins><span class="cx">
</span><del>- stream->write_function(stream, " | %s", current->carrier_name );
- str_repeat((maximum_lengths.carrier_name - strlen(current->carrier_name)), " ", stream);
-
- stream->write_function(stream, " | %s", current->rate_str );
- str_repeat((maximum_lengths.rate - strlen(current->rate_str)), " ", stream);
-
</del><ins>+ write_data(stream, as_xml, "prefix", current->digit_str, 2, maximum_lengths.digit_str);
+ write_data(stream, as_xml, "carrier_name", current->carrier_name, 2, maximum_lengths.carrier_name);
+ write_data(stream, as_xml, "rate", current->rate_str, 2, maximum_lengths.rate);
</ins><span class="cx"> if (current->codec) {
</span><del>- stream->write_function(stream, " | %s", current->codec );
- str_repeat((maximum_lengths.codec - strlen(current->codec)), " ", stream);
</del><ins>+ write_data(stream, as_xml, "codec", current->codec, 2, maximum_lengths.codec);
</ins><span class="cx"> } else {
</span><del>- stream->write_function(stream, " | ");
- str_repeat((maximum_lengths.codec), " ", stream);
</del><ins>+ write_data(stream, as_xml, "codec", "", 2, maximum_lengths.codec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (current->cid) {
</span><del>- stream->write_function(stream, " | %s", current->cid );
- str_repeat((maximum_lengths.cid - strlen(current->cid)), " ", stream);
</del><ins>+ write_data(stream, as_xml, "cid", current->cid, 2, maximum_lengths.cid);
</ins><span class="cx"> } else {
</span><del>- stream->write_function(stream, " | ");
- str_repeat((maximum_lengths.cid), " ", stream);
</del><ins>+ write_data(stream, as_xml, "cid", "", 2, maximum_lengths.cid);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- stream->write_function(stream, " | %s", dialstring);
- str_repeat((maximum_lengths.dialstring - strlen(dialstring)), " ", stream);
-
- stream->write_function(stream, " |\n");
-
</del><ins>+ write_data(stream, as_xml, "dialstring", current->dialstring, 2, maximum_lengths.dialstring);
+
+ if (as_xml) {
+ stream->write_function(stream, " </row>\n");
+ } else {
+ stream->write_function(stream, " |\n");
+ }
</ins><span class="cx"> current = current->next;
</span><span class="cx"> }
</span><del>-
</del><ins>+ if (as_xml) {
+ stream->write_function(stream, "</result>\n");
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> if (lookup_status == SWITCH_STATUS_SUCCESS) {
</span><del>- stream->write_function(stream, "No Routes To Display\n");
</del><ins>+ if (as_xml) {
+ stream->write_function(stream, "<result row_count=\"0\">\n</results>\n");
+ } else {
+ stream->write_function(stream, "No Routes To Display\n");
+ }
</ins><span class="cx"> } else {
</span><del>- stream->write_function(stream, "Error looking up routes\n");
</del><ins>+ stream->write_function(stream, "-ERR Error looking up routes\n");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> end:
</span><span class="cx"> if (!session) {
</span><del>- switch_core_destroy_memory_pool(&pool);
</del><ins>+ if (pool) {
+ switch_core_destroy_memory_pool(&pool);
+ }
</ins><span class="cx"> }
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><del>- usage:
</del><ins>+usage:
</ins><span class="cx"> stream->write_function(stream, "USAGE: %s\n", LCR_SYNTAX);
</span><del>- return SWITCH_STATUS_SUCCESS;
</del><ins>+ goto end;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SWITCH_STANDARD_API(dialplan_lcr_admin_function)
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>