Menu
▾
▴
[Yaacs-svn] SF.net SVN: yaacs:[2177]
|
From: <si...@us...> - 2012-09-03 12:58:35
|
Revision: 2177
http://yaacs.svn.sourceforge.net/yaacs/?rev=2177&view=rev
Author: sickpig
Date: 2012-09-03 12:58:26 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
* FIX: prev rev (2176) introduce a brand new bug while try
to fix an old one :). Hopefully all bugs, new and old, are
fixed now
Modified Paths:
--------------
branches/external-stable/yacati.tcl
branches/external-trunk/yacati.tcl
branches/internal-stable/yacati.tcl
trunk/yacati.tcl
Modified: branches/external-stable/yacati.tcl
===================================================================
--- branches/external-stable/yacati.tcl 2012-08-31 14:26:01 UTC (rev 2176)
+++ branches/external-stable/yacati.tcl 2012-09-03 12:58:26 UTC (rev 2177)
@@ -2835,27 +2835,26 @@
unset ::yacati::send_web_in
set ::yacati::webdelivery_status ""
- if {[llength $res] > 0 && $response == 0} {
+ if {[llength $res] > 0} {
if {$failure < 2} {
::dialogs::error . [lindex $res 0] [lindex $res 1]
return -1
} else {
::yalog::error "email is not valid but we can't go on for ever..."
}
- } else {
- # email has been validated
- if {$response < 0} {
- # but we fail to send it due to some error (that you must
- # look at in the logs) this has to be solved so we can't
- # permit to move to another contact until we fix the issues
- ::yalog::error "email is valid but we aren't able to delivery..."
- ::dialogs::error . [mc "Email delivery error"] [mc "Due to some glitches somwhere we are\
- unable to delivery the invitation. Probably this is due to malformed data, e.g. unescaped\
- from address, subject etc etc.\n\nCall immediately the supervisor."]
- return -1
- }
}
+ if {$response == -1} {
+ # but we fail to send it due to some error (that you must
+ # look at in the logs) this has to be solved so we can't
+ # permit to move to another contact until we fix the issues
+ ::yalog::error "email is valid but we aren't able to delivery..."
+ ::dialogs::error . [mc "Email delivery error"] [mc "Due to some glitches somwhere we are\
+ unable to delivery the invitation. Probably this is due to malformed data, e.g. unescaped\
+ from address, subject etc etc.\n\nCall immediately the supervisor."]
+ return -1
+ }
+
# log the email address, proj id, respondent id, cod_com end phone number (the real key)
::cati::save_webpanel $::yacati::db $failure $::yacati::survey(proj) [array get ::yacati::contact] $addr
Modified: branches/external-trunk/yacati.tcl
===================================================================
--- branches/external-trunk/yacati.tcl 2012-08-31 14:26:01 UTC (rev 2176)
+++ branches/external-trunk/yacati.tcl 2012-09-03 12:58:26 UTC (rev 2177)
@@ -2835,27 +2835,26 @@
unset ::yacati::send_web_in
set ::yacati::webdelivery_status ""
- if {[llength $res] > 0 && $response == 0} {
+ if {[llength $res] > 0} {
if {$failure < 2} {
::dialogs::error . [lindex $res 0] [lindex $res 1]
return -1
} else {
::yalog::error "email is not valid but we can't go on for ever..."
}
- } else {
- # email has been validated
- if {$response < 0} {
- # but we fail to send it due to some error (that you must
- # look at in the logs) this has to be solved so we can't
- # permit to move to another contact until we fix the issues
- ::yalog::error "email is valid but we aren't able to delivery..."
- ::dialogs::error . [mc "Email delivery error"] [mc "Due to some glitches somwhere we are\
- unable to delivery the invitation. Probably this is due to malformed data, e.g. unescaped\
- from address, subject etc etc.\n\nCall immediately the supervisor."]
- return -1
- }
}
+ if {$response == -1} {
+ # but we fail to send it due to some error (that you must
+ # look at in the logs) this has to be solved so we can't
+ # permit to move to another contact until we fix the issues
+ ::yalog::error "email is valid but we aren't able to delivery..."
+ ::dialogs::error . [mc "Email delivery error"] [mc "Due to some glitches somwhere we are\
+ unable to delivery the invitation. Probably this is due to malformed data, e.g. unescaped\
+ from address, subject etc etc.\n\nCall immediately the supervisor."]
+ return -1
+ }
+
# log the email address, proj id, respondent id, cod_com end phone number (the real key)
::cati::save_webpanel $::yacati::db $failure $::yacati::survey(proj) [array get ::yacati::contact] $addr
Modified: branches/internal-stable/yacati.tcl
===================================================================
--- branches/internal-stable/yacati.tcl 2012-08-31 14:26:01 UTC (rev 2176)
+++ branches/internal-stable/yacati.tcl 2012-09-03 12:58:26 UTC (rev 2177)
@@ -2835,27 +2835,26 @@
unset ::yacati::send_web_in
set ::yacati::webdelivery_status ""
- if {[llength $res] > 0 && $response == 0} {
+ if {[llength $res] > 0} {
if {$failure < 2} {
::dialogs::error . [lindex $res 0] [lindex $res 1]
return -1
} else {
::yalog::error "email is not valid but we can't go on for ever..."
}
- } else {
- # email has been validated
- if {$response < 0} {
- # but we fail to send it due to some error (that you must
- # look at in the logs) this has to be solved so we can't
- # permit to move to another contact until we fix the issues
- ::yalog::error "email is valid but we aren't able to delivery..."
- ::dialogs::error . [mc "Email delivery error"] [mc "Due to some glitches somwhere we are\
- unable to delivery the invitation. Probably this is due to malformed data, e.g. unescaped\
- from address, subject etc etc.\n\nCall immediately the supervisor."]
- return -1
- }
}
+ if {$response == -1} {
+ # but we fail to send it due to some error (that you must
+ # look at in the logs) this has to be solved so we can't
+ # permit to move to another contact until we fix the issues
+ ::yalog::error "email is valid but we aren't able to delivery..."
+ ::dialogs::error . [mc "Email delivery error"] [mc "Due to some glitches somwhere we are\
+ unable to delivery the invitation. Probably this is due to malformed data, e.g. unescaped\
+ from address, subject etc etc.\n\nCall immediately the supervisor."]
+ return -1
+ }
+
# log the email address, proj id, respondent id, cod_com end phone number (the real key)
::cati::save_webpanel $::yacati::db $failure $::yacati::survey(proj) [array get ::yacati::contact] $addr
Modified: trunk/yacati.tcl
===================================================================
--- trunk/yacati.tcl 2012-08-31 14:26:01 UTC (rev 2176)
+++ trunk/yacati.tcl 2012-09-03 12:58:26 UTC (rev 2177)
@@ -2835,27 +2835,26 @@
unset ::yacati::send_web_in
set ::yacati::webdelivery_status ""
- if {[llength $res] > 0 && $response == 0} {
+ if {[llength $res] > 0} {
if {$failure < 2} {
::dialogs::error . [lindex $res 0] [lindex $res 1]
return -1
} else {
::yalog::error "email is not valid but we can't go on for ever..."
}
- } else {
- # email has been validated
- if {$response < 0} {
- # but we fail to send it due to some error (that you must
- # look at in the logs) this has to be solved so we can't
- # permit to move to another contact until we fix the issues
- ::yalog::error "email is valid but we aren't able to delivery..."
- ::dialogs::error . [mc "Email delivery error"] [mc "Due to some glitches somwhere we are\
- unable to delivery the invitation. Probably this is due to malformed data, e.g. unescaped\
- from address, subject etc etc.\n\nCall immediately the supervisor."]
- return -1
- }
}
+ if {$response == -1} {
+ # but we fail to send it due to some error (that you must
+ # look at in the logs) this has to be solved so we can't
+ # permit to move to another contact until we fix the issues
+ ::yalog::error "email is valid but we aren't able to delivery..."
+ ::dialogs::error . [mc "Email delivery error"] [mc "Due to some glitches somwhere we are\
+ unable to delivery the invitation. Probably this is due to malformed data, e.g. unescaped\
+ from address, subject etc etc.\n\nCall immediately the supervisor."]
+ return -1
+ }
+
# log the email address, proj id, respondent id, cod_com end phone number (the real key)
::cati::save_webpanel $::yacati::db $failure $::yacati::survey(proj) [array get ::yacati::contact] $addr
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|