Modified: freeswitch/trunk/contrib/diegoviola/ruby/callcard/callcard.rb (14558 => 14559)

--- 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)
@@ -28,35 +28,24 @@
     bad_pin_wav = "/usr/local/freeswitch/sounds/en/us/callie/conference/8000/conf-bad-pin.wav"
     dial_tone = "tone_stream://%(10000,0,350,440)"
     FSR::Log.info "*** Answering incoming call from #{exten}"
-    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
+    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
       end
     end
   end