diff options
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java')
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java | 21 |
1 files changed, 18 insertions, 3 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 603b72fe..a8889d78 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 @@ -547,7 +547,7 @@ public class DbLecture { // Get required data about lecture and used image MysqlStatement stmt = connection.prepareStatement("SELECT" + " l.displayname AS lecturename, l.starttime, l.endtime, l.isenabled, l.hasusbaccess," - + " l.runscript, o.virtoskeyword, i.virtualizerconfig" + + " l.runscript, b.osid, o.virtoskeyword, i.virtualizerconfig" + " FROM lecture l " + " INNER JOIN imageversion i USING (imageversionid)" + " INNER JOIN imagebase b USING (imagebaseid)" @@ -573,8 +573,9 @@ public class DbLecture { osKeyword = rs.getString("virtoskeyword"); usbAccess = rs.getBoolean("hasusbaccess"); retval.vmx = meta; - retval.runScript = rs.getString("runscript"); + retval.legacyRunScript = rs.getString("runscript"); retval.netShares = DbLectureNetshare.getLectureNetshares(connection, lectureId); + retval.runScript = DbRunScript.getRunScriptsForLaunch(connection, lectureId, rs.getInt("osid")); // Everything worked so far, update statistics counters MysqlStatement upStmt = connection.prepareStatement("UPDATE" + " lecture SET lastused = UNIX_TIMESTAMP(), usecount = usecount + 1" @@ -653,10 +654,24 @@ public class DbLecture { MailGenerator.lectureDeactivated(lectures); } + public static class RunScript { + public final String content; + public final String extension; + public final int visibility; + public final boolean passCreds; + RunScript(String content, String extension, int visibility, boolean passCreds) { + this.content = content; + this.extension = extension; + this.visibility = visibility; + this.passCreds = passCreds; + } + } + public static class LaunchData { public VmMetaData<?, ?, ?, ?> vmx; public List<NetShare> netShares; - public String runScript; + public String legacyRunScript; + public List<RunScript> runScript; } } |