diff options
| author | Simon Rettberg | 2014-05-22 13:45:35 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-05-22 13:45:35 +0200 |
| commit | c290d541c1e13af56b4b95155ff545d6faa76f92 (patch) | |
| tree | 676bd7348a1cc6635fee5f33cd7caca26e61f73d /src/main/java/org/openslx/satellitedaemon/db/DbImage.java | |
| parent | Finished UploadWorker and added some comments. (diff) | |
| download | satellite-daemon-c290d541c1e13af56b4b95155ff545d6faa76f92.tar.gz satellite-daemon-c290d541c1e13af56b4b95155ff545d6faa76f92.tar.xz satellite-daemon-c290d541c1e13af56b4b95155ff545d6faa76f92.zip | |
Added some notes
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 9298a54..ffaa4c1 100644 --- a/src/main/java/org/openslx/satellitedaemon/db/DbImage.java +++ b/src/main/java/org/openslx/satellitedaemon/db/DbImage.java @@ -10,16 +10,20 @@ public class DbImage { public final String guid; + public final String name; public final int rid; public final String path; public final String creator; + public final long fileSize; - public DbImage(String guid, int rid, String path, String creator) + public DbImage(String guid, String name, int rid, String path, String creator, long fileSize) { this.guid = guid; + this.name = name; this.rid = rid; this.path = path; this.creator = creator; + this.fileSize = fileSize; } /** @@ -31,8 +35,8 @@ public class DbImage */ public static List<DbImage> getAllMarkedForUpload() { - return MySQL.findAll( DbImage.class, "SELECT image.GUID_imageID, image.imageVersion, image.image_path," + - " Concat(user.loginName, '@', institution.name, '.de') AS userID" + // HACK: .de required for now + 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.filesize" + " 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)" + |