Changeset 6151

Timestamp:

07/23/08 17:07:41 (4 months ago)

Author:

p_lindheimer

Message:

#2066, #2943 Migrate recordings to recording ids, fix sqlite3 syntax

Files:

• modules/branches/2.5/ivr/functions.inc.php (modified) (6 diffs)
• modules/branches/2.5/ivr/install.php (modified) (2 diffs)
• modules/branches/2.5/ivr/module.xml (modified) (3 diffs)
• modules/branches/2.5/ivr/page.ivr.php (modified) (3 diffs)

modules/branches/2.5/ivr/functions.inc.php

@@ -129 +129 @@
-                        return array();
-                } else {
-announcement']['type'])?$active_modules['announcement
+ivr']['type'])?$active_modules['ivr
-                        return array('description' => 'IVR : '.$thisexten['displayname'],
-                                     'edit_url' => 'config.php?display=ivr&action=edit&id='.urlencode($exten),
@@ -136 +136 @@
-        } else {
-                return false;
+        }
+}
+
+function ivr_recordings_usage($recording_id) {
+        global $active_modules;
+
+        $results = sql("SELECT `ivr_id`, `displayname` FROM `ivr` WHERE `announcement_id` = '$recording_id'","getAll",DB_FETCHMODE_ASSOC);
+        if (empty($results)) {
+                return array();
+        } else {
+                //$type = isset($active_modules['ivr']['type'])?$active_modules['ivr']['type']:'setup';
+                foreach ($results as $result) {
+                        $usage_arr[] = array(
+                                'url_query' => 'config.php?display=ivr&action=edit&id='.urlencode($result['ivr_id']),
+                                'description' => "IVR: ".$result['displayname'],
+                        );
+                }
+                return $usage_arr;
-        }
-}
@@ -151 +169 @@
-                                        $details = ivr_get_details($item['ivr_id']);
-
- = (isset($details['announcement']) ? $details['announcement
+_id = (isset($details['announcement_id']) ? $details['announcement_id
-                                        $loops = (isset($details['loops']) ? $details['loops'] : '2');
-
@@ -183 +201 @@
-                                        $ext->add($id, 's', 'begin', new ext_digittimeout(3));
-                                        $ext->add($id, 's', '', new ext_responsetimeout($details['timeout']));
-
-
+
+
+
-                                        }
-                                        $ext->add($id, 's', '', new ext_waitexten());
@@ -296 +315 @@
-        $ena_directory = isset($post['ena_directory'])?$post['ena_directory']:'';
-        $ena_directdial = isset($post['ena_directdial'])?$post['ena_directdial']:'';
- = isset($post['annmsg'])?$post['annmsg
+_id = isset($post['annmsg_id'])?$post['annmsg_id
-        $dircontext = isset($post['dircontext'])?$post['dircontext']:'';
-
@@ -316 +335 @@
-        }
-        
-='$annmsg
+_id='$annmsg_id
-
-        // Delete all the old dests

modules/branches/2.5/ivr/install.php

@@ -1 +1 @@
-<?php
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-global $db;
+global $amp_conf;
+
+$autoincrement = (($amp_conf["AMPDBENGINE"] == "sqlite") || ($amp_conf["AMPDBENGINE"] == "sqlite3")) ? "AUTOINCREMENT":"AUTO_INCREMENT";
+$sql = "
+CREATE TABLE IF NOT EXISTS ivr 
+( 
+        `ivr_id` INT NOT NULL $autoincrement PRIMARY KEY, 
+        `displayname` VARCHAR(50), 
+        `deptname` VARCHAR(50), 
+        `enable_directory` VARCHAR(8), 
+        `enable_directdial` VARCHAR(8), 
+        `timeout` INT, 
+        `announcement` VARCHAR(255), 
+        `dircontext` VARCHAR ( 50 ) DEFAULT 'default', 
+        `alt_timeout` VARCHAR(8), 
+        `alt_invalid` VARCHAR(8), 
+        `loops` TINYINT(1) NOT NULL DEFAULT 2 
+)
+";
+sql($sql);
+
+$sql = "
+CREATE TABLE IF NOT EXISTS ivr_dests 
+( 
+        `ivr_id` INT NOT NULL, 
+        `selection` VARCHAR(10), 
+        `dest` VARCHAR(50), 
+        `ivr_ret` TINYINT(1) NOT NULL DEFAULT 0
+)
+";
+sql($sql);
-
-// Now, we need to check for upgrades. 
@@ -110 +151 @@
-    if(DB::IsError($result)) { die_freepbx($result->getDebugInfo()); }
-}
+
+
+
+// Version 2.5 migrate to recording ids
+//
+outn(_("Checking if announcements need migration.."));
+$sql = "SELECT announcement_id FROM ivr";
+$check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+if(DB::IsError($check)) {
+        //  Add announcement_id field
+        //
+        out("migrating");
+        outn(_("adding announcement_id field.."));
+  $sql = "ALTER TABLE ivr ADD announcement_id INTEGER";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) {
+                out(_("fatal error"));
+                die_freepbx($result->getDebugInfo()); 
+        } else {
+                out(_("ok"));
+        }
+
+        // Get all the valudes and replace them with announcement_id
+        //
+        outn(_("migrate to recording ids.."));
+  $sql = "SELECT `ivr_id`, `announcement` FROM `ivr`";
+        $results = $db->getAll($sql, DB_FETCHMODE_ASSOC);
+        if(DB::IsError($results)) {
+                out(_("fatal error"));
+                die_freepbx($results->getDebugInfo());  
+        }
+        $migrate_arr = array();
+        $count = 0;
+        foreach ($results as $row) {
+                if (trim($row['announcement']) != '') {
+                        $rec_id = recordings_get_or_create_id($row['announcement'], 'ivr');
+                        $migrate_arr[] = array($rec_id, $row['ivr_id']);
+                        $count++;
+                }
+        }
+        if ($count) {
+                $compiled = $db->prepare('UPDATE `ivr` SET `announcement_id` = ? WHERE `ivr_id` = ?');
+                $result = $db->executeMultiple($compiled,$migrate_arr);
+                if(DB::IsError($result)) {
+                        out(_("fatal error"));
+                        die_freepbx($result->getDebugInfo());   
+                }
+        }
+        out(sprintf(_("migrated %s entries"),$count));
+
+        // Now remove the old recording field replaced by new id field
+        //
+        outn(_("dropping announcement field.."));
+  $sql = "ALTER TABLE `ivr` DROP `announcement`";
+  $result = $db->query($sql);
+  if(DB::IsError($result)) { 
+                out(_("no announcement field???"));
+        } else {
+                out(_("ok"));
+        }
+
+} else {
+        out("already migrated");
+}
+
-?>

modules/branches/2.5/ivr/module.xml

@@ -2 +2 @@
-        <rawname>ivr</rawname>
-        <name>IVR</name>
-7.1
+8
-        <type>setup</type>
-        <category>Inbound Call Control</category>
@@ -9 +9 @@
-        </description>
-        <changelog>
+                *2.5.18* #2066 Migrate recordings to recording ids
-                *2.5.17.1* #2845 tabindex
-                *2.5.17* #2858 Better handing of i and t options, added loop count and ability to loop before going to user defined i, t options
@@ -37 +38 @@
-        </changelog>
-        <depends>
-
+
+
-        </depends>
-        <menuitems>

modules/branches/2.5/ivr/page.ivr.php

@@ -190 +190 @@
-                </tr>
-<?php
- = isset($ivr_details['announcement'])?$ivr_details['announcement
+_id = isset($ivr_details['announcement_id'])?$ivr_details['announcement_id
-                        if(function_exists('recordings_list')) { //only include if recordings is enabled ?>
-                <tr>
-                        <td><a href="#" class="info"><?php echo _("Announcement")?><span><?php echo _("Message to be played to the caller. To add additional recordings please use the \"System Recordings\" MENU to the left")?></span></a></td>
-                        <td>
-
+_id
-                                <?php
-                                        $tresults = recordings_list();
@@ -201 +201 @@
-                                        if (isset($tresults[0])) {
-                                                foreach ($tresults as $tresult) {
-2].'"'.($tresult[2] == $annmsg ? ' SELECTED' : '').'>'.$tresult[1
+'id'].'"'.($tresult['id'] == $annmsg_id ? ' SELECTED' : '').'>'.$tresult['displayname'
-                                                }
-                                        }
@@ -216 +216 @@
-                        <td>
-                        <?php
-) ? $annmsg
+_id) ? $annmsg_id
-                        ?>
-
+_id
-                        </td>
-                </tr>