Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts: hhh
	Dozentenmodulserver/bin/server/ServerHandler.class
	Dozentenmodulserver/bin/sql/SQL.class

1 files changed, 15 insertions, 4 deletions

diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java
index 029538c5..5e736554 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/server/ServerHandler.java
@@ -98,11 +98,11 @@ public class ServerHandler implements Server.Iface {
 	}
 
 	@Override
-	public boolean writeVLdata(String imagename, String firstname,
+	public boolean writeVLdata(String imagename, String login ,String firstname,
 			String lastname, String university, String Mail, String Tel,
 			String Fak, boolean license, boolean internet, long ram, long cpu,
 			String imagePath) throws TException {
-		String login = "tete";
+		
 
 		int pk_institution = sql.setInstitution(con, university);
 
@@ -193,11 +193,11 @@ 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 firstname, String lastname,
+			String imagename, String login ,String firstname, String lastname,
 			String university, String Mail, String Tel, String Fak)
 			throws TException {
 		int pk_image = 0;
-		String login = "tete";
+		
 		int imageversion = 0;
 		int pk_institution = sql.setInstitution(con, university);
 		int pk_person = sql.setPerson(con, login, lastname, firstname, Mail,
@@ -361,6 +361,17 @@ public class ServerHandler implements Server.Iface {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
+		sql.updateLectureData(con, pk_image, imageversion, lastname, newName, desc, shortdesc, startDate, endDate, isActive, id);
+		
+		XMLCreator xml=new XMLCreator(con, newName);
+		try {
+			xml.create(newName);
+		} catch (SQLException | ParserConfigurationException
+				| TransformerException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
 		sql.updateLectureData(con, pk_image, imageversion, lastname, newName,
 				desc, shortdesc, startDate, endDate, isActive, id);
 		log.info(new Date() + " - updated LectureData");