summaryrefslogtreecommitdiffstats
path: root/Dozentenmodulserver/src
diff options
context:
space:
mode:
authorMichael Wilson2014-08-26 09:33:12 +0200
committerMichael Wilson2014-08-26 09:33:12 +0200
commit52814c95c511744fe5ace69719761acb407cb2d3 (patch)
treee100f31bf78a95fa686c9cec9a78d3442b07fa47 /Dozentenmodulserver/src
parentAlle Abfragen und Abbrüche für während Up/Downloads implementiert (diff)
parentLöschen der XML funktioniert nun, sowie das bearbeiten der XML ohne das eine ... (diff)
downloadtutor-module-52814c95c511744fe5ace69719761acb407cb2d3.tar.gz
tutor-module-52814c95c511744fe5ace69719761acb407cb2d3.tar.xz
tutor-module-52814c95c511744fe5ace69719761acb407cb2d3.zip
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Diffstat (limited to 'Dozentenmodulserver/src')
-rw-r--r--Dozentenmodulserver/src/util/XMLCreator.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/Dozentenmodulserver/src/util/XMLCreator.java b/Dozentenmodulserver/src/util/XMLCreator.java
index a39a415e..46cdef5d 100644
--- a/Dozentenmodulserver/src/util/XMLCreator.java
+++ b/Dozentenmodulserver/src/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.guestOS 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_VLData_lecture.isActive, 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 "
@@ -212,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