diff options
Diffstat (limited to 'dozentenmodulserver/src/main/java/server/ServerHandler.java')
| -rw-r--r-- | dozentenmodulserver/src/main/java/server/ServerHandler.java | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java index 2c2c6167..13e22499 100644 --- a/dozentenmodulserver/src/main/java/server/ServerHandler.java +++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java @@ -84,7 +84,6 @@ public class ServerHandler implements Server.Iface { try { Runtime.getRuntime().exec("chmod 777 " + path); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } log.info("folder '" + path + "' successfully created"); @@ -119,7 +118,6 @@ public class ServerHandler implements Server.Iface { try { Runtime.getRuntime().exec("chmod 777 " + path); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } log.info("folder '" + path @@ -194,7 +192,6 @@ public class ServerHandler implements Server.Iface { imagePath, filesize, mode, pk_os, uid); log.info("written VLdata"); - // TODO Auto-generated method stub return true; } @@ -273,13 +270,10 @@ public class ServerHandler implements Server.Iface { xml.create(name); log.info("XML created."); } catch (SQLException e) { - // TODO Auto-generated catch block e.printStackTrace(); } catch (ParserConfigurationException e) { - // TODO Auto-generated catch block e.printStackTrace(); } catch (TransformerException e) { - // TODO Auto-generated catch block e.printStackTrace(); } @@ -305,7 +299,6 @@ public class ServerHandler implements Server.Iface { } } catch (IOException e) { - // TODO Auto-generated catch block log.info("Failed to move file."); e.printStackTrace(); } @@ -315,8 +308,7 @@ public class ServerHandler implements Server.Iface { @Override public Map<String, String> getImageData(String imageid, String imageversion) throws TException { - log.info("returning ImageData: " - + sql.getImageData(imageid, imageversion).size() + "items."); + //log.info("returning ImageData: "+ sql.getImageData(imageid, imageversion).size() + "items."); return sql.getImageData(imageid, imageversion); } @@ -343,26 +335,26 @@ public class ServerHandler implements Server.Iface { @Override public List<Lecture> getLectureList() throws TException { - log.info("returning LectureList"); + //log.info("returning LectureList"); return sql.getLectureList(); } @Override public List<Lecture> getLectureListPermissionRead(String userID) { - log.info("returning LectureListRead"); + //log.info("returning LectureListRead"); return sql.getLectureListPermissionRead(userID); }// end getLectureListPermissionRead @Override public List<Lecture> getLectureListPermissionWrite(String userID) { - log.info("returning LectureListWrite"); + //log.info("returning LectureListWrite"); return sql.getLectureListPermissionWrite(userID); }// end getLectureListPermissionRead @Override public List<Lecture> getLectureListPermissionAdmin(String userID) { - log.info("returning LectureListAdmin"); + //log.info("returning LectureListAdmin"); return sql.getLectureListPermissionAdmin(userID); }// end getLectureListPermissionRead @@ -385,7 +377,6 @@ public class ServerHandler implements Server.Iface { try { FileUtils.forceDelete(tmpFile); } catch (IOException e1) { - // TODO Auto-generated catch block e1.printStackTrace(); } XMLCreator xml = new XMLCreator(sql.getConnection(), newName); @@ -393,7 +384,6 @@ public class ServerHandler implements Server.Iface { xml.create(newName); } catch (SQLException | ParserConfigurationException | TransformerException e) { - // TODO Auto-generated catch block e.printStackTrace(); } @@ -405,7 +395,7 @@ public class ServerHandler implements Server.Iface { throws TException { String stringFile = sql.getFile(imageid, imageversion); - log.info(new Date() + " - File to Delete: " + stringFile); + log.info("File to Delete: " + stringFile); File tmpFile = new File(Configuration.config.getAbsolute_path() + stringFile); @@ -416,7 +406,7 @@ public class ServerHandler implements Server.Iface { return true; } catch (IOException e) { - log.info(new Date() + " - Failed to execute deleteImageServer."); + log.info("Failed to execute deleteImageServer."); e.printStackTrace(); } @@ -438,7 +428,6 @@ public class ServerHandler implements Server.Iface { @Override public boolean connectedToLecture(String id, String version) throws TException { - // TODO Auto-generated method stub return sql.connectedToLecture(id, version); } @@ -456,7 +445,7 @@ public class ServerHandler implements Server.Iface { File xmlFile = new File(path); FileUtils.forceDelete(xmlFile); } catch (IOException e) { - log.info(new Date() + " - Failed to execute deleteLecture"); + log.info("Failed to execute deleteLecture."); e.printStackTrace(); } @@ -476,7 +465,7 @@ public class ServerHandler implements Server.Iface { @Override public Map<String, String> getLectureData(String lectureid) throws TException { - log.info("returning LectureData"); + //log.info("returning LectureData"); return sql.getLectureData(lectureid); } @@ -518,7 +507,10 @@ 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(imageID); + + pk_image = map.get("GUID"); imageversion = Integer.parseInt(map.get("version")); @@ -555,7 +547,7 @@ public class ServerHandler implements Server.Iface { linkallowed); } - log.info("written image rights"); + log.info("Written image rights"); return true; } @@ -621,7 +613,7 @@ public class ServerHandler implements Server.Iface { sql.writeAdditionalImageRights(imageID, userID, isRead, isWrite, isLinkAllowed, isAdmin); - log.info("written additional image rights for " + userID); + log.info("Written additional image rights for " + userID); return success; } @@ -633,7 +625,7 @@ public class ServerHandler implements Server.Iface { sql.writeAdditionalLectureRights(lectureID, userID, isRead, isWrite, isAdmin); - log.info("written additional lecture rights for "+ userID); + log.info("Written additional lecture rights for "+ userID); return true; } @@ -681,9 +673,15 @@ public class ServerHandler implements Server.Iface { } @Override + public String createRandomUUID() throws TException { return sql.createRandomUUID(); } + public Map<String, String> getItemOwner(String itemID) throws TException { + return sql.getItemOwner(itemID); + + } + }// end class |