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
/
DatabaseImages.java
diff --git
a/source/mircoders/storage/DatabaseImages.java
b/source/mircoders/storage/DatabaseImages.java
index
33a0769
..
2125d29
100755
(executable)
--- a/
source/mircoders/storage/DatabaseImages.java
+++ b/
source/mircoders/storage/DatabaseImages.java
@@
-36,16
+36,9
@@
import mir.entity.Entity;
import mir.log.LoggerWrapper;
import mir.misc.StringUtil;
import mir.storage.Database;
import mir.log.LoggerWrapper;
import mir.misc.StringUtil;
import mir.storage.Database;
-import mir.storage.StorageObject;
-import mir.storage.StorageObjectFailure;
+import mir.storage.DatabaseFailure;
-/**
- * <b>Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle
- *
- *
- */
-
-public class DatabaseImages extends Database implements StorageObject{
+public class DatabaseImages extends Database {
private static DatabaseImages instance;
private static DatabaseImages instance;
@@
-61,13
+54,13
@@
public class DatabaseImages extends Database implements StorageObject{
logger = new LoggerWrapper("Database.Images");
logger = new LoggerWrapper("Database.Images");
- hasTimestamp = true;
mainTable = "images";
mainTable = "images";
- primaryKeySequence = "media_id_seq";
- theEntityClass = mircoders.entity.EntityImages.class;
+ entityClass = mircoders.entity.EntityImages.class;
+ markBinaryField("image_data");
+ markBinaryField("icon_data");
}
}
- public void update(Entity theEntity) throws
StorageObject
Failure {
+ public void update(Entity theEntity) throws
Database
Failure {
String date = theEntity.getFieldValue("date");
if (date == null) {
date = StringUtil.date2webdbDate(new GregorianCalendar());
String date = theEntity.getFieldValue("date");
if (date == null) {
date = StringUtil.date2webdbDate(new GregorianCalendar());
@@
-77,7
+70,7
@@
public class DatabaseImages extends Database implements StorageObject{
super.update(theEntity);
}
super.update(theEntity);
}
- public String insert(Entity theEntity) throws
StorageObject
Failure {
+ public String insert(Entity theEntity) throws
Database
Failure {
String date = theEntity.getFieldValue("date");
if (date == null) {
String date = theEntity.getFieldValue("date");
if (date == null) {
@@
-87,4
+80,8
@@
public class DatabaseImages extends Database implements StorageObject{
return super.insert(theEntity);
}
return super.insert(theEntity);
}
+
+ protected String getPrimaryKeySequence() {
+ return "media_id_seq";
+ }
}
}