Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
james 2011-07-08 17:46:50 -04:00
commit ece84a04c5
8 changed files with 73 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/ApiController.php
View file

@ -121,7 +121,7 @@ class ApiController extends Zend_Controller_Action
//make sure to exit here so that no other output is sent.
exit;
} else {
$logger->err('Resource in database, but not in storage: '.$filepath.' '.is_file($filepath));
$logger->err('Resource in database, but not in storage: "'.$filepath.'"');
}
} else {
$logger->err('$media != null && !PEAR::isError($media)');

21
airtime_mvc/application/controllers/LibraryController.php
View file

@ -207,25 +207,4 @@ class LibraryController extends Zend_Controller_Action
}
}
}

17
airtime_mvc/application/models/StoredFile.php
View file

@ -824,12 +824,16 @@ class StoredFile {
public static function listAllFiles($dir_id){
global $CC_DBC;
$sql = "SELECT m.directory || '/' || f.filepath as fp"
." FROM CC_MUSIC_DIRS m"
." LEFT JOIN CC_FILES f"
." ON m.id = f.directory"
." WHERE m.id = f.directory"
." AND m.id = $dir_id";
// $sql = "SELECT m.directory || '/' || f.filepath as fp"
// ." FROM CC_MUSIC_DIRS m"
// ." LEFT JOIN CC_FILES f"
// ." ON m.id = f.directory"
// ." WHERE m.id = f.directory"
// ." AND m.id = $dir_id";
$sql = "SELECT filepath as fp"
." FROM CC_FILES"
." WHERE directory = $dir_id";
$rows = $CC_DBC->getAll($sql);
$results = array();
@ -839,6 +843,5 @@ class StoredFile {
return $results;
}
}