From 1eb0cec6a9c1440ea7b0e0a5b2848e85d53e171b Mon Sep 17 00:00:00 2001
From: Michael Wilson
Date: Tue, 21 Oct 2014 14:04:49 +0200
Subject: Anlegen eines Benutzers in die Datenbank erfolgt nun bereits beim
 einloggen. Vorher war es fälschlicherweise erst beim hochladen des ersten
 Images

---
 .../src/main/java/server/ServerHandler.java            | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'dozentenmodulserver/src/main/java/server/ServerHandler.java')

diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java
index cf575367..2d6a62bc 100644
--- a/dozentenmodulserver/src/main/java/server/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java
@@ -163,6 +163,11 @@ public class ServerHandler implements Server.Iface {
 
 	}
 
+	@Override
+	public String setInstitution(String university){
+		return sql.setInstitution(university);
+	}
+	
 	@Override
 	public boolean writeVLdata(String imagename, String desc ,String login,
 			String firstname, String lastname, String university, String Mail,
@@ -180,16 +185,16 @@ public class ServerHandler implements Server.Iface {
 			mode="to_be_published";
 		}
 
-		String pk_institution = sql.setInstitution(university);
-
-		String pk_person = sql.setPerson(login, lastname, firstname, Mail,
-				new Date(), pk_institution);
+		//String pk_institution = sql.setInstitution(university);
+		//String pk_person = sql.setPerson(login, lastname, firstname, Mail, new Date(), pk_institution);
 		
 		//OS impl Select and write
 		//ACHTUNG: Anzahl der Leerzeichen muss eingehalten werden: 'Windows 7 32 bit"
 		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,desc,
+		//sql.setImageData(pk_person, license, internet, cpu, ram, imagename,desc, imagePath, filesize,mode,pk_os);
+		
+		sql.setImageData(login, license, internet, cpu, ram, imagename,desc,
 				imagePath, filesize,mode,pk_os);
 		
 		log.info(new Date() + " - written VLdata");
@@ -224,6 +229,9 @@ public class ServerHandler implements Server.Iface {
 		return sql.getPersonData(Vorname, Nachname);
 	}
 	
+	public void setPerson(String login, String lastname,String firstname, String mail, String Institution){
+		sql.setPerson(login, lastname, firstname, mail, new Date(), Institution);
+	}
 
 	@Override
 	public boolean writeLecturedata(String name, String shortdesc, String desc,
-- 
cgit v1.2.3-55-g7522