SQL Abfragen auf ID und Version umgestellt

1 files changed, 15 insertions, 11 deletions

diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java
index 750943ed..9715b0a4 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/server/ServerHandler.java
@@ -64,11 +64,6 @@ public class ServerHandler implements Server.Iface {
 		return ret;
 	}
 
-	@Override
-	public List<String> getImages() throws TException {
-		// TODO Auto-generated method stub
-		return null;
-	}
 
 	@Override
 	public String getPathOfImage(String name) throws TException {
@@ -104,7 +99,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")));
 				
 			}
 			
@@ -211,15 +206,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 +235,19 @@ 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;
+	}
+
 }