WIP Investigating #4035

...

Refs #4035

diff --git a/src/gr/grnet/pithos/web/client/Const.java b/src/gr/grnet/pithos/web/client/Const.java
index 21e02bf..1f61243 100644 (file)
--- a/src/gr/grnet/pithos/web/client/Const.java
+++ b/src/gr/grnet/pithos/web/client/Const.java
@@ -15,6 +15,8 @@ public final class Const {
     public static final String HTTP_HEADER_KEEP_ALIVE = "Keep-Alive";
     public static final String HTTP_HEADER_DATE = "Date";
     public static final String HTTP_HEADER_VARY = "Vary";
+    public static final String HTTP_HEADER_CONTENT_LANGUAGE = "Content-Language";
+    public static final String HTTP_HEADER_CACHE_CONTROL = "Cache-Control";
 
     public static final String X_AUTH_TOKEN = "X-Auth-Token";
     public static final String X_OBJECT_SHARING = "X-Object-Sharing";

diff --git a/src/gr/grnet/pithos/web/client/FileContextMenu.java b/src/gr/grnet/pithos/web/client/FileContextMenu.java
index 1399047..9eb9833 100644 (file)
--- a/src/gr/grnet/pithos/web/client/FileContextMenu.java
+++ b/src/gr/grnet/pithos/web/client/FileContextMenu.java
@@ -199,6 +199,10 @@ public class FileContextMenu extends PopupPanel {
         Pithos.LOG("FileContextMenu(), selectedFolder=", selectedFolder);
         Pithos.LOG("FileContextMenu(), isFolderTreeSelected=", isFolderTreeSelected);
         Pithos.LOG("FileContextMenu(), isMysharedSelected=", isMysharedSelected);
+        Pithos.LOG("FileContextMenu(), selectedFiles:");
+        for(File selectedFile : selectedFiles) {
+            Pithos.LOG("  ==> ", selectedFile);
+        }
 
         if (selectedFolder != null) {
                    if (!selectedFolder.isInTrash()) {

diff --git a/src/gr/grnet/pithos/web/client/Helpers.java b/src/gr/grnet/pithos/web/client/Helpers.java
index 73705d5..1b1d397 100644 (file)
--- a/src/gr/grnet/pithos/web/client/Helpers.java
+++ b/src/gr/grnet/pithos/web/client/Helpers.java
@@ -83,16 +83,20 @@ public final class Helpers {
             try {
                 final int statusCode = response.getStatusCode();
                 final String statusText = response.getStatusText();
-                Pithos.LOG("  ", statusCode, " ", statusText);
+                Pithos.LOG("  <== [STATUS] ", statusCode, " ", statusText);
 
                 final String body = response.getText();
-                if(body != null && body.trim().length() > 0) {
-                    if(Pithos.IsFullResponseBodyLOGEnabled) {
-                        Pithos.LOG(body);
-                    }
-                    else {
-                        final int LEN = 120;
-                        Pithos.LOG(body.trim().substring(0, LEN), body.length() <= LEN ? "" : " ...");
+                if(body != null) {
+                    final String trimmedBody = body.trim();
+
+                    if(trimmedBody.length() > 0) {
+                        if(Pithos.IsFullResponseBodyLOGEnabled) {
+                            Pithos.LOG("  <== [BODY] ", body);
+                        }
+                        else {
+                            final int LEN = 120;
+                            Pithos.LOG("  <== [BODY] ", trimmedBody.substring(0, LEN), body.length() <= LEN ? "" : " ...");
+                        }
                     }
                 }
 

diff --git a/src/gr/grnet/pithos/web/client/Pithos.java b/src/gr/grnet/pithos/web/client/Pithos.java
index 50bc85e..ef02a8c 100644 (file)
--- a/src/gr/grnet/pithos/web/client/Pithos.java
+++ b/src/gr/grnet/pithos/web/client/Pithos.java
@@ -91,6 +91,9 @@ public class Pithos implements EntryPoint, ResizeHandler {
         HTTPHeadersToIgnoreInLOG.add(Const.HTTP_HEADER_SERVER);
         HTTPHeadersToIgnoreInLOG.add(Const.HTTP_HEADER_VARY);
         HTTPHeadersToIgnoreInLOG.add(Const.IF_MODIFIED_SINCE);
+        HTTPHeadersToIgnoreInLOG.add(Const.X_AUTH_TOKEN);
+        HTTPHeadersToIgnoreInLOG.add(Const.HTTP_HEADER_CONTENT_LANGUAGE);
+        HTTPHeadersToIgnoreInLOG.add(Const.HTTP_HEADER_CACHE_CONTROL);
     }
 
     public static final Configuration config = GWT.create(Configuration.class);
@@ -842,8 +845,11 @@ public class Pithos implements EntryPoint, ResizeHandler {
         this.userID = authSplit[0];
         this.userToken = authSplit[1];
 
+        Pithos.LOG("userID=", userID, ", userToken=", userToken);
+
         String gotoUrl = Window.Location.getParameter("goto");
         if(gotoUrl != null && gotoUrl.length() > 0) {
+            Pithos.LOG("goto=", gotoUrl);
             Window.Location.assign(gotoUrl);
             return false;
         }

diff --git a/src/gr/grnet/pithos/web/client/foldertree/File.java b/src/gr/grnet/pithos/web/client/foldertree/File.java
index 2b1348f..8043739 100644 (file)
--- a/src/gr/grnet/pithos/web/client/foldertree/File.java
+++ b/src/gr/grnet/pithos/web/client/foldertree/File.java
@@ -289,6 +289,13 @@ public class File extends Resource {
 
     @Override
     public String toString() {
-        return "File(container="+container+", name="+name+", parent="+(parent == null ? parent : parent.getName())+", published="+published+")";
+        final StringBuilder sb = new StringBuilder();
+        sb.append("File(").append(getUri()).append(")");
+        if(published) {
+            sb.append("::[");
+            sb.append(getPublicUri());
+            sb.append("]");
+        }
+        return sb.toString();
     }
 }

diff --git a/src/gr/grnet/pithos/web/client/foldertree/Folder.java b/src/gr/grnet/pithos/web/client/foldertree/Folder.java
index 206a165..147b072 100644 (file)
--- a/src/gr/grnet/pithos/web/client/foldertree/Folder.java
+++ b/src/gr/grnet/pithos/web/client/foldertree/Folder.java
@@ -320,6 +320,16 @@ public class Folder extends Resource {
 
     @Override
     public String toString() {
-        return "Folder(container="+container+", name="+name+", parent="+(parent == null ? parent : parent.getName())+", prefix="+prefix+")";
+        final StringBuilder sb = new StringBuilder();
+        sb.append("Folder(").append(getUri());
+        if(parent != null) {
+            sb.append(", parent=").append(parent.getUri());
+        }
+        else {
+            sb.append(", parent=null");
+        }
+        sb.append(")");
+
+        return sb.toString();
     }
 }