diff options
| author | Tobias Spitzer | 2014-07-25 12:15:09 +0200 |
|---|---|---|
| committer | Tobias Spitzer | 2014-07-25 12:15:09 +0200 |
| commit | 6e1827810388387804b9700f7ba6f5a377c6241a (patch) | |
| tree | 48068e68763365f1e93312d12db39d881f95b710 /Dozentenmodulserver/src/sql | |
| parent | Permission GUI zur Veranschaulichung (keine Funktionalität) implementiert (diff) | |
| download | tutor-module-6e1827810388387804b9700f7ba6f5a377c6241a.tar.gz tutor-module-6e1827810388387804b9700f7ba6f5a377c6241a.tar.xz tutor-module-6e1827810388387804b9700f7ba6f5a377c6241a.zip | |
Suchfenster um Reiter Vorlage ergänzt
Diffstat (limited to 'Dozentenmodulserver/src/sql')
| -rw-r--r-- | Dozentenmodulserver/src/sql/SQL.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 72c4098b..8622b06b 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -298,7 +298,7 @@ public class SQL { try {
stm = con.createStatement();
ResultSet res=stm
- .executeQuery("SELECT vl.GUID_imageID, vl.imageVersion,vl.image_name, vl.cond_hasLicenseRestriction, os.name, '' as lecture,vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and vl.image_owner=u.userID and vl.image_name not in (SELECT vl.image_name FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID) union SELECT vl.GUID_imageID, vl.imageVersion,vl.image_name, vl.cond_hasLicenseRestriction, os.name, lect.name as lecture, vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID;");
+ .executeQuery("SELECT vl.GUID_imageID, vl.imageVersion,vl.image_name, vl.cond_hasLicenseRestriction, os.name,os.architecture, '' as lecture,vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user, vl.image_isTemplate FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and vl.image_owner=u.userID and vl.image_name not in (SELECT vl.image_name FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID) union SELECT vl.GUID_imageID, vl.imageVersion,vl.image_name, vl.cond_hasLicenseRestriction, os.name,os.architecture, lect.name as lecture, vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) as user, vl.image_isTemplate FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID;");
@@ -309,9 +309,9 @@ public class SQL { .getString("imageVersion"),
res.getString("image_name"), res
.getString("cond_hasLicenseRestriction"), res
- .getString("name"), res.getString("lecture"),
+ .getString("name")+" "+res.getString("architecture")+" bit", res.getString("lecture"),
res.getString("image_update_time"), res
- .getString("user")));
+ .getString("user"), res.getString("image_isTemplate")));
}
|