diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 4dce47a29..2435b4e87 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -120,6 +120,8 @@ class ApiController extends Zend_Controller_Action if ($media != null) { $filepath = $media->getFilePath(); + // Make sure we don't have some wrong result beecause of caching + clearstatcache(); if (is_file($filepath)) { $full_path = $media->getPropelOrm()->getDbFilepath(); @@ -468,8 +470,8 @@ class ApiController extends Zend_Controller_Action // Replace this compound result in a hash with proper error handling later on $return_hash = array(); Application_Model_Preference::SetImportTimestamp(); - Logging::info("--->Mode: $mode || file: {$md['MDATA_KEY_FILEPATH']} "); - Logging::info( $md ); + //Logging::info("--->Mode: $mode || file: {$md['MDATA_KEY_FILEPATH']} "); + //Logging::info( $md ); if ($mode == "create") { $filepath = $md['MDATA_KEY_FILEPATH']; $filepath = Application_Common_OsPath::normpath($filepath); diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor2/media/monitor/pure.py index 5329df165..77a725941 100644 --- a/python_apps/media-monitor2/media/monitor/pure.py +++ b/python_apps/media-monitor2/media/monitor/pure.py @@ -496,7 +496,7 @@ def toposort(data): for k, v in data.items(): v.discard(k) # Ignore self dependencies extra_items_in_deps = reduce(set.union, data.values()) - set(data.keys()) - data.update({item:set() for item in extra_items_in_deps}) + data.update(dict((item,set()) for item in extra_items_in_deps)) while True: ordered = set(item for item,dep in data.items() if not dep) if not ordered: break