summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wilson2014-08-22 11:34:46 +0200
committerMichael Wilson2014-08-22 11:34:46 +0200
commit70b4dde2c823c904ababf09c720279e41f902b03 (patch)
treeb2ff7b0fcc3f0a98c6828a3b1e1f45bec48d1fe5
parentMerge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff)
downloadtutor-module-70b4dde2c823c904ababf09c720279e41f902b03.tar.gz
tutor-module-70b4dde2c823c904ababf09c720279e41f902b03.tar.xz
tutor-module-70b4dde2c823c904ababf09c720279e41f902b03.zip
xml can also be inactive
-rw-r--r--Dozentenmodulserver/bin/util/XMLCreator.classbin7561 -> 7820 bytes
-rw-r--r--Dozentenmodulserver/src/util/XMLCreator.java10
2 files changed, 8 insertions, 2 deletions
diff --git a/Dozentenmodulserver/bin/util/XMLCreator.class b/Dozentenmodulserver/bin/util/XMLCreator.class
index 6d7673fb..3310d9cb 100644
--- a/Dozentenmodulserver/bin/util/XMLCreator.class
+++ b/Dozentenmodulserver/bin/util/XMLCreator.class
Binary files differ
diff --git a/Dozentenmodulserver/src/util/XMLCreator.java b/Dozentenmodulserver/src/util/XMLCreator.java
index e900be94..8717c076 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_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_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 "
@@ -189,7 +189,13 @@ public class XMLCreator {
Element active = doc.createElement("active");
entry.appendChild(active);
- active.setAttribute("param", "true");
+
+ //set activity
+ if(rs.getString("active").equals("1")){
+ active.setAttribute("param", "true");
+ } else if(rs.getString("active").equals("0")){
+ active.setAttribute("param", "false");
+ }
Element pools = doc.createElement("pools");
entry.appendChild(pools);