<!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][14559] </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=14559">14559</a></dd>
<dt>Author</dt> <dd>diegoviola</dd>
<dt>Date</dt> <dd>2009-08-18 19:12:48 -0500 (Tue, 18 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>lets keep our event socket script only for database lookups and use the dialplan for call logic</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribdiegoviolarubycallcardcallcardrb">freeswitch/trunk/contrib/diegoviola/ruby/callcard/callcard.rb</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribdiegoviolarubycallcarddefaultxml">freeswitch/trunk/contrib/diegoviola/ruby/callcard/default.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribdiegoviolarubycallcardcallcardrb"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/diegoviola/ruby/callcard/callcard.rb (14558 => 14559)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/diegoviola/ruby/callcard/callcard.rb 2009-08-18 23:06:13 UTC (rev 14558)
+++ freeswitch/trunk/contrib/diegoviola/ruby/callcard/callcard.rb 2009-08-19 00:12:48 UTC (rev 14559)
</span><span class="lines">@@ -28,35 +28,24 @@
</span><span class="cx"> bad_pin_wav = "/usr/local/freeswitch/sounds/en/us/callie/conference/8000/conf-bad-pin.wav"
</span><span class="cx"> dial_tone = "tone_stream://%(10000,0,350,440)"
</span><span class="cx"> FSR::Log.info "*** Answering incoming call from #{exten}"
</span><del>- answer do
- fs_sleep(2000) do
- play_and_get_digits(pin_wav, bad_pin_wav, 2, 10, 3, 7000, ["#"], "pin_number", "\\d") do |pin_number|
- @card = Card.find_by_card_number(pin_number)
- if @card then
- FSR::Log.info "*** Success, grabbed #{pin_number} from #{exten}"
- play_and_get_digits(dial_tone, bad_pin_wav, 2, 11, 3, 7000, ["#"], "destination_number", "\\d") do |destination_number|
- prefix = destination_number[0,5]
- @destination = Destination.find_by_prefix(prefix)
- FSR::Log.info "*** Success, grabbed #{destination_number} from #{exten}"
- FSR::Log.info "*** Setting up the billing variables."
- uuid_setvar(@session.headers[:unique_id], 'nibble_rate', @destination.rate) if @destination.respond_to?(:rate)
- uuid_setvar(@session.headers[:unique_id], 'nibble_account', @card.id)
- FSR::Log.info "*** Destination rate: #{@destination.rate}" if @destination.respond_to?(:rate)
- FSR::Log.info "*** Card ID: #{@card.id}"
- FSR::Log.info "*** Calling to: #{@destination.country}" if @destination.respond_to?(:country)
- FSR::Log.info "*** Bridging."
- FSR::Log.info "*** You have #{duration} minutes to talk."
- speak("You have #{duration} minutes to talk.")
- transfer(destination_number, "XML", "default") { close_connection }
- #bridge("sofia/internal/#{destination_number}@0.0.0.0")
- end
- else
- FSR::Log.info "*** Failure, grabbed #{pin_number} from #{exten}"
- playback(bad_pin_wav)
- FSR::Log.info "*** Hanging up the call."
- hangup
- end
- end
</del><ins>+ play_and_get_digits(pin_wav, bad_pin_wav, 2, 10, 3, 7000, ["#"], "pin_number", "\\d") do |pin_number|
+ @card = Card.find_by_card_number(pin_number)
+ if @card
+ FSR::Log.info "*** Success, grabbed #{pin_number} from #{exten}"
+ play_and_get_digits(dial_tone, bad_pin_wav, 2, 11, 3, 7000, ["#"], "destination_number", "\\d") do |destination_number|
+ prefix = destination_number[0,5]
+ @destination = Destination.find_by_prefix(prefix)
+ FSR::Log.info "*** Success, grabbed #{destination_number} from #{exten}"
+ FSR::Log.info "*** Setting up the billing variables."
+ uuid_setvar(@session.headers[:unique_id], 'nibble_rate', @destination.rate) if @destination.respond_to?(:rate)
+ uuid_setvar(@session.headers[:unique_id], 'nibble_account', @card.id)
+ close_connection
+ end
+ else
+ FSR::Log.info "*** Failure, grabbed #{pin_number} from #{exten}"
+ playback(bad_pin_wav)
+ FSR::Log.info "*** Hanging up the call."
+ hangup
</ins><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx"> end
</span></span></pre></div>
<a id="freeswitchtrunkcontribdiegoviolarubycallcarddefaultxml"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/contrib/diegoviola/ruby/callcard/default.xml (0 => 14559)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/diegoviola/ruby/callcard/default.xml (rev 0)
+++ freeswitch/trunk/contrib/diegoviola/ruby/callcard/default.xml 2009-08-19 00:12:48 UTC (rev 14559)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+
+<include>
+ <context name="default">
+
+ <extension name="callcard">
+ <condition field="destination_number" expression="^8084$">
+ <action application="answer"/>
+ <action application="sleep" data="2000"/>
+ <action application="socket" data="127.0.0.1:8084 sync full"/>
+ <!--<action application="speak" data="You have ${duration} minutes to talk."/>-->
+ <action application="transfer" data="${destination_number} XML default"/>
+ <!--<action application="bridge" data="sofia/internal/${destination_number}@0.0.0.0"/>-->
+ </condition>
+ </extension>
+
+ </context>
+</include>
</ins></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>