projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get url
[mir.git]
/
source
/
mircoders
/
storage
/
DatabaseContentToMedia.java
diff --git
a/source/mircoders/storage/DatabaseContentToMedia.java
b/source/mircoders/storage/DatabaseContentToMedia.java
index
2f85cd2
..
5a42010
100755
(executable)
--- a/
source/mircoders/storage/DatabaseContentToMedia.java
+++ b/
source/mircoders/storage/DatabaseContentToMedia.java
@@
-51,7
+51,7
@@
public class DatabaseContentToMedia extends Database implements StorageObject{
// get all to_topic from media_x_topic
String id = content.getId();
//this is not supported by mysql
// get all to_topic from media_x_topic
String id = content.getId();
//this is not supported by mysql
- String subselect = "id in (select
to_media
from " + theTable + " where content_id=" + id+")";
+ String subselect = "id in (select
media_id
from " + theTable + " where content_id=" + id+")";
try {
returnList = DatabaseMedia.getInstance().selectByWhereClause(subselect,-1);
try {
returnList = DatabaseMedia.getInstance().selectByWhereClause(subselect,-1);
@@
-92,7
+92,10
@@
public class DatabaseContentToMedia extends Database implements StorageObject{
*
*/
public EntityList getUploadedMedia(EntityContent content)
*
*/
public EntityList getUploadedMedia(EntityContent content)
- throws StorageObjectException {
+ throws StorageObjectException
+ {
+ /** @todo this should only fetch published media / rk */
+
EntityList returnList=null;
if (content != null) {
// get all to_topic from media_x_topic
EntityList returnList=null;
if (content != null) {
// get all to_topic from media_x_topic
@@
-103,6
+106,7
@@
public class DatabaseContentToMedia extends Database implements StorageObject{
try {
returnList = DatabaseMedia.getInstance().selectByWhereClause(subselect,"id");
} catch (Exception e) {
try {
returnList = DatabaseMedia.getInstance().selectByWhereClause(subselect,"id");
} catch (Exception e) {
+ e.printStackTrace();
theLog.printDebugInfo("-- get uploadedMedia failed " + e.toString());
throw new StorageObjectException("-- get uploadedMedia failed " + e.toString());
}
theLog.printDebugInfo("-- get uploadedMedia failed " + e.toString());
throw new StorageObjectException("-- get uploadedMedia failed " + e.toString());
}