<!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][14853] </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=14853">14853</a></dd>
<dt>Author</dt> <dd>ledr</dd>
<dt>Date</dt> <dd>2009-09-14 16:36:08 -0500 (Mon, 14 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>switch_xml_t globals.queries is replaced by switch_xml_hash, no worky yet :-|</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribledrcmod_odbc_querymod_odbc_queryc">freeswitch/trunk/contrib/ledr/c/mod_odbc_query/mod_odbc_query.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribledrcmod_odbc_querymod_odbc_queryc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/ledr/c/mod_odbc_query/mod_odbc_query.c (14852 => 14853)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/ledr/c/mod_odbc_query/mod_odbc_query.c 2009-09-14 20:10:58 UTC (rev 14852)
+++ freeswitch/trunk/contrib/ledr/c/mod_odbc_query/mod_odbc_query.c 2009-09-14 21:36:08 UTC (rev 14853)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> char *odbc_dsn;
</span><span class="cx"> switch_memory_pool_t *pool;
</span><span class="cx"> switch_odbc_handle_t *odbc_handle;
</span><del>- switch_xml_t queries;
</del><ins>+ switch_hash_t *queries_hash;
</ins><span class="cx"> } globals;
</span><span class="cx">
</span><span class="cx"> static char* switch_channel_expand_variables_by_pool(switch_memory_pool_t *pool, switch_channel_t *channel, const char *in)
</span><span class="lines">@@ -75,9 +75,12 @@
</span><span class="cx"> static switch_status_t do_config(switch_bool_t reload)
</span><span class="cx"> {
</span><span class="cx"> char *cf = "odbc_query.conf";
</span><del>- switch_xml_t cfg, xml = NULL, param, settings, queries;
</del><ins>+ switch_xml_t cfg, xml = NULL, settings, param, queries, query;
</ins><span class="cx"> char *odbc_user = NULL;
</span><span class="cx"> char *odbc_pass = NULL;
</span><ins>+ switch_hash_index_t *hi;
+ void *val;
+ char *query_name;
</ins><span class="cx">
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_FALSE;
</span><span class="cx">
</span><span class="lines">@@ -104,6 +107,27 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* get queries and put them in globals.queries_hash */
+ if ((queries = switch_xml_child(cfg, "queries"))) {
+ for (query = switch_xml_child(queries, "query"); query; query = query->next) {
+ char *var = (char *) switch_xml_attr_soft(param, "name");
+ char *val = (char *) switch_xml_attr_soft(param, "value");
+ if (!switch_strlen_zero(var) && !switch_strlen_zero(val)) {
+ switch_core_hash_insert(globals.queries_hash, var, val);
+ }
+ }
+ }
+
+ /* remove entries from globals.queries_hash that are not in current configuration */
+ for (hi = switch_hash_first(NULL, globals.queries_hash); hi;) {
+ switch_hash_this(hi, NULL, NULL, &val);
+ query_name = (char *) val;
+ hi = switch_hash_next(hi); /* if this works, I'm going to eat my shoe */
+ if (!switch_xml_find_child(queries, "query", "name", query_name)) {
+ switch_core_hash_delete(globals.queries_hash, query_name);
+ }
+ }
+
</ins><span class="cx"> /* check if odbc_dsn is set */
</span><span class="cx"> if (!globals.odbc_dsn) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No odbc-dsn setting is set!\n");
</span><span class="lines">@@ -126,11 +150,6 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connected ODBC DSN: [%s]\n", globals.odbc_dsn);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* copy entire queries xml section to globals */
- if ((queries = switch_xml_child(cfg, "queries"))) {
- memcpy(&globals.queries, &queries, sizeof(queries));
- }
-
</del><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx">
</span><span class="cx"> done:
</span><span class="lines">@@ -138,54 +157,38 @@
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void event_handler(switch_event_t *event)
</del><ins>+static void reload_event_handler(switch_event_t *event)
</ins><span class="cx"> {
</span><span class="cx"> do_config(SWITCH_TRUE);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SWITCH_STANDARD_API(odbc_query_function)
-{
- do_config(SWITCH_TRUE);
-
- return SWITCH_STATUS_SUCCESS;
-}
-
</del><span class="cx"> SWITCH_STANDARD_APP(odbc_query_app_function)
</span><span class="cx"> {
</span><span class="cx"> char *query = NULL;
</span><span class="cx"> char *expanded_query = NULL;
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="cx"> switch_memory_pool_t *pool = switch_core_session_get_pool(session);
</span><del>- switch_xml_t stored_query;
</del><span class="cx">
</span><span class="cx"> if (!channel) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* get query from data if it contains space, otherwise get it from <queries> section in configuration */
</del><ins>+ if (!data || switch_strlen_zero(data)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No query provided!\n");
+ }
+
+ /* get query from data if it contains space, otherwise get it from globals.queries_hash */
</ins><span class="cx"> if (strchr(data, ' ')) {
</span><span class="cx"> query = switch_core_session_strdup(session, data);
</span><del>- } else {
- if (globals.queries) {
- for (stored_query = switch_xml_child(globals.queries, "query"); stored_query; stored_query = stored_query->next) {
- if (!strcmp(switch_xml_attr_soft(stored_query, "name"), data)) {
- query = switch_core_session_strdup(session, switch_xml_attr_soft(stored_query, "value"));
- }
- }
- }
- if (!query) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find a query named: [%s]\n", data);
- return;
- }
- }
-
- if (!query) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No query defined!\n");
</del><ins>+ } else if (!(query = switch_core_hash_find(globals.queries_hash, data))) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not find a query named: [%s]\n", data);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> expanded_query = switch_channel_expand_variables_by_pool(pool, channel, query);
</span><span class="cx">
</span><ins>+ /* TODO is it possible that expanded_query now still points points to an entry in globals.queries_hash ?! */
+
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Performing query: [%s]\n", expanded_query);
</span><span class="cx">
</span><span class="cx"> if (switch_odbc_handle_callback_exec(globals.odbc_handle, expanded_query, odbc_query_callback, channel) != SWITCH_ODBC_SUCCESS) {
</span><span class="lines">@@ -196,30 +199,37 @@
</span><span class="cx"> /* Macro expands to: switch_status_t mod_odbc_query_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */
</span><span class="cx"> SWITCH_MODULE_LOAD_FUNCTION(mod_odbc_query_load)
</span><span class="cx"> {
</span><del>- switch_api_interface_t *api_interface;
</del><span class="cx"> switch_application_interface_t *app_interface;
</span><span class="cx">
</span><span class="cx"> memset(&globals, 0, sizeof(globals));
</span><span class="cx">
</span><del>- switch_core_new_memory_pool(&globals.pool);
</del><ins>+ globals.pool = pool;
</ins><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ODBC Query module loading...\n");
</span><span class="cx">
</span><ins>+ /* allocate the queries hash */
+ //if (switch_core_hash_init(&globals->queries_hash, globals.pool) != SWITCH_STATUS_SUCCESS) {
+ if (switch_core_hash_init(&globals.queries_hash, globals.pool) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error initializing the queries hash\n");
+ return SWITCH_STATUS_GENERR;
+ }
+
</ins><span class="cx"> if (do_config(SWITCH_FALSE) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to load xml_odbc config file\n");
</span><ins>+ /* TODO what about freeing queries_hash and pool here ? */
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* connect my internal structure to the blank pointer passed to me */
</span><span class="cx"> *module_interface = switch_loadable_module_create_module_interface(pool, modname);
</span><span class="cx">
</span><del>- /* subscribe to reloadxml event, and hook it to event_handler */
- if ((switch_event_bind_removable(modname, SWITCH_EVENT_RELOADXML, NULL, event_handler, NULL, &NODE) != SWITCH_STATUS_SUCCESS)) {
</del><ins>+ /* subscribe to reloadxml event, and hook it to reload_event_handler */
+ if ((switch_event_bind_removable(modname, SWITCH_EVENT_RELOADXML, NULL, reload_event_handler, NULL, &NODE) != SWITCH_STATUS_SUCCESS)) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind event!\n");
</span><ins>+ /* TODO what about freeing queries_hash and pool here ? */
</ins><span class="cx"> return SWITCH_STATUS_TERM;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- SWITCH_ADD_API(api_interface, "odbc_query", "ODBC Query API", odbc_query_function, "");
</del><span class="cx"> SWITCH_ADD_APP(app_interface, "odbc_query", "Perform an ODBC query", "Perform an ODBC query", odbc_query_app_function, "<query|query-name>", SAF_SUPPORT_NOMEDIA);
</span><span class="cx">
</span><span class="cx"> /* indicate that the module should continue to be loaded */
</span><span class="lines">@@ -233,9 +243,8 @@
</span><span class="cx"> {
</span><span class="cx"> switch_odbc_handle_disconnect(globals.odbc_handle);
</span><span class="cx"> switch_odbc_handle_destroy(&globals.odbc_handle);
</span><ins>+ switch_core_hash_destroy(&globals.queries_hash);
</ins><span class="cx">
</span><del>- switch_xml_free(globals.queries);
-
</del><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>