<!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][17398] </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=17398">17398</a></dd>
<dt>Author</dt> <dd>mike</dd>
<dt>Date</dt> <dd>2010-04-26 04:06:30 -0500 (Mon, 26 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>factor out timecheck function from Moc</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_xmlh">freeswitch/trunk/src/include/switch_xml.h</a></li>
<li><a href="#freeswitchtrunksrcmoddialplansmod_dialplan_xmlmod_dialplan_xmlc">freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_xmlc">freeswitch/trunk/src/switch_xml.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_xmlh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_xml.h (17397 => 17398)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_xml.h 2010-04-26 08:30:10 UTC (rev 17397)
+++ freeswitch/trunk/src/include/switch_xml.h 2010-04-26 09:06:30 UTC (rev 17398)
</span><span class="lines">@@ -413,6 +413,8 @@
</span><span class="cx"> ///\return the section mask
</span><span class="cx"> SWITCH_DECLARE(switch_xml_section_t) switch_xml_parse_section_string(_In_opt_z_ const char *str);
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(int) switch_xml_std_datetime_check(switch_xml_t xcond);
+
</ins><span class="cx"> SWITCH_END_EXTERN_C
</span><span class="cx"> ///\}
</span><span class="cx"> #endif // _SWITCH_XML_H
</span></span></pre></div>
<a id="freeswitchtrunksrcmoddialplansmod_dialplan_xmlmod_dialplan_xmlc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (17397 => 17398)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c 2010-04-26 08:30:10 UTC (rev 17397)
+++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c 2010-04-26 09:06:30 UTC (rev 17398)
</span><span class="lines">@@ -101,19 +101,7 @@
</span><span class="cx"> switch_bool_t anti_action = SWITCH_TRUE;
</span><span class="cx"> break_t do_break_i = BREAK_ON_FALSE;
</span><span class="cx">
</span><del>- const char *xyear = switch_xml_attr(xcond, "year");
- const char *xyday = switch_xml_attr(xcond, "yday");
- const char *xmon = switch_xml_attr(xcond, "mon");
- const char *xmday = switch_xml_attr(xcond, "mday");
- const char *xweek = switch_xml_attr(xcond, "week");
- const char *xmweek = switch_xml_attr(xcond, "mweek");
- const char *xwday = switch_xml_attr(xcond, "wday");
- const char *xhour = switch_xml_attr(xcond, "hour");
- const char *xminute = switch_xml_attr(xcond, "minute");
- const char *xminday = switch_xml_attr(xcond, "minute-of-day");
- switch_time_t ts = switch_micro_time_now();
- int time_match = -1;
- switch_time_exp_t tm;
</del><ins>+ int time_match = switch_xml_std_datetime_check(xcond);
</ins><span class="cx">
</span><span class="cx"> switch_safe_free(field_expanded);
</span><span class="cx"> switch_safe_free(expression_expanded);
</span><span class="lines">@@ -124,81 +112,6 @@
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_time_exp_lt(&tm, ts);
-
- if (time_match && xyear) {
- int test = tm.tm_year + 1900;
- time_match = switch_number_cmp(xyear, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: year[%d] =~ %s (%s)\n", test, xyear, time_match ? "PASS" : "FAIL");
- }
-
- if (time_match && xyday) {
- int test = tm.tm_yday + 1;
- time_match = switch_number_cmp(xyday, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: day of year[%d] =~ %s (%s)\n", test, xyday, time_match ? "PASS" : "FAIL");
- }
-
- if (time_match && xmon) {
- int test = tm.tm_mon + 1;
- time_match = switch_number_cmp(xmon, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: month[%d] =~ %s (%s)\n", test, xmon, time_match ? "PASS" : "FAIL");
- }
-
- if (time_match && xmday) {
- int test = tm.tm_mday;
- time_match = switch_number_cmp(xmday, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: day of month[%d] =~ %s (%s)\n", test, xmday, time_match ? "PASS" : "FAIL");
- }
-
- if (time_match && xweek) {
- int test = (int) (tm.tm_yday / 7 + 1);
- time_match = switch_number_cmp(xweek, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: week of year[%d] =~ %s (%s)\n", test, xweek, time_match ? "PASS" : "FAIL");
- }
-
- if (time_match && xmweek) {
- /* calculate the day of the week of the first of the month (0-6) */
- int firstdow = (int) (7 - (tm.tm_mday - (tm.tm_wday + 1)) % 7) % 7;
- /* calculate the week of the month (1-6) */
- int test = (int) ceil((tm.tm_mday + firstdow) / 7.0);
- time_match = switch_number_cmp(xmweek, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: week of month[%d] =~ %s (%s)\n", test, xmweek, time_match ? "PASS" : "FAIL");
- }
-
- if (time_match && xwday) {
- int test = tm.tm_wday + 1;
- time_match = switch_number_cmp(xwday, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: day of week[%d] =~ %s (%s)\n", test, xwday, time_match ? "PASS" : "FAIL");
- }
-
- if (time_match && xhour) {
- int test = tm.tm_hour;
- time_match = switch_number_cmp(xhour, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: hour[%d] =~ %s (%s)\n", test, xhour, time_match ? "PASS" : "FAIL");
- }
-
- if (time_match && xminute) {
- int test = tm.tm_min;
- time_match = switch_number_cmp(xminute, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: minute[%d] =~ %s (%s)\n", test, xminute, time_match ? "PASS" : "FAIL");
- }
-
- if (time_match && xminday) {
- int test = (tm.tm_hour * 60) + (tm.tm_min + 1);
- time_match = switch_number_cmp(xminday, test);
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: minute of day[%d] =~ %s (%s)\n", test, xminday, time_match ? "PASS" : "FAIL");
- }
-
</del><span class="cx"> field = (char *) switch_xml_attr(xcond, "field");
</span><span class="cx">
</span><span class="cx"> if ((xexpression = switch_xml_child(xcond, "expression"))) {
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_xmlc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_xml.c (17397 => 17398)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_xml.c 2010-04-26 08:30:10 UTC (rev 17397)
+++ freeswitch/trunk/src/switch_xml.c 2010-04-26 09:06:30 UTC (rev 17398)
</span><span class="lines">@@ -2601,6 +2601,107 @@
</span><span class="cx"> return xml;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(int) switch_xml_std_datetime_check(switch_xml_t xcond) {
+
+ const char *xyear = switch_xml_attr(xcond, "year");
+ const char *xyday = switch_xml_attr(xcond, "yday");
+ const char *xmon = switch_xml_attr(xcond, "mon");
+ const char *xmday = switch_xml_attr(xcond, "mday");
+ const char *xweek = switch_xml_attr(xcond, "week");
+ const char *xmweek = switch_xml_attr(xcond, "mweek");
+ const char *xwday = switch_xml_attr(xcond, "wday");
+ const char *xhour = switch_xml_attr(xcond, "hour");
+ const char *xminute = switch_xml_attr(xcond, "minute");
+ const char *xminday = switch_xml_attr(xcond, "minute-of-day");
+
+ switch_time_t ts = switch_micro_time_now();
+ int time_match = -1;
+ switch_time_exp_t tm;
+
+ switch_time_exp_lt(&tm, ts);
+
+ if (time_match && xyear) {
+ int test = tm.tm_year + 1900;
+ time_match = switch_number_cmp(xyear, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: year[%d] =~ %s (%s)\n", test, xyear, time_match ? "PASS" : "FAIL");
+ }
+
+ if (time_match && xyday) {
+ int test = tm.tm_yday + 1;
+ time_match = switch_number_cmp(xyday, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: day of year[%d] =~ %s (%s)\n", test, xyday, time_match ? "PASS" : "FAIL");
+ }
+
+ if (time_match && xmon) {
+ int test = tm.tm_mon + 1;
+ time_match = switch_number_cmp(xmon, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: month[%d] =~ %s (%s)\n", test, xmon, time_match ? "PASS" : "FAIL");
+ }
+
+ if (time_match && xmday) {
+ int test = tm.tm_mday;
+ time_match = switch_number_cmp(xmday, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: day of month[%d] =~ %s (%s)\n", test, xmday, time_match ? "PASS" : "FAIL");
+ }
+
+ if (time_match && xweek) {
+ int test = (int) (tm.tm_yday / 7 + 1);
+ time_match = switch_number_cmp(xweek, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: week of year[%d] =~ %s (%s)\n", test, xweek, time_match ? "PASS" : "FAIL");
+ }
+ if (time_match && xweek) {
+ int test = (int) (tm.tm_yday / 7 + 1);
+ time_match = switch_number_cmp(xweek, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: week of year[%d] =~ %s (%s)\n", test, xweek, time_match ? "PASS" : "FAIL");
+ }
+
+ if (time_match && xmweek) {
+ /* calculate the day of the week of the first of the month (0-6) */
+ int firstdow = (int) (7 - (tm.tm_mday - (tm.tm_wday + 1)) % 7) % 7;
+ /* calculate the week of the month (1-6)*/
+ int test = (int) ceil((tm.tm_mday + firstdow) / 7.0);
+ time_match = switch_number_cmp(xmweek, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime: week of month[%d] =~ %s (%s)\n", test, xmweek, time_match ? "PASS" : "FAIL");
+ }
+
+ if (time_match && xwday) {
+ int test = tm.tm_wday + 1;
+ time_match = switch_number_cmp(xwday, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: day of week[%d] =~ %s (%s)\n", test, xwday, time_match ? "PASS" : "FAIL");
+ }
+ if (time_match && xhour) {
+ int test = tm.tm_hour;
+ time_match = switch_number_cmp(xhour, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: hour[%d] =~ %s (%s)\n", test, xhour, time_match ? "PASS" : "FAIL");
+ }
+
+ if (time_match && xminute) {
+ int test = tm.tm_min;
+ time_match = switch_number_cmp(xminute, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: minute[%d] =~ %s (%s)\n", test, xminute, time_match ? "PASS" : "FAIL");
+ }
+
+ if (time_match && xminday) {
+ int test = (tm.tm_hour * 60) + (tm.tm_min + 1);
+ time_match = switch_number_cmp(xminday, test);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG9,
+ "XML DateTime Check: minute of day[%d] =~ %s (%s)\n", test, xminday, time_match ? "PASS" : "FAIL");
+ }
+
+ return time_match;
+}
+
+
</ins><span class="cx"> #ifdef WIN32
</span><span class="cx"> /*
</span><span class="cx"> * globbing functions for windows, part of libc on unix, this code was cut and paste from
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>