From 186d572a2bf0a60bb306fc4b5e65825f1f25e065 Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Tue, 12 Jul 2011 19:10:32 -0400
Subject: [PATCH 1/3] CC-2279: Upgrade script for converting stor directory to
 new format

---
 .../upgrades/airtime-1.9/airtime-upgrade.php    | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/install/upgrades/airtime-1.9/airtime-upgrade.php b/install/upgrades/airtime-1.9/airtime-upgrade.php
index 86ddc5117..52e15e003 100644
--- a/install/upgrades/airtime-1.9/airtime-upgrade.php
+++ b/install/upgrades/airtime-1.9/airtime-upgrade.php
@@ -121,9 +121,22 @@ InstallAirtimePhpServerCode($phpDir);
 UninstallBinaries();
 CopyUtils();
 
+//James's made a new airtime-import script, lets remove the old airtime-import php script,
+//install the new airtime-import.py script and update the /usr/bin/symlink.
 removeOldAirtimeImport();
 updateAirtimeImportSymLink();
 
 
-//need to change database because old format had full path while new database has partial paths
-//also need to add new column
+if(AirtimeInstall::DbTableExists('doctrine_migration_versions') === false) {
+    $migrations = array('20110312121200', '20110331111708', '20110402164819', '20110406182005');
+    foreach($migrations as $migration) {
+        AirtimeInstall::BypassMigrations(__DIR__, $migration);
+    }
+}
+//alter cc_files, add a new column named "directory" of type "int".
+AirtimeInstall::MigrateTablesToVersion(__DIR__, '20110629143017');
+
+
+
+//old database had a "fullpath" column that stored the absolute path of each track. We have to
+//change it so that the "fullpath" column has 

From ce81f0c8fb8d61acc68d78494ab65cf9b76a5543 Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Tue, 12 Jul 2011 19:15:25 -0400
Subject: [PATCH 2/3] -reenable upgrades

---
 install/include/airtime-install.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/install/include/airtime-install.php b/install/include/airtime-install.php
index 7e132d7c2..ec43087e6 100644
--- a/install/include/airtime-install.php
+++ b/install/include/airtime-install.php
@@ -63,10 +63,6 @@ if (isset($version) && ($version != false) && ($version == AIRTIME_VERSION) && !
 if (isset($version) && ($version != false) && ($version < AIRTIME_VERSION) && !isset($opts->r)) {
     echo "Airtime version $version found.".PHP_EOL;
 
-    echo "It appears you already have a version of Airtime installed.\n";
-    echo "Upgrading is currently disabled for Airtime 1.9.0-beta1.\n";
-    exit(2);
-
     require_once("airtime-upgrade.php");
 
     //Make sure to exit with non-zero error code so that airtime-install

From 65250bd2c91bccbe2df5458f2729eef5aa58020f Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Tue, 12 Jul 2011 19:32:13 -0400
Subject: [PATCH 3/3] CC-2279: Upgrade script for converting stor directory to
 new format

-upgrade script needs access to db
---
 install/upgrades/airtime-1.9/airtime-upgrade.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/install/upgrades/airtime-1.9/airtime-upgrade.php b/install/upgrades/airtime-1.9/airtime-upgrade.php
index 52e15e003..1867a07e7 100644
--- a/install/upgrades/airtime-1.9/airtime-upgrade.php
+++ b/install/upgrades/airtime-1.9/airtime-upgrade.php
@@ -77,6 +77,21 @@ function updateAirtimeImportSymLink(){
     exec("ln -s $dir /usr/bin/airtime-import");
 }
 
+function connectToDatabase(){
+    global $CC_DBC, $CC_CONFIG;
+
+    $values = parse_ini_file('/etc/airtime/airtime.conf', true);
+
+    // Database config
+    $CC_CONFIG['dsn']['username'] = $values['database']['dbuser'];
+    $CC_CONFIG['dsn']['password'] = $values['database']['dbpass'];
+    $CC_CONFIG['dsn']['hostspec'] = $values['database']['host'];
+    $CC_CONFIG['dsn']['phptype'] = 'pgsql';
+    $CC_CONFIG['dsn']['database'] = $values['database']['dbname'];
+
+    $CC_DBC = DB::connect($CC_CONFIG['dsn'], FALSE);
+}
+
 /* In version 1.9.0 we have have switched from daemontools to more traditional
  * init.d daemon system. Let's remove all the daemontools files
  */
@@ -126,6 +141,7 @@ CopyUtils();
 removeOldAirtimeImport();
 updateAirtimeImportSymLink();
 
+connectToDatabase();
 
 if(AirtimeInstall::DbTableExists('doctrine_migration_versions') === false) {
     $migrations = array('20110312121200', '20110331111708', '20110402164819', '20110406182005');