diff options
| author | Simon Rettberg | 2015-09-09 18:56:48 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-09-09 18:56:48 +0200 |
| commit | 2e4b095b96d4878f064bd270c4f2756815d8ad57 (patch) | |
| tree | ba586f760a8ed593a7c8222fd15cadf09223b200 /dozentenmodulserver/src/main/java | |
| parent | [server] Delete incomplete uploads (missing meta data) (diff) | |
| download | tutor-module-2e4b095b96d4878f064bd270c4f2756815d8ad57.tar.gz tutor-module-2e4b095b96d4878f064bd270c4f2756815d8ad57.tar.xz tutor-module-2e4b095b96d4878f064bd270c4f2756815d8ad57.zip | |
[server] Make xml compatible with legacy run-virt
Diffstat (limited to 'dozentenmodulserver/src/main/java')
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java | 8 | ||||
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/VmChooserEntryXml.java | 13 |
2 files changed, 15 insertions, 6 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java index 7f980b7f..53eb1a24 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java @@ -411,12 +411,14 @@ public class DbLecture { try (MysqlConnection connection = Database.getConnection()) { MysqlStatement stmt = connection.prepareStatement("SELECT" + " l.lectureid, l.displayname AS lecturename, l.description," - + " l.endtime, l.usecount, o.displayname AS osname, v.virtname, b.istemplate" + + " l.endtime, l.usecount, o.displayname AS osname, v.virtname, b.istemplate," + + " v.virtid, ov.virtoskeyword" + " FROM lecture l " + " INNER JOIN imageversion i USING (imageversionid)" + " INNER JOIN imagebase b USING (imagebaseid)" + " INNER JOIN operatingsystem o USING (osid)" + " INNER JOIN virtualizer v USING (virtid)" + + " LEFT JOIN os_x_virt ov USING (osid, virtid)" + " WHERE l.isenabled = 1 AND l.isprivate = 0 AND l.isexam = :isexam" + " AND l.starttime < UNIX_TIMESTAMP() AND l.endtime > UNIX_TIMESTAMP() AND i.isvalid = 1"); stmt.setBoolean("isexam", exams); @@ -425,8 +427,8 @@ public class DbLecture { while (rs.next()) { String prio = rs.getBoolean("istemplate") ? "10" : "100"; list.add(new VmChooserEntryXml(prio, "-", rs.getString("lecturename"), - rs.getString("description"), rs.getString("lectureid"), rs.getString("virtname"), - rs.getString("osname"), "")); + rs.getString("description"), rs.getString("lectureid"), rs.getString("virtid"), + rs.getString("virtname"), rs.getString("virtoskeyword"), rs.getString("osname"), "")); } return list; } catch (SQLException e) { diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/VmChooserEntryXml.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/VmChooserEntryXml.java index d4b07606..102483bc 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/VmChooserEntryXml.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/VmChooserEntryXml.java @@ -23,17 +23,24 @@ public class VmChooserEntryXml { private VmChooserParamXml os; @Element private VmChooserParamXml icon; + @Element + private VmChooserParamXml virtualizer_name; + @Element + private VmChooserParamXml os_name; public VmChooserEntryXml(String priority, String creator, String short_description, - String long_description, String uuid, String virtualmachine, String os, String icon) { + String long_description, String uuid, String virtId, String virtualizerName, String osVirtName, + String osDisplayName, String icon) { this.priority = new VmChooserParamXml(priority); this.creator = new VmChooserParamXml(creator); this.short_description = new VmChooserParamXml(short_description); this.long_description = new VmChooserParamXml(long_description); this.uuid = new VmChooserParamXml(uuid); - this.virtualmachine = new VmChooserParamXml(virtualmachine); - this.os = new VmChooserParamXml(os); + this.virtualmachine = new VmChooserParamXml(virtId); + this.os = new VmChooserParamXml(osVirtName); this.icon = new VmChooserParamXml(icon); + this.virtualizer_name = new VmChooserParamXml(virtualizerName); + this.os_name = new VmChooserParamXml(osDisplayName); } private static class VmChooserParamXml { |