Changeset 14115

Timestamp:

05/29/12 13:34:58 (1 year ago)

Author:

p_lindheimer

Message:

[Auto Checking in outstanding changes in ivr]

Files:

• modules/branches/2.10/ivr/install.php (modified) (2 diffs)
• modules/branches/2.10/ivr/module.xml (modified) (2 diffs)

modules/branches/2.10/ivr/install.php

@@ -295 +295 @@
-  
-   //this was installed perviously, but we perfer to use our old table when migrating
+  sql('RENAME TABLE ivr_dests TO ivr_entries');
+
+  /*
-  sql('DROP TABLE ivr_details');
-  sql('RENAME TABLE ivr TO ivr_details');
-  sql('RENAME TABLE ivr_dests TO ivr_entries');
-  sql('ALTER TABLE ivr_details 
-  CHANGE ivr_id id int(11) NOT NULL AUTO_INCREMENT, 
@@ -319 +321 @@
-  DROP enable_directory, 
-  DROP dircontext');
+   */
-  
+  $ivr_details = sql('SELECT * from ivr', 'getAll', DB_FETCHMODE_ASSOC);
+  $ins_arr = array();
+  foreach ($ivr_details as $r) {
+    if ($r['name'] == "__install_done") {
+      continue;
+    }
+    $ins_arr[] = array(
+      $r['ivr_id'],            // id
+      $r['displayname'],       // name
+      $r['announcement_id'],   // announcement
+      $r['enable_directdial'], // directdial
+      $r['loops'],             // invalid_loops
+      $r['alt_timeout'],       // timeout_enabled
+      $r['invalid_id'],        // invalid_recording
+      $r['retvm'],             // retvm
+      $r['timeout'],           // timeout_time
+      $r['timeout_id'],        // timeout_recording
+      $r['loops'],             // timeout_loops
+    );
+  }
+  $compiled = $db->prepare('
+    INSERT INTO ivr_details 
+    (id, name, announcement, directdial, invalid_loops, timeout_enabled, invalid_recording, retvm, timeout_time, timeout_recording, timeout_loops)
+    VALUES 
+    (?,?,?,?,?,?,?,?,?,?,?)
+    ');
+  $result = $db->executeMultiple($compiled,$ins_arr);
+  if(DB::IsError($result)) {
+    die_freepbx($result->getDebugInfo().'error migrating ivr to ivr_details');  
+  } else {
+    out(_("migrated table ivr to ivr_details"));
+    sql('DROP TABLE ivr');
+  }
+
+  /*
-  sql('DELETE FROM ivr_details WHERE name = "__install_done"');
-  //copy loops from invalid to timeout
-  sql('UPDATE ivr_details SET timeout_loops = invalid_loops');
+   */
+
-  $ivr = $db->getAll('SELECT * FROM ivr_details', DB_FETCHMODE_ASSOC);
-  if($db->IsError($ivr)) {

modules/branches/2.10/ivr/module.xml

@@ -3 +3 @@
-  <repo>standard</repo>
-  <name>IVR</name>
-6
+7
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -11 +11 @@
-  </description>
-  <changelog>
-
+, corner case migration enhancements
-    *2.10.0.6* #5568
-    *2.10.0.5* #5587, #5588