diff options
| author | Nils Schwabe | 2014-06-19 15:10:35 +0200 |
|---|---|---|
| committer | Nils Schwabe | 2014-06-19 15:10:35 +0200 |
| commit | 13dab02ca0734f05cdf2020649b6857d9bea0143 (patch) | |
| tree | 5fab237c7dfed7b0365db527f10ea5b0c6843893 /src/main/java/org/openslx/imagemaster/db | |
| parent | Implement downloading functionality (diff) | |
| download | masterserver-13dab02ca0734f05cdf2020649b6857d9bea0143.tar.gz masterserver-13dab02ca0734f05cdf2020649b6857d9bea0143.tar.xz masterserver-13dab02ca0734f05cdf2020649b6857d9bea0143.zip | |
Fix problems with thrift connection
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/db')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/db/DbImage.java | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/DbImage.java b/src/main/java/org/openslx/imagemaster/db/DbImage.java index 59701e4..5d22e33 100644 --- a/src/main/java/org/openslx/imagemaster/db/DbImage.java +++ b/src/main/java/org/openslx/imagemaster/db/DbImage.java @@ -47,7 +47,7 @@ public class DbImage } public DbImage(String UUID, int imageVersion, String imageName, String imagePath, - Timestamp imageCreateTime, Timestamp imageUpdateTime, int imageOwner, String contentOperatingSystem, + Timestamp imageCreateTime, Timestamp imageUpdateTime, String imageOwner, String contentOperatingSystem, boolean isValid, boolean isDeleted, String shortDescription, String longDescription, Timestamp timestamp, String ftpUser, long fileSize) { @@ -57,7 +57,7 @@ public class DbImage this.imagePath = imagePath; this.imageCreateTime = imageCreateTime; this.imageUpdateTime = imageUpdateTime; - this.imageOwner = DbUser.getUserNameById( imageOwner ); + this.imageOwner = imageOwner; this.contentOperatingSystem = contentOperatingSystem; this.isValid = isValid; this.isDeleted = isDeleted; @@ -76,9 +76,7 @@ public class DbImage */ public static boolean exists( ImageData imageData ) { - if ( MySQL.findUniqueOrNull( DbImage.class, - "SELECT images.UUID FROM images WHERE images.UUID = ?", - imageData.uuid ) == null ) { + if ( MySQL.findUniqueOrNull( DbImage.class, "SELECT images.UUID FROM images WHERE images.UUID = ?", imageData.uuid ) == null ) { return false; } else { return true; @@ -98,16 +96,14 @@ public class DbImage Date timestamp = new Date( ts ); SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ); - int ownerId = DbUser.getUserIdByName( imageData.imageOwner ); - return MySQL .update( - "INSERT INTO images (UUID, image_version, image_name, image_path, image_createTime, image_updateTime, image_owner, content_operatingSystem, status_isValid, status_isDeleted, image_shortDescription, image_longDescription, timestamp, ftpUser, ftpPassword, fileSize) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", + "INSERT INTO images (UUID, image_version, image_name, image_path, image_createTime, image_updateTime, image_owner, content_operatingSystem, status_isValid, status_isDeleted, image_shortDescription, image_longDescription, timestamp, ftpUser, fileSize) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", imageData.uuid, imageData.imageVersion, imageData.imageName, "!uploading!", - sdf.format( createTime ), sdf.format( updateTime ), ownerId, + sdf.format( createTime ), sdf.format( updateTime ), imageData.imageOwner, imageData.conentOperatingSystem, imageData.statusIsValid, imageData.statusIsDeleted, imageData.imageShortDescription, - imageData.imageLongDescription, sdf.format( timestamp ), ftpUser, ftpPassword, imageData.fileSize ); + imageData.imageLongDescription, sdf.format( timestamp ), ftpUser, imageData.fileSize ); } public String getUUID() |