Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1

Changelog

@@ -1,7 +1,8 @@
 1.9.4 - Sept 13, 2011
   *Improvements
-    -"airtime-import" command-line utility now offers better help when invalid parameters have
-     been passed.
+    -DEB packages now available for Ubuntu & Debian
+    -"airtime-easy-install" DEB package now available which will install everything with a single click
+    -"airtime-import" command-line utility now offers better help when invalid parameters have been passed.
   *Fixes
     -Fixed "Show Contents" displaying full-length of tracks, even if cue-points had been set.
     -Fixed start date of show not updating after dragging and dropping.
@@ -11,6 +12,8 @@
     -Fixed issue where deleting a file from the Playlist Builder wouldn't always refresh the list to
      remove the file.
     -Fixed issue where upgrading from any previous Airtime would set "Toronto/America" as the default timezone
+    -Fixed playout engine (Pypo) using a large amount of CPU when there was a long history of played shows
+    -Fixed playout engine (Pypo) using 100% CPU when it could not connect to RabbitMQ
     
 1.9.3 - August 26th, 2011
   *Improvements

install_minimal/airtime-install

@@ -61,7 +61,7 @@ echo -e "\n*** Creating Pypo User ***"
 python ${SCRIPTPATH}/../python_apps/create-pypo-user.py
 
 set +e
-php ${SCRIPTPATH}/include/airtime-install.php $@
+php --php-ini ${SCRIPTPATH}/airtime-php.ini --file ${SCRIPTPATH}/include/airtime-install.php $@
 result=$?
 if [ "$result" -eq "2" ]; then
     #We've just finished an upgrade, so let's exit

install_minimal/include/airtime-upgrade.php

@@ -51,29 +51,31 @@ echo "******************************** Update Begin ****************************
 //convert strings like 1.9.0-devel to 1.9.0
 $version = substr($version, 0, 5);
 
+$SCRIPTPATH = __DIR__;
+
 if (strcmp($version, "1.7.0") < 0){
-    system("php ".__DIR__."/../upgrades/airtime-1.7.0/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.7.0/airtime-upgrade.php");
 }
 if (strcmp($version, "1.8.0") < 0){
-    system("php ".__DIR__."/../upgrades/airtime-1.8.0/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.8.0/airtime-upgrade.php");
 }
 if (strcmp($version, "1.8.1") < 0){
-    system("php ".__DIR__."/../upgrades/airtime-1.8.1/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.8.1/airtime-upgrade.php");
 }
 if (strcmp($version, "1.8.2") < 0){
-    system("php ".__DIR__."/../upgrades/airtime-1.8.2/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.8.2/airtime-upgrade.php");
 }
 if (strcmp($version, "1.9.0") < 0){
-    system("php ".__DIR__."/../upgrades/airtime-1.9.0/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.9.0/airtime-upgrade.php");
 }
 if (strcmp($version, "1.9.2") < 0){
-    system("php ".__DIR__."/../upgrades/airtime-1.9.2/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.9.2/airtime-upgrade.php");
 }
 if (strcmp($version, "1.9.3") < 0){
-    system("php ".__DIR__."/../upgrades/airtime-1.9.3/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.9.3/airtime-upgrade.php");
 }
 if (strcmp($version, "1.9.4") < 0){
-    system("php ".__DIR__."/../upgrades/airtime-1.9.4/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.9.4/airtime-upgrade.php");
 }
 
 //set the new version in the database.
@@ -85,16 +87,16 @@ $sql = "INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '$newVers
 $CC_DBC->query($sql);
 
 echo PHP_EOL."*** Updating Api Client ***".PHP_EOL;
-passthru("python ".__DIR__."/../../python_apps/api_clients/install/api_client_install.py");
+passthru("python $SCRIPTPATH/../../python_apps/api_clients/install/api_client_install.py");
 
 echo PHP_EOL."*** Updating Pypo ***".PHP_EOL;
-passthru("python ".__DIR__."/../../python_apps/pypo/install/pypo-install.py");
+passthru("python $SCRIPTPATH/../../python_apps/pypo/install/pypo-install.py");
 
 echo PHP_EOL."*** Updating Recorder ***".PHP_EOL;
-passthru("python ".__DIR__."/../../python_apps/show-recorder/install/recorder-install.py");
+passthru("python $SCRIPTPATH/../../python_apps/show-recorder/install/recorder-install.py");
 
 echo PHP_EOL."*** Updating Media Monitor ***".PHP_EOL;
-passthru("python ".__DIR__."/../../python_apps/media-monitor/install/media-monitor-install.py");
+passthru("python $SCRIPTPATH/../../python_apps/media-monitor/install/media-monitor-install.py");
 
 sleep(4);
 passthru("airtime-check-system");

install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php

@@ -84,21 +84,25 @@ class AirtimeInstall{
     public static function BypassMigrations($dir, $version)
     {
         $appDir = AirtimeInstall::GetAirtimeSrcDir();
-        $command = "php $appDir/library/doctrine/migrations/doctrine-migrations.phar ".
+        $SCRIPTPATH = __DIR__;
+        $command = "php --php-ini $SCRIPTPATH/../../airtime-php.ini ".
+                    "$appDir/library/doctrine/migrations/doctrine-migrations.phar ".
                     "--configuration=$dir/../../DoctrineMigrations/migrations.xml ".
                     "--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ".
                     "--no-interaction --add migrations:version $version";
-        system($command);
+        passthru($command);
     }
 
     public static function MigrateTablesToVersion($dir, $version)
     {
         $appDir = AirtimeInstall::GetAirtimeSrcDir();
-        $command = "php $appDir/library/doctrine/migrations/doctrine-migrations.phar ".
+        $SCRIPTPATH = __DIR__;
+        $command = "php --php-ini $SCRIPTPATH/../../airtime-php.ini ".
+                    "$appDir/library/doctrine/migrations/doctrine-migrations.phar ".
                     "--configuration=$dir/../../DoctrineMigrations/migrations.xml ".
                     "--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ".
                     "--no-interaction migrations:migrate $version";
-        system($command);
+        passthru($command);
     }
 
     public static function CreateCronFile(){