diff options
Diffstat (limited to 'src/main/java/org/openslx/satellitedaemon/db/DbImage.java')
| -rw-r--r-- | src/main/java/org/openslx/satellitedaemon/db/DbImage.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/org/openslx/satellitedaemon/db/DbImage.java b/src/main/java/org/openslx/satellitedaemon/db/DbImage.java index 7079380..c99ca40 100644 --- a/src/main/java/org/openslx/satellitedaemon/db/DbImage.java +++ b/src/main/java/org/openslx/satellitedaemon/db/DbImage.java @@ -15,13 +15,15 @@ public class DbImage public final String path; public final String creator; public final long fileSize; + public final long changeTime; + public final long createTime; public enum Status { only_local, to_be_published, being_published, successfully_published, to_be_decentralized, being_decentralized, successfully_decentralized } - public DbImage(String guid, String name, Integer rid, String path, String creator, Long fileSize) + public DbImage(String guid, String name, Integer rid, String path, String creator, Long fileSize, Long createTime, Long changeTime) { if ( rid == null ) rid = -1; @@ -33,6 +35,8 @@ public class DbImage this.path = path; this.creator = creator; this.fileSize = fileSize; + this.createTime = createTime; + this.changeTime = changeTime; } /** @@ -45,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, '@', institution.name) AS userID, image.image_filesize" + + " user.loginName AS userID, image.image_filesize, image.rec_create_time, 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)" + @@ -63,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," + - " Concat(user.loginName, '@', institution.name) AS userID, image.image_filesize" + + " user.loginName AS userID, image.image_filesize, image.rec_create_time, 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)" + |