projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merged 1.1 branch into head
[mir.git]
/
source
/
mircoders
/
storage
/
DatabaseUploadedMedia.java
diff --git
a/source/mircoders/storage/DatabaseUploadedMedia.java
b/source/mircoders/storage/DatabaseUploadedMedia.java
index
ce42e11
..
97294fb
100755
(executable)
--- a/
source/mircoders/storage/DatabaseUploadedMedia.java
+++ b/
source/mircoders/storage/DatabaseUploadedMedia.java
@@
-36,13
+36,13
@@
import mir.entity.Entity;
import mir.entity.EntityBrowser;
import mir.log.LoggerWrapper;
import mir.storage.Database;
import mir.entity.EntityBrowser;
import mir.log.LoggerWrapper;
import mir.storage.Database;
-import mir.storage.
StorageObject
;
-import mir
.storage.StorageObjectFailure
;
+import mir.storage.
DatabaseFailure
;
+import mir
coders.entity.EntityUploadedMedia
;
-public class DatabaseUploadedMedia extends Database
implements StorageObject
{
- private static DatabaseUploadedMedia
instance;
+public class DatabaseUploadedMedia extends Database {
+ private static DatabaseUploadedMedia instance;
- public s
ynchronized static
DatabaseUploadedMedia getInstance() {
+ public s
tatic synchronized
DatabaseUploadedMedia getInstance() {
if (instance == null ) {
instance = new DatabaseUploadedMedia();
}
if (instance == null ) {
instance = new DatabaseUploadedMedia();
}
@@
-51,13
+51,10
@@
public class DatabaseUploadedMedia extends Database implements StorageObject {
}
private DatabaseUploadedMedia() {
}
private DatabaseUploadedMedia() {
- super();
-
logger = new LoggerWrapper("Database.UploadedMedia");
mainTable="uploaded_media";
logger = new LoggerWrapper("Database.UploadedMedia");
mainTable="uploaded_media";
- primaryKeySequence="media_id_seq";
- theEntityClass = mircoders.entity.EntityUploadedMedia.class;
+ entityClass = EntityUploadedMedia.class;
}
}
@@
-65,19
+62,24
@@
public class DatabaseUploadedMedia extends Database implements StorageObject {
* returns the media_type that belongs to the media item (via entityrelation)
* where db-flag is_published is true
*/
* returns the media_type that belongs to the media item (via entityrelation)
* where db-flag is_published is true
*/
- public Entity getMediaType(Entity
ent) throws StorageObject
Failure {
+ public Entity getMediaType(Entity
aMedia) throws Database
Failure {
Entity type=null;
try {
Entity type=null;
try {
- Iterator i = new EntityBrowser(DatabaseMediaType.getInstance(), ent.getFieldValue("to_media_type") + " = id" , "id", 1);
- if (i.hasNext())
+ Iterator i = new EntityBrowser(DatabaseMediaType.getInstance(), aMedia.getFieldValue("to_media_type") + " = id" , "id", 1);
+
+ if (i.hasNext()) {
type = (Entity) i.next();
type = (Entity) i.next();
+ }
}
catch (Throwable t) {
logger.error("DatabaseUploadedMedia :: failed to get media_type: " + t.getMessage());
}
catch (Throwable t) {
logger.error("DatabaseUploadedMedia :: failed to get media_type: " + t.getMessage());
- throw new
StorageObject
Failure("DatabaseUploadedMedia :: failed to get media_type", t);
+ throw new
Database
Failure("DatabaseUploadedMedia :: failed to get media_type", t);
}
return type;
}
}
return type;
}
+ protected String getPrimaryKeySequence() {
+ return "media_id_seq";
+ }
}
}