<!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][15967] </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=15967">15967</a></dd>
<dt>Author</dt> <dd>mrene</dd>
<dt>Date</dt> <dd>2009-12-15 12:26:06 -0600 (Tue, 15 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>add console_complete_xml api</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_consoleh">freeswitch/trunk/src/include/switch_console.h</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc">freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_consolec">freeswitch/trunk/src/switch_console.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_consoleh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_console.h (15966 => 15967)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_console.h 2009-12-15 14:58:20 UTC (rev 15966)
+++ freeswitch/trunk/src/include/switch_console.h 2009-12-15 18:26:06 UTC (rev 15967)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> const char *last_word, switch_console_callback_match_t **matches);
</span><span class="cx"> SWITCH_DECLARE(void) switch_console_push_match(switch_console_callback_match_t **matches, const char *new_val);
</span><span class="cx"> SWITCH_DECLARE(void) switch_console_free_matches(switch_console_callback_match_t **matches);
</span><del>-SWITCH_DECLARE(unsigned char) switch_console_complete(const char *line, const char *last_word, FILE *console_out, switch_stream_handle_t *stream);
</del><ins>+SWITCH_DECLARE(unsigned char) switch_console_complete(const char *line, const char *cursor, FILE *console_out, switch_stream_handle_t *stream, switch_xml_t xml);
</ins><span class="cx">
</span><span class="cx"> SWITCH_END_EXTERN_C
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (15966 => 15967)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2009-12-15 14:58:20 UTC (rev 15966)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2009-12-15 18:26:06 UTC (rev 15967)
</span><span class="lines">@@ -785,11 +785,41 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_console_complete(cmd, cursor, NULL, stream);
</del><ins>+ switch_console_complete(cmd, cursor, NULL, stream, NULL);
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SWITCH_STANDARD_API(console_complete_xml_function)
+{
+ const char *p, *cursor = NULL;
+ int c;
+ switch_xml_t xml = switch_xml_new("complete");
+ char *sxml;
</ins><span class="cx">
</span><ins>+ if (zstr(cmd)) {
+ cmd = " ";
+ }
+
+ if ((p = strstr(cmd, "c="))) {
+ p += 2;
+ c = atoi(p);
+ if ((p = strchr(p, ';'))) {
+ cmd = p + 1;
+ cursor = cmd + c;
+ }
+ }
+
+ switch_console_complete(cmd, cursor, NULL, NULL, xml);
+
+ sxml = switch_xml_toxml(xml, SWITCH_TRUE);
+ stream->write_function(stream, "%s", sxml);
+ free(sxml);
+
+ switch_xml_free(xml);
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
</ins><span class="cx"> SWITCH_STANDARD_API(eval_function)
</span><span class="cx"> {
</span><span class="cx"> char *expanded;
</span><span class="lines">@@ -3814,6 +3844,7 @@
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "complete", "Complete", complete_function, COMPLETE_SYNTAX);
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "cond", "Eval a conditional", cond_function, "<expr> ? <true val> : <false val>");
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "console_complete", "", console_complete_function, "<line>");
</span><ins>+ SWITCH_ADD_API(commands_api_interface, "console_complete_xml", "", console_complete_xml_function, "<line>");
</ins><span class="cx"> SWITCH_ADD_API(commands_api_interface, "create_uuid", "Create a uuid", uuid_function, UUID_SYNTAX);
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "db_cache", "db cache management", db_cache_function, "status");
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "domain_exists", "check if a domain exists", domain_exists_function, "<domain>");
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_consolec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_console.c (15966 => 15967)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_console.c 2009-12-15 14:58:20 UTC (rev 15966)
+++ freeswitch/trunk/src/switch_console.c 2009-12-15 18:26:06 UTC (rev 15967)
</span><span class="lines">@@ -395,6 +395,8 @@
</span><span class="cx"> char partial[512];
</span><span class="cx"> FILE *out;
</span><span class="cx"> switch_stream_handle_t *stream;
</span><ins>+ switch_xml_t xml;
+ int xml_off;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static int comp_callback(void *pArg, int argc, char **argv, char **columnNames)
</span><span class="lines">@@ -443,6 +445,9 @@
</span><span class="cx"> if (h->stream) {
</span><span class="cx"> h->stream->write_function(h->stream, "[%20s]\t", target);
</span><span class="cx"> }
</span><ins>+ if (h->xml) {
+ switch_xml_set_txt_d(switch_xml_add_child_d(h->xml, "match", h->xml_off++), target);
+ }
</ins><span class="cx">
</span><span class="cx"> switch_copy_string(h->last, target, sizeof(h->last));
</span><span class="cx"> h->hits++;
</span><span class="lines">@@ -524,7 +529,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-SWITCH_DECLARE(unsigned char) switch_console_complete(const char *line, const char *cursor, FILE *console_out, switch_stream_handle_t *stream)
</del><ins>+SWITCH_DECLARE(unsigned char) switch_console_complete(const char *line, const char *cursor, FILE *console_out, switch_stream_handle_t *stream, switch_xml_t xml)
</ins><span class="cx"> {
</span><span class="cx"> switch_cache_db_handle_t *db = NULL;
</span><span class="cx"> char *sql = NULL;
</span><span class="lines">@@ -550,6 +555,7 @@
</span><span class="cx">
</span><span class="cx"> h.out = console_out;
</span><span class="cx"> h.stream = stream;
</span><ins>+ h.xml = xml;
</ins><span class="cx">
</span><span class="cx"> if (pos > 0) {
</span><span class="cx"> *(buf + pos) = '\0';
</span><span class="lines">@@ -671,6 +677,20 @@
</span><span class="cx"> } else if (h.hits > 1 && !zstr(h.partial)) {
</span><span class="cx"> h.stream->write_function(h.stream, "write=%d:%s", h.len, h.partial);
</span><span class="cx"> }
</span><ins>+ }
+
+ if (h.xml) {
+ switch_xml_t x_write = switch_xml_add_child_d(h.xml, "write", h.xml_off++);
+ char buf[32];
+
+ snprintf(buf, sizeof(buf), "%d", h.len);
+ switch_xml_set_attr_d_buf(x_write, "length", buf);
+
+ if (h.hits == 1 && !zstr(h.last)) {
+ switch_xml_set_txt_d(x_write, h.last);
+ } else if (h.hits > 1 && !zstr(h.partial)) {
+ switch_xml_set_txt_d(x_write, h.partial);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifdef SWITCH_HAVE_LIBEDIT
</span><span class="lines">@@ -841,7 +861,7 @@
</span><span class="cx"> {
</span><span class="cx"> const LineInfo *lf = el_line(el);
</span><span class="cx">
</span><del>- return switch_console_complete(lf->buffer, lf->cursor, switch_core_get_console(), NULL);
</del><ins>+ return switch_console_complete(lf->buffer, lf->cursor, switch_core_get_console(), NULL, NULL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>