diff --git a/UPGRADE b/UPGRADE index 7af46c87..8b7a1a07 100644 --- a/UPGRADE +++ b/UPGRADE @@ -1,9 +1,29 @@ ################ UPGRADE -NOTE: Upgrading from 2.0.2 to 2.0.3 is below the first section -NOTE: Upgrading from 2.0.1 to 2.0.2 is in the middle section +NOTE: Upgrading from 2.0.3 to 2.0.4 is below the first section +NOTE: Upgrading from 2.0.2 to 2.0.3 is below the second section +NOTE: Upgrading from 2.0.1 to 2.0.2 is in the next section NOTE: Upgrading from 1.1.12-3 to 2.0.1 is at the bottom +########## UPGRADING FROM 2.0.4 TO 2.0.5 ########## + +1. install new files: + perl ./install.pl + NOTES: If you have customized any scripts in the bin or agi folders, + then make sure you back them up before running the install.pl script. + This script will replace existing files in the astguiclient installation. + +2. upgrade the MySQL asterisk database: + mysql + use asterisk + \. /path/from/root/extras/upgrade_2.0.5.sql + quit + + + + + + ########## UPGRADING FROM 2.0.3 TO 2.0.4 ########## 1. install new files: diff --git a/agi/agi-VDAD_ALL_inbound.agi b/agi/agi-VDAD_ALL_inbound.agi index 16239ce4..f2dccf2a 100644 --- a/agi/agi-VDAD_ALL_inbound.agi +++ b/agi/agi-VDAD_ALL_inbound.agi @@ -628,6 +628,7 @@ if ($call_handle_method =~ /DIGITID$/) $affected_rows = $dbhA->do($stmtA); if ($AGILOG) {$agi_string = "-- VDAD : |$insert_lead_id|$fronter|insert to vicidial_log: $uniqueid"; &agi_output;} } +$insert_xfer_id=0; if ($call_handle_method =~ /CLOSER|DIGITID$/) { $stmtA = "INSERT INTO vicidial_xfer_log (lead_id,campaign_id,call_date,phone_code,phone_number,user,closer) values('$insert_lead_id','$channel_group','$SQLdate','$phone_code','$phone_number','$fronter','VDXL')"; @@ -635,9 +636,9 @@ if ($call_handle_method =~ /CLOSER|DIGITID$/) $affected_rows = $dbhA->do($stmtA); $stmtB = "select LAST_INSERT_ID() LIMIT 1;"; $sthA = $dbhA->prepare($stmtB) or die "preparing: ",$dbhA->errstr; - $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; + $sthA->execute or die "executing: $stmtB ", $dbhA->errstr; $sthArows=$sthA->rows; - while ($sthArows > $cbc) + if ($sthArows > 0) { @aryA = $sthA->fetchrow_array; $insert_xfer_id = "$aryA[0]"; @@ -653,10 +654,10 @@ $stmtA = "INSERT INTO vicidial_auto_calls (server_ip,campaign_id,status,lead_id, if ($AGILOG) {$agi_string = "|$stmtA|"; &agi_output;} $affected_rows = $dbhA->do($stmtA); -$stmtA = "INSERT INTO vicidial_closer_log (lead_id,campaign_id,call_date,start_epoch,status,phone_code,phone_number,user,processed) values('$insert_lead_id','$channel_group','$SQLdate','$now_date_epoch','QUEUE','$phone_code','$phone_number','VDCL','N')"; +$stmtA = "INSERT INTO vicidial_closer_log (lead_id,campaign_id,call_date,start_epoch,status,phone_code,phone_number,user,processed,xfercallid) values('$insert_lead_id','$channel_group','$SQLdate','$now_date_epoch','QUEUE','$phone_code','$phone_number','VDCL','N','$insert_xfer_id')"; if ($AGILOG) {$agi_string = "|$stmtA|"; &agi_output;} $affected_rows = $dbhA->do($stmtA); -if ($AGILOG) {$agi_string = "-- VDCL : |$insert_lead_id|insert to vicidial_closer_log"; &agi_output;} +if ($AGILOG) {$agi_string = "-- VDCL : |$insert_lead_id|$insert_xfer_id|insert to vicidial_closer_log"; &agi_output;} $drop_timer=0; $drop_seconds=0; diff --git a/docs/SCRATCH_INSTALL.txt b/docs/SCRATCH_INSTALL.txt index 758436f6..5eb2ee3a 100644 --- a/docs/SCRATCH_INSTALL.txt +++ b/docs/SCRATCH_INSTALL.txt @@ -363,7 +363,7 @@ NOTE: a minimum of MySQL server 4.0.X is required - to install this directly on the command line type: - cd /usr/local - wget http://mirror.trouble-free.net/mysql_mirror/Downloads/MySQL-4.0/mysql-4.0.27.tar.gz - # http://mirror.trouble-free.net/mysql_mirror/Downloads/MySQL-5.0/mysql-5.0.41.tar.gz + # http://mirror.trouble-free.net/mysql_mirror/Downloads/MySQL-5.0/mysql-5.0.45.tar.gz - gunzip mysql-4.0.27.tar.gz - tar xvf mysql-4.0.27.tar - cd mysql-4.0.27 @@ -388,8 +388,8 @@ NOTE: a minimum of MySQL server 4.0.X is required - export PATH **** you may also want to add those two lines to your /root/.bash_profile file **** For Mysql 5 tree only, you also may need to copy the libmysqlclient.so file to libs - - cp /usr/local/mysql-5.0.27/libmysql/.libs/libmysqlclient.so /usr/lib/ - - cp /usr/local/mysql-5.0.27/libmysql/.libs/libmysqlclient.so.15 /usr/lib/ + - cp /usr/local/mysql-5.0.45/libmysql/.libs/libmysqlclient.so /usr/lib/ + - cp /usr/local/mysql-5.0.45/libmysql/.libs/libmysqlclient.so.15 /usr/lib/ - you are done ** INSTALLATION NOTE ** diff --git a/extras/MySQL_AST_CREATE_tables.sql b/extras/MySQL_AST_CREATE_tables.sql index 77a20331..031cc44d 100644 --- a/extras/MySQL_AST_CREATE_tables.sql +++ b/extras/MySQL_AST_CREATE_tables.sql @@ -378,6 +378,7 @@ comments VARCHAR(255), processed ENUM('Y','N'), queue_seconds DECIMAL(7,2) default '0', user_group VARCHAR(20), +xfercallid INT(9) UNSIGNED, index (lead_id), index (call_date) ); diff --git a/extras/upgrade_2.0.5.sql b/extras/upgrade_2.0.5.sql index e69de29b..83a65112 100644 --- a/extras/upgrade_2.0.5.sql +++ b/extras/upgrade_2.0.5.sql @@ -0,0 +1 @@ +ALTER TABLE vicidial_closer_log ADD xfercallid INT(9) UNSIGNED; diff --git a/version b/version index 93a84a0e..d8eace3c 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.0.4.0-5 +2.0.5b0.5