diff options
| author | Björn Hagemeister | 2014-10-08 18:02:30 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-10-08 18:02:30 +0200 |
| commit | 6c4e2fa4523d4a4858d819064f0ed7c42fa8d89c (patch) | |
| tree | 866c32b8dc72319941e0146d09a708c39bcebd5a /src/main/java/org/openslx/satellitedaemon/db/DbImage.java | |
| parent | Configuration splitup (WIP) (diff) | |
| download | satellite-daemon-6c4e2fa4523d4a4858d819064f0ed7c42fa8d89c.tar.gz satellite-daemon-6c4e2fa4523d4a4858d819064f0ed7c42fa8d89c.tar.xz satellite-daemon-6c4e2fa4523d4a4858d819064f0ed7c42fa8d89c.zip | |
Splitted Globals.java into two classes and splitted config file global.properties into global.properties and identity.properties.
Diffstat (limited to 'src/main/java/org/openslx/satellitedaemon/db/DbImage.java')
| -rw-r--r-- | src/main/java/org/openslx/satellitedaemon/db/DbImage.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/satellitedaemon/db/DbImage.java b/src/main/java/org/openslx/satellitedaemon/db/DbImage.java index c99ca40..03ad078 100644 --- a/src/main/java/org/openslx/satellitedaemon/db/DbImage.java +++ b/src/main/java/org/openslx/satellitedaemon/db/DbImage.java @@ -49,7 +49,7 @@ public class DbImage public static List<DbImage> getAllMarkedForUpload() { return MySQL.findAll( DbImage.class, "SELECT image.GUID_imageID, image.image_name, image.imageVersion, image.image_path," + - " user.loginName AS userID, image.image_filesize, image.rec_create_time, image.rec_change_time" + + " user.loginName AS userID, image.image_filesize, UNIX_TIMESTAMP(image.rec_create_time), UNIX_TIMESTAMP(image.rec_change_time)" + " FROM m_VLData_imageInfo image" + " INNER JOIN m_user user ON (image.image_owner = user.userID)" + " INNER JOIN m_institution institution ON (institution.institutionID = user.institution)" + @@ -67,7 +67,7 @@ public class DbImage public static List<DbImage> getAllMarkedForDownload() { return MySQL.findAll( DbImage.class, "SELECT image.GUID_imageID, image.image_name, image.imageVersion, image.image_path," + - " user.loginName AS userID, image.image_filesize, image.rec_create_time, image.rec_change_time" + + " user.loginName AS userID, image.image_filesize, UNIX_TIMESTAMP(image.rec_create_time), UNIX_TIMESTAMP(image.rec_change_time)" + " FROM m_VLData_imageInfo image" + " INNER JOIN m_user user ON (image.image_owner = user.userID)" + " INNER JOIN m_institution institution ON (institution.institutionID = user.institution)" + |