Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage

This commit is contained in:
drigato 2014-11-20 17:11:50 -05:00
commit 544767a775
2 changed files with 12 additions and 0 deletions

View file

@ -210,6 +210,13 @@ class Application_Model_StoredFile
if ($dbColumn == "track_title" && (is_null($mdValue) || $mdValue == "")) {
continue;
}
// Bpm gets POSTed as a string type. With Propel 1.6 this value
// was casted to an integer type before saving it to the db. But
// Propel 1.7 does not do this
if ($dbColumn == "bpm") {
$mdValue = (int) $mdValue;
}
# TODO : refactor string evals
if (isset($this->_dbMD[$dbColumn])) {
$propelColumn = $this->_dbMD[$dbColumn];

View file

@ -30,6 +30,11 @@ setup(name='airtime_analyzer',
'python-daemon',
'requests',
'apache-libcloud',
# These next 3 are required for requests to support SSL with SNI. Learned this the hard way...
# What sucks is that GCC is required to pip install these.
#'ndg-httpsclient',
#'pyasn1',
#'pyopenssl'
],
zip_safe=False,
data_files=data_files)