diff options
| author | Nils Schwabe | 2014-07-04 10:20:04 +0200 |
|---|---|---|
| committer | Nils Schwabe | 2014-07-04 10:20:04 +0200 |
| commit | 63af3084df7d6ea17defe104844a7298cda7b459 (patch) | |
| tree | a27364921ff16c4fe2dc7ea9a9f7d424a10c1a64 /src/main/java/org/openslx/imagemaster/db | |
| parent | Add implementation for the new up- and download protocoll (diff) | |
| download | masterserver-63af3084df7d6ea17defe104844a7298cda7b459.tar.gz masterserver-63af3084df7d6ea17defe104844a7298cda7b459.tar.xz masterserver-63af3084df7d6ea17defe104844a7298cda7b459.zip | |
Make use of the filetransfer classes
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/db')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/db/DbImage.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/DbImage.java b/src/main/java/org/openslx/imagemaster/db/DbImage.java index e3a8888..d34fdb3 100644 --- a/src/main/java/org/openslx/imagemaster/db/DbImage.java +++ b/src/main/java/org/openslx/imagemaster/db/DbImage.java @@ -105,7 +105,7 @@ public class DbImage * @param serverSessionId The server that is uploading this image * @return Affected rows */ - public static int insert( ImageData imageData, long ts, String token, List<Integer> missingBlocks, String serverSessionId) + public static int insert( ImageData imageData, long ts, String token, List<Integer> missingBlocks, String serverSessionId, String filepath) { Date createTime = new Date( imageData.imageCreateTime ); Date updateTime = new Date( imageData.imageUpdateTime ); @@ -122,7 +122,7 @@ public class DbImage 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, fileSize, token, missingBlocks, serverSessionId) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", - imageData.uuid, imageData.imageVersion, imageData.imageName, "!uploading!", + imageData.uuid, imageData.imageVersion, imageData.imageName, filepath, sdf.format( createTime ), sdf.format( updateTime ), imageData.imageOwner, imageData.conentOperatingSystem, imageData.statusIsValid, imageData.statusIsDeleted, imageData.imageShortDescription, |