From e503c952d2030efd81fa4ad62825dc4649be9bee Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Thu, 24 Apr 2014 17:05:38 -0400
Subject: [PATCH 1/5] CC-5816: Publisher column

* Kanye West support. Surely
---
 .../airtime_analyzer/airtime_analyzer/metadata_analyzer.py      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/python_apps/airtime_analyzer/airtime_analyzer/metadata_analyzer.py b/python_apps/airtime_analyzer/airtime_analyzer/metadata_analyzer.py
index fada83683..2d0e09fc2 100644
--- a/python_apps/airtime_analyzer/airtime_analyzer/metadata_analyzer.py
+++ b/python_apps/airtime_analyzer/airtime_analyzer/metadata_analyzer.py
@@ -1,6 +1,7 @@
 import time
 import datetime
 import mutagen
+import logging
 from analyzer import Analyzer
 
 class MetadataAnalyzer(Analyzer):
@@ -92,6 +93,7 @@ class MetadataAnalyzer(Analyzer):
             'genre':        'genre',
             'isrc':         'isrc',
             'label':        'label',
+            'organization': 'label',
             #'length':       'length',
             'language':     'language',
             'last_modified':'last_modified',

From 54db74f622dda1fd8e188f7bb99b29e0ff2e5c6b Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Fri, 25 Apr 2014 00:40:51 -0400
Subject: [PATCH 2/5] Allow upgrades from Airtime 2.5.1 because the version
 wasn't bumped internally to 2.5.2

---
 airtime_mvc/application/controllers/UpgradeController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/controllers/UpgradeController.php b/airtime_mvc/application/controllers/UpgradeController.php
index ae7ad3e7e..2a22999f3 100644
--- a/airtime_mvc/application/controllers/UpgradeController.php
+++ b/airtime_mvc/application/controllers/UpgradeController.php
@@ -123,12 +123,12 @@ class UpgradeController extends Zend_Controller_Action
             ->findOne();
         $airtime_version = $pref->getValStr();
 
-        if ($airtime_version != '2.5.2') {
+        if ($airtime_version != '2.5.2' || $airtime_version != '2.5.1') {
             $this->getResponse()
                 ->setHttpResponseCode(400)
-                ->appendBody("Upgrade to Airtime 2.5.3 FAILED. You must be using Airtime 2.5.2 to upgrade.");
+                ->appendBody("Upgrade to Airtime 2.5.3 FAILED. You must be using Airtime 2.5.1 or 2.5.2 to upgrade.");
             return false;
         }
         return true;
     }
-}
\ No newline at end of file
+}

From e7ea5e53011a77e8042354e33c89d4a76c15d570 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Fri, 25 Apr 2014 00:48:13 -0400
Subject: [PATCH 3/5] Try fixing UpgradeController version check again...

---
 airtime_mvc/application/controllers/UpgradeController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/controllers/UpgradeController.php b/airtime_mvc/application/controllers/UpgradeController.php
index 2a22999f3..e9ad48131 100644
--- a/airtime_mvc/application/controllers/UpgradeController.php
+++ b/airtime_mvc/application/controllers/UpgradeController.php
@@ -123,7 +123,7 @@ class UpgradeController extends Zend_Controller_Action
             ->findOne();
         $airtime_version = $pref->getValStr();
 
-        if ($airtime_version != '2.5.2' || $airtime_version != '2.5.1') {
+        if (!in_array($airtime_version, ['2.5.1', '2.5.2']) {
             $this->getResponse()
                 ->setHttpResponseCode(400)
                 ->appendBody("Upgrade to Airtime 2.5.3 FAILED. You must be using Airtime 2.5.1 or 2.5.2 to upgrade.");

From cdc88d25e1ced90a41fa92cbd900697b25e65288 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Fri, 25 Apr 2014 01:02:47 -0400
Subject: [PATCH 4/5] Argh, fixed typo... it's late

---
 airtime_mvc/application/controllers/UpgradeController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/controllers/UpgradeController.php b/airtime_mvc/application/controllers/UpgradeController.php
index e9ad48131..b293aab59 100644
--- a/airtime_mvc/application/controllers/UpgradeController.php
+++ b/airtime_mvc/application/controllers/UpgradeController.php
@@ -123,7 +123,7 @@ class UpgradeController extends Zend_Controller_Action
             ->findOne();
         $airtime_version = $pref->getValStr();
 
-        if (!in_array($airtime_version, ['2.5.1', '2.5.2']) {
+        if (!in_array($airtime_version, ['2.5.1', '2.5.2'])) {
             $this->getResponse()
                 ->setHttpResponseCode(400)
                 ->appendBody("Upgrade to Airtime 2.5.3 FAILED. You must be using Airtime 2.5.1 or 2.5.2 to upgrade.");

From d9adba117af4989770314334b8c1304f4e0ff375 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Fri, 25 Apr 2014 01:08:08 -0400
Subject: [PATCH 5/5] One more time...

---
 airtime_mvc/application/controllers/UpgradeController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/controllers/UpgradeController.php b/airtime_mvc/application/controllers/UpgradeController.php
index b293aab59..9c4dd59d3 100644
--- a/airtime_mvc/application/controllers/UpgradeController.php
+++ b/airtime_mvc/application/controllers/UpgradeController.php
@@ -123,7 +123,7 @@ class UpgradeController extends Zend_Controller_Action
             ->findOne();
         $airtime_version = $pref->getValStr();
 
-        if (!in_array($airtime_version, ['2.5.1', '2.5.2'])) {
+        if (!in_array($airtime_version, array('2.5.1', '2.5.2'))) {
             $this->getResponse()
                 ->setHttpResponseCode(400)
                 ->appendBody("Upgrade to Airtime 2.5.3 FAILED. You must be using Airtime 2.5.1 or 2.5.2 to upgrade.");