Betriebssystem auswahl ist nun implementiert

1 files changed, 26 insertions, 5 deletions

diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java
index 6534ca3d..84022089 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/server/ServerHandler.java
@@ -20,6 +20,9 @@ import models.Configuration;
 import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+
+import com.mysql.jdbc.StringUtils;
+
 import sql.SQL;
 import util.XMLCreator;
 
@@ -160,7 +163,7 @@ public class ServerHandler implements Server.Iface {
 			String firstname, String lastname, String university, String Mail,
 			String Tel, String Fak, boolean license, boolean internet,
 			long ram, long cpu, String imagePath, boolean isTemplate,
-			long filesize, long shareMode) throws TException {
+			long filesize, long shareMode, String os) throws TException {
 		
 		String mode=null;
 	
@@ -177,8 +180,12 @@ public class ServerHandler implements Server.Iface {
 		String pk_person = sql.setPerson(login, lastname, firstname, Mail,
 				new Date(), pk_institution);
 		
+		//OS impl Select and write
+		
+		String pk_os=sql.getOSpk(os.substring(0, nthIndexOf(os, " ", 2)),os.substring(nthIndexOf(os," ", 2), os.lastIndexOf(" ")).replace(" ", ""));
+		
 		sql.setImageData(pk_person, license, internet, cpu, ram, imagename,
-				imagePath, isTemplate, filesize,mode);
+				imagePath, isTemplate, filesize,mode,pk_os);
 
 		log.info(new Date() + " - written VLdata");
 		// TODO Auto-generated method stub
@@ -279,7 +286,7 @@ public class ServerHandler implements Server.Iface {
 	public boolean updateImageData(String name, String newName,
 			String image_path, boolean license, boolean internet, long ram,
 			long cpu, String id, String version, boolean isTemplate,
-			long filesize, long shareMode) throws TException {
+			long filesize, long shareMode, String os) throws TException {
 		String mode=null;
 		
 		if(shareMode==0)
@@ -289,8 +296,9 @@ public class ServerHandler implements Server.Iface {
 		else{
 			mode="to_be_published";
 		}
+		String pk_os=sql.getOSpk(os.substring(0, nthIndexOf(os, " ", 2)),os.substring(nthIndexOf(os," ", 2), os.lastIndexOf(" ")).replace(" ", ""));
 		sql.UpdateImageData(name, newName, image_path, license, internet, cpu,
-				ram, id, version, isTemplate, filesize,mode);
+				ram, id, version, isTemplate, filesize,mode,pk_os);
 		return false;
 	}
 
@@ -403,5 +411,18 @@ public class ServerHandler implements Server.Iface {
 		return sql.getAllUniversities();
 
 	}
-
+	
+	  public static int nthIndexOf(final String string, final String token,
+			     final int index)
+			  {
+			     int j = 0;
+
+			     for (int i = 0; i < index; i++)
+			     {
+			        j = string.indexOf(token, j + 1);
+			        if (j == -1) break;
+			     }
+
+			     return j;
+			  }
 }