:)

3 files changed, 20 insertions, 19 deletions

diff --git a/Dozentenmodulserver/src/server/Server.java b/Dozentenmodulserver/src/server/Server.java
index 50b25821..da1d424a 100644
--- a/Dozentenmodulserver/src/server/Server.java
+++ b/Dozentenmodulserver/src/server/Server.java
@@ -448,14 +448,13 @@ public class Server {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLectureData failed: unknown result");
     }
 
-<<<<<<< HEAD
 	public boolean deleteImageData(String imageid, String imageversion) {
 		
 		SQL sql = new SQL();
 		
 		return sql.deleteImage( imageid, imageversion);
 	}
-=======
+
     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 org.apache.thrift.TException
     {
       send_updateLecturedata(name, newName, shortdesc, desc, startDate, endDate, isActive, imagename, firstname, lastname, university, Mail, Tel, Fak, id);
@@ -492,7 +491,6 @@ public class Server {
       }
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateLecturedata failed: unknown result");
     }
->>>>>>> 0c626844e491923e61657f5483586b9a2a3f6bb8
 
   }
   public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java
index e8fbb0d6..16a2ba7e 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/server/ServerHandler.java
@@ -223,6 +223,7 @@ public class ServerHandler implements Server.Iface {
 		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
 			e.printStackTrace();
@@ -303,9 +304,7 @@ public class ServerHandler implements Server.Iface {
 
 		return null;
 	}
-<<<<<<< HEAD
-	
-=======
+
 
 
 	@Override
@@ -318,5 +317,4 @@ public class ServerHandler implements Server.Iface {
 		return false;
 	}
 
->>>>>>> 0c626844e491923e61657f5483586b9a2a3f6bb8
 }
diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java
index 3a2cfdbd..9a8c92fc 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -447,7 +447,7 @@ public class SQL {
 		return -1;

 	}

 	

-<<<<<<< HEAD
+
 

 	/**

 	 * 

@@ -466,12 +466,18 @@ public class SQL {
 			

 			System.out.println("delete image");

 			

-			stm.executeUpdate("DELETE * FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"+id+"' " +

-					"and imageVersion = '"+version+"' ;");

+			stm.executeUpdate("DELETE FROM bwLehrpool.m_VLData_imageInfo where GUID_imageID = '"+id+"' " +

+					"AND imageVersion = '"+version+"';");

 			

 			return true;

-			

-=======
+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+			return false;

+		}

+		

+	 }

+			
 	public int updateLectureData(Connection con, int pk_person, int pk_image,

 			int imageversion, String name, String desc, String shortdesc,

 			String start, String end, boolean isactive, String id) {

@@ -516,19 +522,18 @@ public class SQL {
 					+ pk_person + "');");

 			con.commit();

 

->>>>>>> 0c626844e491923e61657f5483586b9a2a3f6bb8
+
 		} catch (SQLException e) {

 			// TODO Auto-generated catch block

 			e.printStackTrace();

 		}

-<<<<<<< HEAD
+
 		

-		return false;

-	}

-

-=======
+		//return false;

+	//}

+
 		return 0;

 

 	}

->>>>>>> 0c626844e491923e61657f5483586b9a2a3f6bb8
+
 }