From 626a66929d5fcb78c99e6fbe281600205efd2152 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Tue, 18 Nov 2014 14:35:41 +0100 Subject: • Ausgaben an sinnvollen gekürzt bzw. erweitert --- .../src/main/java/server/ServerHandler.java | 25 +++++++++++----------- dozentenmodulserver/src/main/java/sql/SQL.java | 15 ++++++------- 2 files changed, 19 insertions(+), 21 deletions(-) (limited to 'dozentenmodulserver/src/main/java') diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java index 5676339a..7770834b 100644 --- a/dozentenmodulserver/src/main/java/server/ServerHandler.java +++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java @@ -306,8 +306,7 @@ public class ServerHandler implements Server.Iface { @Override public Map 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); } @@ -334,26 +333,26 @@ public class ServerHandler implements Server.Iface { @Override public List getLectureList() throws TException { - log.info("returning LectureList"); + //log.info("returning LectureList"); return sql.getLectureList(); } @Override public List getLectureListPermissionRead(String userID) { - log.info("returning LectureListRead"); + //log.info("returning LectureListRead"); return sql.getLectureListPermissionRead(userID); }// end getLectureListPermissionRead @Override public List getLectureListPermissionWrite(String userID) { - log.info("returning LectureListWrite"); + //log.info("returning LectureListWrite"); return sql.getLectureListPermissionWrite(userID); }// end getLectureListPermissionRead @Override public List getLectureListPermissionAdmin(String userID) { - log.info("returning LectureListAdmin"); + //log.info("returning LectureListAdmin"); return sql.getLectureListPermissionAdmin(userID); }// end getLectureListPermissionRead @@ -394,7 +393,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); @@ -405,7 +404,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(); } @@ -444,7 +443,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(); } @@ -464,7 +463,7 @@ public class ServerHandler implements Server.Iface { @Override public Map getLectureData(String lectureid) throws TException { - log.info("returning LectureData"); + //log.info("returning LectureData"); return sql.getLectureData(lectureid); } @@ -543,7 +542,7 @@ public class ServerHandler implements Server.Iface { linkallowed); } - log.info("written image rights"); + log.info("Written image rights"); return true; } @@ -609,7 +608,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; } @@ -621,7 +620,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; } diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java index dd40c774..4334f854 100644 --- a/dozentenmodulserver/src/main/java/sql/SQL.java +++ b/dozentenmodulserver/src/main/java/sql/SQL.java @@ -114,7 +114,7 @@ public class SQL { return ret; } catch (SQLException e) { - log.info("Failed to DeleteUser."); + log.info("Failed to DeleteUser "+user+"."); e.printStackTrace(); } return -1; @@ -1159,7 +1159,7 @@ public class SQL { //if map is still empty, then the itemID could not be found if(map.isEmpty()==true){ - log.error("ERROR: getItemOwner could not find the item with the ID '"+itemID+"'."); + log.error("Failed to getItemOwner for item '"+itemID+"'."); } else { //now that we have the userID for this item, get the user information and put it in the map @@ -1642,7 +1642,7 @@ public class SQL { prest.executeUpdate(); con.commit(); con.close(); - log.info("Succeeded to updateLectureData."); + //log.info("Succeeded to updateLectureData."); } catch (SQLException e) { @@ -1819,7 +1819,7 @@ public class SQL { con.commit(); con.close(); - log.info("Succesfully updated image path"); + //log.info("Succesfully updated image path"); return 0; } catch (SQLException e) { @@ -2048,7 +2048,7 @@ public class SQL { return id; } catch (SQLException e) { - log.info("Failed to LectureID."); + log.info("Failed to getLectureID."); e.printStackTrace(); } return id; @@ -2390,7 +2390,7 @@ public class SQL { con.commit(); con.close(); - log.info("Written additional image rights."); + //log.info("Written additional image rights."); } catch (SQLException e) { @@ -2483,8 +2483,7 @@ public class SQL { con.commit(); con.close(); - log.info("Written additional lecture rights for '" - + userID + "'."); + //log.info("Written additional lecture rights for '"+ userID + "'."); } catch (SQLException e) { e.printStackTrace(); -- cgit v1.2.3-55-g7522