From 7658a51f286bad750eea3629b0fac4780c429afe Mon Sep 17 00:00:00 2001 From: Nino Breuer Date: Tue, 18 Nov 2014 15:31:20 +0100 Subject: • fixed bug, where there could only be one image and one lecture with the same name --- .../src/main/java/server/ServerHandler.java | 51 ++++++++++++---------- 1 file changed, 29 insertions(+), 22 deletions(-) (limited to 'dozentenmodulserver/src/main/java/server/ServerHandler.java') diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java index 79d10415..2c2c6167 100644 --- a/dozentenmodulserver/src/main/java/server/ServerHandler.java +++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java @@ -166,7 +166,7 @@ public class ServerHandler implements Server.Iface { String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, - long filesize, long shareMode, String os) throws TException { + long filesize, long shareMode, String os, String uid) throws TException { String mode = null; @@ -191,7 +191,7 @@ public class ServerHandler implements Server.Iface { // imagename,desc, imagePath, filesize,mode,pk_os); sql.setImageData(login, license, internet, cpu, ram, imagename, desc, - imagePath, filesize, mode, pk_os); + imagePath, filesize, mode, pk_os, uid); log.info("written VLdata"); // TODO Auto-generated method stub @@ -248,22 +248,24 @@ public class ServerHandler implements Server.Iface { @Override public boolean writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, - String imagename, String login, String firstname, String lastname, - String university, String Mail, String Tel, String Fak) + String imageID, String login, String firstname, String lastname, + String university, String Mail, String Tel, String Fak, String lectureID) throws TException { - String pk_image = null; + + //String pk_image = imageID; Map map = new HashMap(); int imageversion = 0; String pk_institution = sql.setInstitution(university); String pk_person = sql.setPerson(login, lastname, firstname, Mail, new Date(), pk_institution); - map = sql.getImageIDandVersion(imagename); + map = sql.getImageIDandVersion(imageID); - pk_image = map.get("GUID"); + //pk_image = map.get("GUID"); imageversion = Integer.parseInt(map.get("version")); - sql.setLectureData(pk_person, pk_image, imageversion, name, desc, - shortdesc, startDate, endDate, isActive); + + sql.setLectureData(pk_person, imageID, imageversion, name, desc, + shortdesc, startDate, endDate, isActive, lectureID); XMLCreator xml = new XMLCreator(sql.getConnection(), name); @@ -507,7 +509,7 @@ public class ServerHandler implements Server.Iface { } @Override - public boolean writeImageRights(String imagename, String username, + public boolean writeImageRights(String imageID, String username, String lastName, String firstName, String mail, String university, String role) throws TException { String pk_image = null; @@ -516,7 +518,7 @@ public class ServerHandler implements Server.Iface { String pk_institution = sql.setInstitution(university); String pk_person = sql.setPerson(username, lastName, firstName, mail, new Date(), pk_institution); - map = sql.getImageIDandVersion(imagename); + map = sql.getImageIDandVersion(imageID); pk_image = map.get("GUID"); imageversion = Integer.parseInt(map.get("version")); @@ -558,15 +560,15 @@ public class ServerHandler implements Server.Iface { } @Override - public boolean writeLectureRights(String lecturename, String username, + public boolean writeLectureRights(String lectureID, String username, String lastName, String firstName, String mail, String university, String role) throws TException { - String pk_lecture = null; + //String pk_lecture = null; String pk_institution = sql.setInstitution(university); String pk_person = sql.setPerson(username, lastName, firstName, mail, new Date(), pk_institution); - pk_lecture = sql.getLectureID(lecturename); + //pk_lecture = sql.getLectureID(lectureID); if (role.equals("Dozent")) { int read = 1; @@ -575,7 +577,7 @@ public class ServerHandler implements Server.Iface { int admin = 1; int roleID = sql.getRoleID(role); - sql.setLectureRights(pk_person, pk_lecture, roleID, read, write, + sql.setLectureRights(pk_person, lectureID, roleID, read, write, admin); } else if (role.equals("Admin")) { @@ -585,7 +587,7 @@ public class ServerHandler implements Server.Iface { int admin = 1; int roleID = sql.getRoleID(role); - sql.setLectureRights(pk_person, pk_lecture, roleID, read, write, + sql.setLectureRights(pk_person, lectureID, roleID, read, write, admin); } else { int read = 0; @@ -594,7 +596,7 @@ public class ServerHandler implements Server.Iface { int admin = 0; int roleID = sql.getRoleID(role); - sql.setLectureRights(pk_person, pk_lecture, roleID, read, write, + sql.setLectureRights(pk_person, lectureID, roleID, read, write, admin); } @@ -609,13 +611,13 @@ public class ServerHandler implements Server.Iface { } //set permissions for users which are !=userID - public boolean writeAdditionalImageRights(String imageName, String userID, + public boolean writeAdditionalImageRights(String imageID, String userID, boolean isRead, boolean isWrite, boolean isLinkAllowed, boolean isAdmin) { boolean success = false; Map map = new HashMap(); - map = sql.getImageIDandVersion(imageName); - String imageID = map.get("GUID"); + map = sql.getImageIDandVersion(imageID); + //String imageID = map.get("GUID"); sql.writeAdditionalImageRights(imageID, userID, isRead, isWrite, isLinkAllowed, isAdmin); @@ -623,11 +625,11 @@ public class ServerHandler implements Server.Iface { return success; } - public boolean writeAdditionalLectureRights(String lectureName, + public boolean writeAdditionalLectureRights(String lectureID, String userID, boolean isRead, boolean isWrite, boolean isAdmin) { Map map = new HashMap(); - String lectureID = sql.getLectureID(lectureName); + //String lectureID = sql.getLectureID(lectureID); sql.writeAdditionalLectureRights(lectureID, userID, isRead, isWrite, isAdmin); @@ -678,5 +680,10 @@ public class ServerHandler implements Server.Iface { return sql.getOsNameForGuestOs(guestOS); } + @Override + public String createRandomUUID() throws TException { + return sql.createRandomUUID(); + } + }// end class -- cgit v1.2.3-55-g7522