From c8559cc88c65a8ba6e4f5d2ed878662daa056b5b Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Sun, 17 Jun 2012 23:38:36 -0400
Subject: [PATCH] 2.1.2 preparation

---
 CREDITS                                       |  7 ++++++
 VERSION                                       |  2 +-
 changelog                                     |  4 ++++
 install_minimal/include/airtime-constants.php |  2 +-
 install_minimal/include/airtime-upgrade.php   |  4 ++++
 .../upgrades/airtime-2.1.2/DbUpgrade.php      | 24 +++++++++++++++++++
 .../airtime-2.1.2/airtime-upgrade.php         |  8 +++++++
 .../upgrades/airtime-2.1.2/data/upgrade.sql   |  2 ++
 python_apps/api_clients/api_client.py         |  2 +-
 9 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 install_minimal/upgrades/airtime-2.1.2/DbUpgrade.php
 create mode 100644 install_minimal/upgrades/airtime-2.1.2/airtime-upgrade.php
 create mode 100644 install_minimal/upgrades/airtime-2.1.2/data/upgrade.sql

diff --git a/CREDITS b/CREDITS
index f48a2d5dc..3a15126a2 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,3 +1,10 @@
+=======
+CREDITS
+=======
+Version 2.1.2
+-------------
+Same as previous version.
+
 =======
 CREDITS
 =======
diff --git a/VERSION b/VERSION
index 1d69936fb..0b9f4ef5f 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
 PRODUCT_ID=Airtime
-PRODUCT_RELEASE=2.1.1
+PRODUCT_RELEASE=2.1.2
diff --git a/changelog b/changelog
index ab1405369..579c4db28 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,7 @@
+2.1.2 - June 18th, 2012
+  * Bug Fixes
+    * Fixed problem where playout engine may not retrieve program schedule after extended periods of user inactivity.
+
 2.1.1 - June 12th, 2012
   * Changes
     * Add Media page will now display error message and reject uploaded file if it is corrupt
diff --git a/install_minimal/include/airtime-constants.php b/install_minimal/include/airtime-constants.php
index 2107ded4f..c33d25441 100644
--- a/install_minimal/include/airtime-constants.php
+++ b/install_minimal/include/airtime-constants.php
@@ -1,3 +1,3 @@
 <?php
 
-define('AIRTIME_VERSION', '2.1.1');
+define('AIRTIME_VERSION', '2.1.2');
diff --git a/install_minimal/include/airtime-upgrade.php b/install_minimal/include/airtime-upgrade.php
index 12e978d9d..cd726f345 100644
--- a/install_minimal/include/airtime-upgrade.php
+++ b/install_minimal/include/airtime-upgrade.php
@@ -108,5 +108,9 @@ if (strcmp($version, "2.1.1") < 0){
     passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.1.1/airtime-upgrade.php");
     pause();
 } 
+if (strcmp($version, "2.1.2") < 0){
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.1.2/airtime-upgrade.php");
+    pause();
+} 
 
 echo "******************************* Upgrade Complete *******************************".PHP_EOL;
diff --git a/install_minimal/upgrades/airtime-2.1.2/DbUpgrade.php b/install_minimal/upgrades/airtime-2.1.2/DbUpgrade.php
new file mode 100644
index 000000000..bda71b900
--- /dev/null
+++ b/install_minimal/upgrades/airtime-2.1.2/DbUpgrade.php
@@ -0,0 +1,24 @@
+<?php
+
+/* All functions other than start() should be marked as
+ * private.
+ */
+class AirtimeDatabaseUpgrade{
+
+    public static function start($p_dbValues){
+        echo "* Updating Database".PHP_EOL;
+        self::task0($p_dbValues);
+        echo " * Complete".PHP_EOL;
+    }
+
+    private static function task0($p_dbValues){
+        
+        $username = $p_dbValues['database']['dbuser'];
+        $password = $p_dbValues['database']['dbpass'];
+        $host = $p_dbValues['database']['host'];
+        $database = $p_dbValues['database']['dbname'];
+        $dir = __DIR__;
+        
+        passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/data/upgrade.sql $database 2>&1 | grep -v \"will create implicit index\"");
+    }
+}
diff --git a/install_minimal/upgrades/airtime-2.1.2/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.1.2/airtime-upgrade.php
new file mode 100644
index 000000000..042b92d05
--- /dev/null
+++ b/install_minimal/upgrades/airtime-2.1.2/airtime-upgrade.php
@@ -0,0 +1,8 @@
+<?php
+
+require_once 'DbUpgrade.php';
+
+$filename = "/etc/airtime/airtime.conf";
+$values = parse_ini_file($filename, true);
+
+AirtimeDatabaseUpgrade::start($values);
diff --git a/install_minimal/upgrades/airtime-2.1.2/data/upgrade.sql b/install_minimal/upgrades/airtime-2.1.2/data/upgrade.sql
new file mode 100644
index 000000000..c4e6a42ab
--- /dev/null
+++ b/install_minimal/upgrades/airtime-2.1.2/data/upgrade.sql
@@ -0,0 +1,2 @@
+DELETE FROM cc_pref WHERE keystr = 'system_version';
+INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.1.2');
diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py
index e22a47748..f3f7cd327 100644
--- a/python_apps/api_clients/api_client.py
+++ b/python_apps/api_clients/api_client.py
@@ -20,7 +20,7 @@ from configobj import ConfigObj
 import string
 import hashlib
 
-AIRTIME_VERSION = "2.1.1"
+AIRTIME_VERSION = "2.1.2"
 
 def api_client_factory(config, logger=None):
     if logger != None: