projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
media handling fixes, gotten rid of StorageObject, set the default method for blots...
[mir.git]
/
source
/
mircoders
/
storage
/
DatabaseContent.java
diff --git
a/source/mircoders/storage/DatabaseContent.java
b/source/mircoders/storage/DatabaseContent.java
index
6d17273
..
c5283a5
100755
(executable)
--- a/
source/mircoders/storage/DatabaseContent.java
+++ b/
source/mircoders/storage/DatabaseContent.java
@@
-35,7
+35,7
@@
import java.sql.Statement;
import mir.log.LoggerWrapper;
import mir.storage.Database;
import mir.log.LoggerWrapper;
import mir.storage.Database;
-import mir.storage.
StorageObject
;
+import mir.storage.
Database
;
import mir.storage.StorageObjectFailure;
/**
import mir.storage.StorageObjectFailure;
/**
@@
-44,7
+44,7
@@
import mir.storage.StorageObjectFailure;
*
*/
*
*/
-public class DatabaseContent extends Database
implements StorageObject
{
+public class DatabaseContent extends Database {
private static DatabaseContent instance;
private static DatabaseContent instance;
@@
-64,11
+64,11
@@
public class DatabaseContent extends Database implements StorageObject {
private DatabaseContent() throws StorageObjectFailure {
super();
private DatabaseContent() throws StorageObjectFailure {
super();
-
the
Table="content";
-
theCoreTable="media
";
+
main
Table="content";
+
primaryKeySequence="media_id_seq
";
logger = new LoggerWrapper("Database.Content");
logger = new LoggerWrapper("Database.Content");
-
theE
ntityClass = mircoders.entity.EntityContent.class;
+
e
ntityClass = mircoders.entity.EntityContent.class;
}
// methods
}
// methods
@@
-83,7
+83,7
@@
public class DatabaseContent extends Database implements StorageObject {
String sql = "update content set is_produced='0' where " + where;
logger.debug("set unproduced: "+where);
try {
String sql = "update content set is_produced='0' where " + where;
logger.debug("set unproduced: "+where);
try {
- con =
getPooledC
on();
+ con =
obtainConnecti
on();
// should be a preparedStatement because is faster
stmt = con.createStatement();
executeUpdate(stmt,sql);
// should be a preparedStatement because is faster
stmt = con.createStatement();
executeUpdate(stmt,sql);