added time zone scheme for Brazil to ADMIN_adjust_GMTnow script

git-svn-id: svn://192.168.202.10@379 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2006-11-10 17:05:24 +00:00
parent a3653f935f
commit 3fb5dcb0c6
4 changed files with 92 additions and 12 deletions
+82 -4
View File
@@ -16,6 +16,7 @@
# 60717-1045 - changed to DBI by Marin Blu
# 60717-1531 - changed to use /etc/astguiclient.conf for configuration
# 61108-1320 - added new DST schemes for USA/Canada change and changes in other countries
# 61110-1204 - added new DST scheme for Brazil
#
$MT[0]='';
@@ -332,6 +333,14 @@ foreach (@phone_codes)
if ($NZL_DST) {$area_GMT++;}
$AC_processed++;
}
if ( (!$AC_processed) && ($area_GMT_method =~ /TSO-LSF/) )
{
if ($DBX) {print " Third Sunday October to Last Sunday February\n";}
&BZL_dstcalc;
if ($DBX) {print " DST: $BZL_DST\n";}
if ($BZL_DST) {$area_GMT++;}
$AC_processed++;
}
if (!$AC_processed)
{
if ($DBX) {print " No DST Method Found\n";}
@@ -732,7 +741,7 @@ sub AUST_dstcalc {
$AUST_DST=0; return 0;
}
} elsif ($mm == 10) {
if ($dd > 7) {
if ($dd >= 8) {
$AUST_DST=1; return 1;
} elsif ($dd >= ($dow+1)) {
if ($timezone) {
@@ -799,9 +808,9 @@ sub NZL_dstcalc {
$NZL_DST=0; return 0;
}
} elsif ($mm == 10) {
if ($dd > 21) {
$NZL_DST=0; return 0;
} elsif ($dd < ($dow+15)) {
if ($dd >= 8) {
$NZL_DST=1; return 1;
} elsif ($dd >= ($dow+1)) {
if ($timezone) {
if ($dow == 0 && $ns < (7200+$timezone*3600)) {
$NZL_DST=0; return 0;
@@ -820,3 +829,72 @@ sub NZL_dstcalc {
}
} # end of month checks
} # end of subroutine dstcalc
sub BZL_dstcalc {
#**********************************************************************
# LSO-LSF
# This is returns 1 if Daylight Savings Time is in effect and 0 if
# Standard time is in effect. Brazil
# Based on Third Sunday October to Last Sunday February at 1 am.
#**********************************************************************
$BZL_DST=0;
$mm = $mon;
$dd = $mday;
$ns = $dsec;
$dow= $wday;
if ($mm < 2 || $mm > 10) {
$BZL_DST=1; return 1;
} elsif ($mm >= 3 && $mm <= 9) {
$BZL_DST=0; return 0;
} elsif ($mm == 2) {
if ($dd < 22) {
$BZL_DST=1; return 1;
} elsif ($dd < ($dow+22)) {
$BZL_DST=1; return 1;
} elsif ($dow == 0) {
if ($timezone) { # UTC calculations
if ($ns < (3600+($timezone-1)*3600)) {
$BZL_DST=1; return 1;
} else {
$BZL_DST=0; return 0;
}
} else { # local time calculations
if ($ns < 3600) {
$BZL_DST=1; return 1;
} else {
$BZL_DST=0; return 0;
}
}
} else {
$BZL_DST=0; return 0;
}
} elsif ($mm == 10) {
if ($dd < 22) {
$BZL_DST=0; return 0;
} elsif ($dd < ($dow+22)) {
$BZL_DST=0; return 0;
} elsif ($dow == 0) {
if ($timezone) { # UTC calculations
if ($ns < (3600+($timezone-1)*3600)) {
$BZL_DST=0; return 0;
} else {
$BZL_DST=1; return 1;
}
} else { # local time calculations
if ($ns < 3600) {
$BZL_DST=0; return 0;
} else {
$BZL_DST=1; return 1;
}
}
} else {
$BZL_DST=1; return 1;
}
} # end of month checks
} # end of subroutine dstcalc
+6 -6
View File
@@ -7,22 +7,22 @@ The seconds colum is the code for the scheme
The third column explains the scheme
NORTHERN HEMISPHERE
* USA SSM-FSN Second Sunday March to First Sunday November
* USA-Canada SSM-FSN Second Sunday March to First Sunday November
* Mexico FSA-LSO First Sunday April to Last Sunday October
* Albania LSM-LSO Last Sunday March to Last Sunday October European Summer Time
* Europe LSM-LSO Last Sunday March to Last Sunday October European Summer Time
Egypt LTA-LTS Last Thursday April to Last Thursday September
Iraq FDA-FDO First day of April to the first day of October
Israel LFM-TSS Last Friday March to First Sunday September
Israel LFM-TSS *changes every year* Last Friday March to First Sunday September
SOUTHERN HEMISPHERE
Namibia FSS-FSA First Sunday September to first sunday April
Falkland Isls FSS-TSA First Sunday September to Third Sunday April
Uruguay FSO-SSM First Sunday October to Second Sunday March
Tasmania FSO-LSM First Sunday October to Last Sunday March
Chile SSO-SSM Second Saturday October to Second Satruday March
Chile SSO-SSM Second Saturday October to Second Saturday March
* Australia LSO-LSM Last Sunday October to Last Sunday March
* AUS-Taz FSO-LSM First Sunday October to Last Sunday March
* New Zealand FSO-TSM First Sunday October to Third Sunday March
Brazil LSO-LSF Last Sunday October to Last Sunday February
* Brazil TSO-LSF Third Sunday October to Last Sunday February
* notes inclusion into ADMIN_adjust_GMTnow_on_leads.pl script
+1 -1
View File
@@ -824,7 +824,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION
52 MEX 999 -6 Y FSA-LSO Mérida, Yuc.z
53 CUB * -5 N Cuba
54 ARG * -3 N Argentina
55 BRA * -3 Y LSO-FSM Brazil
55 BRA * -3 Y TSO-LSF Brazil
56 CHL * -4 Y SSO-SSM Chile
57 COL * -5 N Columbia
58 VEN * -4 N Venezuela
@@ -35,9 +35,11 @@ Click here to delete the oldest LIVE record in VDAC for||
VOLUME||
############################################################ ADMIN Manual
############################################################ MANAGER Manual
Add notes on balance dialing in Multi-server setups
CLOSER must be RATIO dial method and dial level of 1
more information on resetting the list once you have caled through it in the tutorials
############################################################ AGENT Manual