From d52857ea8b98a91a134b91c6fca3346c2c38affc Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Thu, 14 Jul 2011 17:13:11 -0400
Subject: [PATCH] CC-2279: Upgrade script for converting stor directory to new
 format

-further fixes..
---
 install/upgrades/airtime-1.9.0/airtime-upgrade.php | 7 +++++--
 python_apps/media-monitor/media-monitor-upgrade.py | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/install/upgrades/airtime-1.9.0/airtime-upgrade.php b/install/upgrades/airtime-1.9.0/airtime-upgrade.php
index 53f084cf2..35c19d4e4 100644
--- a/install/upgrades/airtime-1.9.0/airtime-upgrade.php
+++ b/install/upgrades/airtime-1.9.0/airtime-upgrade.php
@@ -417,12 +417,15 @@ execSqlQuery($sql);
 //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 path relative to the "directory" column.
 
+mkdir("/var/log/airtime/media-monitor/", 755, true);
+touch("/var/log/airtime/media-monitor/media-monitor.log");
+
 $mediaMonitorUpgradePath = realpath(__DIR__."/../../../python_apps/media-monitor/media-monitor-upgrade.py");
-exec("python $mediaMonitorUpgradePath", $output);
+exec("sudo python $mediaMonitorUpgradePath", $output);
 
 print_r($output);
 
-$oldAndNewFileNames = json_decode($output);
+$oldAndNewFileNames = json_decode($output[0]);
 
 print_r($oldAndNewFileNames);
 
diff --git a/python_apps/media-monitor/media-monitor-upgrade.py b/python_apps/media-monitor/media-monitor-upgrade.py
index ac56bc9b3..e799f86b5 100644
--- a/python_apps/media-monitor/media-monitor-upgrade.py
+++ b/python_apps/media-monitor/media-monitor-upgrade.py
@@ -8,9 +8,11 @@ import os
 import json
 import ConfigParser
 
+import os.path
+
 # configure logging
 try:
-    logging.config.fileConfig("logging.cfg")
+    logging.config.fileConfig("%s/logging.cfg"%os.path.dirname(__file__))
 except Exception, e:
     print 'Error configuring logging: ', e
     sys.exit(1)
@@ -32,7 +34,6 @@ mmc = MediaMonitorCommon(mmconfig)
 #read list of all files in stor location.....and one-by-one pass this through to
 #mmc.organize_files. print out json encoding of before and after
 pairs = []
-print "walking through %s" % stor_dir
 for root, dirs, files in os.walk(stor_dir):
     for f in files:
         #print os.path.join(root, f)