1 files changed, 12 insertions, 7 deletions

diff --git a/Dozentenmodulserver/src/main/java/util/XMLCreator.java b/Dozentenmodulserver/src/main/java/util/XMLCreator.java
index 564543fa..46cdef5d 100644
--- a/Dozentenmodulserver/src/main/java/util/XMLCreator.java
+++ b/Dozentenmodulserver/src/main/java/util/XMLCreator.java
@@ -46,7 +46,7 @@ public class XMLCreator {
 	
 
 	// phone param not existing
-	private String query = "SELECT m_VLData_imageInfo.image_path ,vorname, nachname, mail, shortdescription, description, m_operatingSystem.name as os, m_VLData_lecture.admin_changeTime as time, m_VLData_lecture.name as lectureName, m_user.institution as userInstitution, m_user.loginName as loginName,  m_institution.name as institutionName "
+	private String query = "SELECT m_VLData_imageInfo.image_path ,vorname, nachname, mail, shortdescription, description, m_operatingSystem.guestOS as os,m_VLData_lecture.admin_createTime as createtime ,m_VLData_lecture.admin_changeTime as time, m_VLData_lecture.name as lectureName, m_user.institution as userInstitution, m_user.loginName as loginName, m_VLData_lecture.isActive,  m_institution.name as institutionName "
 			+ "FROM bwLehrpool.m_VLData_lecture, bwLehrpool.m_VLData_imageInfo, bwLehrpool.m_user, bwLehrpool.m_operatingSystem, bwLehrpool.m_institution "
 			+ "WHERE m_user.userID = m_VLData_lecture.admin_owner "
 			+ "AND m_VLData_imageInfo.GUID_imageID = m_VLData_lecture.imageID "
@@ -127,13 +127,13 @@ public class XMLCreator {
 		entry.appendChild(prio);
 		prio.setAttribute("param", "0");
 
-		Comment fComment = doc.createComment("Diesen Abschnitt ergänzen");
+		Comment fComment = doc.createComment("Diesen Abschnitt erg�nzen");
 		entry.appendChild(fComment);
 
 		Element imgName = doc.createElement("image_name");
 		entry.appendChild(imgName);
 		imageName = rs.getString("image_path").substring(
-				rs.getString("image_path").lastIndexOf("/")+1); //+1 um das führende "/" los zu werden
+				rs.getString("image_path").lastIndexOf("/")+1); //+1 um das f�hrende "/" los zu werden
 
 		imgName.setAttribute("param", imageName);
 
@@ -165,7 +165,7 @@ public class XMLCreator {
 		entry.appendChild(os);
 		os.setAttribute("param", rs.getString("os"));
 
-		Comment sComment = doc.createComment("Diesen Abschnitt ergänzen");
+		Comment sComment = doc.createComment("Diesen Abschnitt erg�nzen");
 		entry.appendChild(sComment);
 
 		// static content following - second part of xml descriptor
@@ -189,7 +189,13 @@ public class XMLCreator {
 
 		Element active = doc.createElement("active");
 		entry.appendChild(active);
-		active.setAttribute("param", "true");
+		
+		//set activity
+		if(rs.getString("isActive").equals("1")){
+			active.setAttribute("param", "true");
+		} else if(rs.getString("isActive").equals("0")){
+			active.setAttribute("param", "false");
+		}
 
 		Element pools = doc.createElement("pools");
 		entry.appendChild(pools);
@@ -206,8 +212,7 @@ public class XMLCreator {
 		DOMSource source = new DOMSource(doc);
 		
 		//Set XML-filename
-		DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss");
-		xmlName=formatter.format(new Date()) + "_" + rs.getString("institutionName") + "_" + rs.getString("loginName") + "_" + rs.getString("lectureName") + ".xml";
+		xmlName=rs.getString("createtime").substring(0, rs.getString("createtime").length() - 2).replace("-", "").replace(" ", "").replace(":", "") + "_" + rs.getString("institutionName") + "_" + rs.getString("loginName") + "_" + rs.getString("lectureName") + ".xml";
 		
 		//Write file
 		StreamResult result = new StreamResult(new File(filePath+ xmlName)); // see filepath at top of class