Add the folder URI for files and the parent folder URI for folders to the response...

diff --git a/gss/src/gr/ebs/gss/server/rest/SharedHandler.java b/gss/src/gr/ebs/gss/server/rest/SharedHandler.java
index f58b10c..a48ef31 100644 (file)
--- a/gss/src/gr/ebs/gss/server/rest/SharedHandler.java
+++ b/gss/src/gr/ebs/gss/server/rest/SharedHandler.java
@@ -84,6 +84,8 @@ public class SharedHandler extends RequestHandler {
                                JSONObject j = new JSONObject();
                                j.put("name", f.getName()).
                                        put("uri", parentUrl + f.getPath());
+                               if (f.getParent() != null)
+                                       json.put("parent", f.getParent().getURI());
                                subfolders.add(j);
                        }
                        json.put("folders", subfolders);
@@ -97,6 +99,7 @@ public class SharedHandler extends RequestHandler {
                                        put("deleted", f.isDeleted()).
                                        put("version", f.getVersion()).
                                        put("size", f.getFileSize()).
+                                       put("folder", f.getFolder().getURI()).
                                        put("creationDate", f.getAuditInfo().getCreationDate().getTime()).
                                        put("uri", parentUrl + f.getPath());
                                files.add(j);

diff --git a/gss/src/gr/ebs/gss/server/rest/TrashHandler.java b/gss/src/gr/ebs/gss/server/rest/TrashHandler.java
index 88be940..6dea250 100644 (file)
--- a/gss/src/gr/ebs/gss/server/rest/TrashHandler.java
+++ b/gss/src/gr/ebs/gss/server/rest/TrashHandler.java
@@ -106,6 +106,8 @@ public class TrashHandler extends RequestHandler {
                        JSONObject j = new JSONObject();
                        j.put("name", f.getName()).
                                put("uri", parentUrl + f.getPath());
+                       if (f.getParent() != null)
+                               json.put("parent", f.getParent().getURI());
                                trashFolders.add(j);
                }
                json.put("folders", trashFolders);
@@ -117,6 +119,7 @@ public class TrashHandler extends RequestHandler {
                                        put("deleted", f.isDeleted()).
                                        put("version", f.getVersion()).
                                        put("size", f.getFileSize()).
+                                       put("folder", f.getFolder().getURI()).
                                        put("creationDate", f.getAuditInfo().getCreationDate().getTime()).
                                put("uri", parentUrl + f.getPath());
                        trashFiles.add(j);