1 files changed, 101 insertions, 18 deletions

diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java
index 750943ed..9474d942 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/server/ServerHandler.java
@@ -15,10 +15,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.thrift.TException;
 
 import sql.SQL;
+import util.XMLCreator;
 
 
 public class ServerHandler implements Server.Iface {
@@ -65,21 +69,26 @@ public class ServerHandler implements Server.Iface {
 	}
 
 	@Override
-	public List<String> getImages() throws TException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getPathOfImage(String name) throws TException {
-		// TODO Auto-generated method stub
+	public String getPathOfImage(String image_id, String version) throws TException {
+		
+		try {
+			ResultSet rs=sql.getPathOfImage(con, image_id, version);
+			System.out.println("Path SQL erfolgreich");
+			rs.next();
+			System.out.println(rs.getString("image_path"));
+			return rs.getString("image_path");
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
 		return null;
 	}
 
 	@Override
 	public boolean writeVLdata(String imagename, String firstname,
 			String lastname, String university, String Mail, String Tel,
-			String Fak, boolean license, boolean internet, long ram, long cpu)
+			String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath)
 			throws TException {
 		String login="tete";
 		
@@ -87,8 +96,8 @@ public class ServerHandler implements Server.Iface {
 		
 		int pk_person=sql.setPerson(con, login, lastname, firstname, Mail, new Date(), pk_institution);
 		
-		sql.setImageData(con, pk_person, license, internet, cpu, ram, imagename);
-		
+		sql.setImageData(con, pk_person, license, internet, cpu, ram, imagename, imagePath);
+
 		// TODO Auto-generated method stub
 		return true;
 	}
@@ -104,7 +113,7 @@ public class ServerHandler implements Server.Iface {
 			while(res.next())
 			{
 				
-				list.add(new Image(res.getString("image_name"),res.getString("cond_hasLicenseRestriction"),res.getString("name"),res.getString("lecture"),res.getString("image_update_time"),res.getString("user")));
+				list.add(new Image(res.getString("GUID_imageID"),res.getString("imageVersion"),res.getString("image_name"),res.getString("cond_hasLicenseRestriction"),res.getString("name"),res.getString("lecture"),res.getString("image_update_time"),res.getString("user")));
 				
 			}
 			
@@ -189,7 +198,20 @@ public class ServerHandler implements Server.Iface {
 			
 			System.out.println(startDate);
 			sql.setLectureData(con, pk_person, pk_image, imageversion, name, desc, shortdesc, startDate, endDate, isActive);
-		
+			XMLCreator xml=new XMLCreator(con, name);
+			try {
+				xml.create(name);
+				System.out.println(new Date() + " - Creator beendet");
+			} 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();
+			}
 		return false;
 	}
 
@@ -199,6 +221,7 @@ public class ServerHandler implements Server.Iface {
 
 		System.out.println("Vor Move" +new Date());
 		try {
+			//der übergebene Filename ist falsch - hier muss der generierte name geholt werden, nicht der ursprüngliche name. wo wird dieser eingelesen?
 			FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/"+tmpFile.getName()));
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
@@ -211,15 +234,16 @@ public class ServerHandler implements Server.Iface {
 
 
 	@Override
-	public Map<String, String> getImageData(String imagename) throws TException {
-		System.out.println("test:"+imagename);
-		ResultSet data=sql.getImageData(con, imagename);
+	public Map<String, String> getImageData(String imageid, String imageversion) throws TException {
+		
+		ResultSet data=sql.getImageData(con, imageid, imageversion);
 		
 		Map<String,String> map=new HashMap<String, String>();
 		try {
 			while(data.next())
 			{
 				System.out.println(data.getString("cond_hasInternetRestriction")+data.getString("cond_hasLicenseRestriction")+data.getString("cond_minCPUs")+data.getString("cond_minRAM"));
+				map.put("name",data.getString("image_name"));
 				map.put("internet", data.getString("cond_hasInternetRestriction"));
 				map.put("license", data.getString("cond_hasLicenseRestriction"));
 				map.put("cpu", data.getString("cond_minCPUs"));
@@ -239,11 +263,70 @@ public class ServerHandler implements Server.Iface {
 
 	@Override
 	public boolean updateImageData(String name, String newName,boolean license,
-			boolean internet, long ram, long cpu) throws TException {
+			boolean internet, long ram, long cpu,String id, String version) throws TException {
 		System.out.println("Server: Vor Update");
-		sql.UpdateImageData(con, name, newName ,license, internet, cpu, ram);
+		sql.UpdateImageData(con, name, newName ,license, internet, cpu, ram, id, version);
 		System.out.println("Update erfolgreich");
 		return false;
 	}
 
+
+	@Override
+	public Map<String, String> getLectureData(String lecturename)
+			throws TException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+
+	@Override
+	public List<Lecture> getLectureList() throws TException {
+		ResultSet res=sql.getLectureList(con);
+		
+		List<Lecture> list = new ArrayList<Lecture>();
+
+		try {
+			
+			while(res.next())
+			{
+				
+				list.add(new Lecture(res.getString("lectureID"), res.getString("name"), res.getString("isActive"), res.getString("startTime"), res.getString("endTime"), res.getString("lastUsed"), res.getString("description"), res.getString("image_name"), res.getString("user")));
+				
+			}
+			
+
+			return list;
+		} catch (SQLException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+
+		return null;
+	}
+
+
+	@Override
+	public boolean updateLecturedata(String name, String newName,
+			String shortdesc, String desc, String startDate, String endDate,
+			boolean isActive, String imagename, String firstname,
+			String lastname, String university, String Mail, String Tel,
+			String Fak, String id) throws TException {
+		int pk_image=0;
+		int imageversion=0;
+		ResultSet image=sql.getImageIDandVersion(con, imagename);
+
+		try {
+			while(image.next())
+			{
+			pk_image=image.getInt("GUID_imageID");
+			imageversion=image.getInt("imageVersion");
+			}
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		sql.updateLectureData(con, pk_image, imageversion, lastname, newName, desc, shortdesc, startDate, endDate, isActive, id);
+		return false;
+	}
+
 }