From 36979d35c75f9f9b8ddb8143f5a2e43df45d9a10 Mon Sep 17 00:00:00 2001 From: Nino Breuer Date: Wed, 29 Oct 2014 14:13:31 +0100 Subject: g --- dozentenmodulserver/src/main/java/sql/SQL.java | 50 ++++++++++++++------------ 1 file changed, 27 insertions(+), 23 deletions(-) (limited to 'dozentenmodulserver/src/main/java') diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java index 8fc5d8f3..93f76a10 100644 --- a/dozentenmodulserver/src/main/java/sql/SQL.java +++ b/dozentenmodulserver/src/main/java/sql/SQL.java @@ -435,18 +435,17 @@ public class SQL { + "' AND u.userID = pmi.userID AND pmi.link_allowed = 1 AND pmi.GUID_imageID = vl.GUID_imageID AND vl.content_operatingSystem=os.operatingSystemID;"); while (res.next()) { - list.add(new Image(res.getString("GUID_imageID"), res - .getString("imageVersion"), - res.getString("image_name"), res - .getString("cond_hasLicenseRestriction"), res - .getString("name") - + " " - + res.getString("architecture") + " bit", res - .getString("lecture"), res - .getString("image_update_time"), res - .getString("user"), res - .getString("image_isTemplate"), - res.getString("image_description"))); + list.add(new Image( + res.getString("GUID_imageID"), + res.getString("imageVersion"), + res.getString("image_name"), + res.getString("cond_hasLicenseRestriction"), + res.getString("name") + " " + res.getString("architecture") + " bit", + res.getString("lecture"), + res.getString("image_update_time"), + res.getString("user"), + res.getString("image_isTemplate"), + res.getString("image_description"))); } con.close(); } catch (SQLException e) { @@ -473,17 +472,22 @@ public class SQL { + "' AND u.userID = pmi.userID AND pmi.image_admin = 1 AND pmi.GUID_imageID = vl.GUID_imageID AND vl.content_operatingSystem=os.operatingSystemID;"); while (res.next()) { - list.add(new Image(res.getString("GUID_imageID"), res - .getString("imageVersion"), - res.getString("image_name"), res - .getString("cond_hasLicenseRestriction"), res - .getString("name") - + " " - + res.getString("architecture") + " bit", res - .getString("lecture"), res - .getString("image_update_time"), res - .getString("user"), res - .getString("image_isTemplate"))); + list.add(new Image( + res.getString("GUID_imageID"), + res.getString("imageVersion"), + res.getString("image_name"), + res.getString("cond_hasLicenseRestriction"), + res.getString("name") + " " + res.getString("architecture") + " bit", + res.getString("lecture"), + res.getString("image_update_time"), + res.getString("user"), + res.getString("image_isTemplate"), + res.getString("image_description") + ) + ); + + + } con.close(); } catch (SQLException e) { -- cgit v1.2.3-55-g7522