diff options
| author | Nino Breuer | 2014-10-15 18:36:16 +0200 |
|---|---|---|
| committer | Nino Breuer | 2014-10-15 18:36:16 +0200 |
| commit | 3cab2605886b4fe28adc89c4624983ed0b412ed6 (patch) | |
| tree | a3b3548318ab5f26d9467d482341df7e0e30456c /dozentenmodulserver/src/main/java/sql/SQL.java | |
| parent | user angepasst (diff) | |
| download | tutor-module-3cab2605886b4fe28adc89c4624983ed0b412ed6.tar.gz tutor-module-3cab2605886b4fe28adc89c4624983ed0b412ed6.tar.xz tutor-module-3cab2605886b4fe28adc89c4624983ed0b412ed6.zip | |
• added model for local holding of permissions
• added integrity check as used in createImage
• fixed bug in sql syntax which caused whitespace to be shown as #011 in statement
Diffstat (limited to 'dozentenmodulserver/src/main/java/sql/SQL.java')
| -rw-r--r-- | dozentenmodulserver/src/main/java/sql/SQL.java | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java index 80e19ea4..e973ba54 100644 --- a/dozentenmodulserver/src/main/java/sql/SQL.java +++ b/dozentenmodulserver/src/main/java/sql/SQL.java @@ -1163,25 +1163,52 @@ public List<Image> getImageListPermissionLink(String userID) { e.printStackTrace();
}
try {
- res = stm.executeQuery("SELECT DISTINCT pmi.GUID_imageID, pmi.userID, u.userID, u.Nachname, u.Vorname, pmi.image_read, pmi.image_write, pmi.image_admin, pmi.link_allowed FROM bwLehrpool.pm_VLData_image pmi, bwLehrpool.m_user u WHERE pmi.userID!='"+userID+"' AND pmi.GUID_imageID='"+imageID+"' AND pmi.userID=u.userID AND pmi.image_write=1 ORDER BY u.Nachname ASC;");
+ res = stm.executeQuery("SELECT DISTINCT pmi.GUID_imageID, pmi.userID, u.userID, u.Nachname, u.Vorname, pmi.image_read, pmi.image_write, pmi.image_admin, pmi.link_allowed FROM bwLehrpool.pm_VLData_image pmi, bwLehrpool.m_user u WHERE pmi.userID!='"+userID+"' AND pmi.GUID_imageID='"+imageID+"' AND pmi.userID=u.userID AND pmi.image_write=1 ORDER BY u.Nachname ASC;");
+ System.out.println("SELECT DISTINCT pmi.GUID_imageID, pmi.userID, u.userID, u.Nachname, u.Vorname, pmi.image_read, pmi.image_write, pmi.image_admin, pmi.link_allowed FROM bwLehrpool.pm_VLData_image pmi, bwLehrpool.m_user u WHERE pmi.userID!='"+userID+"' AND pmi.GUID_imageID='"+imageID+"' AND pmi.userID=u.userID AND pmi.image_write=1 ORDER BY u.Nachname ASC;");
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
try {
+ boolean image_read,image_write,link_allowed, image_admin, lecture_read, lecture_write, lecture_admin;
+
while (res.next()) {
+ //reset old values and set the correct new values
+ image_read = false;
+ image_write = false;
+ link_allowed=false;
+ image_admin=false;
+ lecture_read=false;
+ lecture_write=false;
+ lecture_admin=false;
+
+ if(Integer.parseInt(res.getString("image_read")) != 0){
+ image_read = true;
+ }
+ if(Integer.parseInt(res.getString("image_write")) != 0){
+ image_write=true;
+ }
+ if(Integer.parseInt(res.getString("link_allowed")) != 0){
+ link_allowed=true;
+ }
+ if(Integer.parseInt(res.getString("image_admin")) != 0 ){
+ image_admin=true;
+ }
+
//fill the list with users - permissions are all false because the image is new
list.add(new Person(res.getString("userID"),
res.getString("Nachname"),
res.getString("Vorname"),
- Boolean.parseBoolean(res.getString("image_read")),
- Boolean.parseBoolean(res.getString("image_write")),
- Boolean.parseBoolean(res.getString("image_admin")),
- Boolean.parseBoolean(res.getString("link_allowed")),
+ //Boolean.parseBoolean(Integer.parseInt(res.getString("image_read"))),
+ image_read,
+ image_write,
+ link_allowed,
+ image_admin,
false, //lecture_read
false, //lecture_write
false) //lecture_admin
);
+ //System.out.println(res.getString("Nachname")+" "+Boolean.parseBoolean(res.getString("image_read"))+" "+Boolean.parseBoolean(res.getString("image_write"))+" "+Boolean.parseBoolean(res.getString("image_admin")));
}
} catch (SQLException e) {
// TODO Auto-generated catch block
|