[freenet-cvs] r11301 - in trunk/freenet/src/freenet: clients/http clients/http/filter node

[t...@freenetproject.org]

Author: toad
Date: 2006-12-07 23:05:16 +0000 (Thu, 07 Dec 2006)
New Revision: 11301

Modified:
   trunk/freenet/src/freenet/clients/http/PproxyToadlet.java
   trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
   trunk/freenet/src/freenet/node/NodeClientCore.java
Log:
Make stylesheet parameter work.

Modified: trunk/freenet/src/freenet/clients/http/PproxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PproxyToadlet.java   2006-12-07 
22:41:19 UTC (rev 11300)
+++ trunk/freenet/src/freenet/clients/http/PproxyToadlet.java   2006-12-07 
23:05:16 UTC (rev 11301)
@@ -133,19 +133,14 @@
                        } else {
                                // split path into plugin class name and 'data' 
path for plugin
                                int to = path.indexOf("/");
-                               String plugin, data;
+                               String plugin;
                                if (to == -1) {
                                        plugin = path;
-                                       data = "";
                                } else {
                                        plugin = path.substring(0, to);
-                                       data = path.substring(to + 1);
                                }

-                               //pm.handleHTTPGet(plugin, data);
-                               
-                               // create a new request with the 'data' path 
and pass it to the plugin 
-                               request = new HTTPRequest(data, 
uri.getRawQuery());
+                               // Plugin may need to know where it was 
accessed from, so it can e.g. produce relative URLs.
                                //writeReply(ctx, 200, "text/html", "OK", 
mkPage("plugin", pm.handleHTTPGet(plugin, data)));
                                writeReply(ctx, 200, "text/html", "OK", 
pm.handleHTTPGet(plugin, request));


Modified: 
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
===================================================================
--- 
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java    
    2006-12-07 22:41:19 UTC (rev 11300)
+++ 
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java    
    2006-12-07 23:05:16 UTC (rev 11301)
@@ -165,6 +165,8 @@
                                        u.getFragment());
                        if(!noRelative)
                                uri = baseURI.relativize(uri);
+                       if(Logger.shouldLog(Logger.MINOR, this))
+                               Logger.minor(this, "Returning 
"+uri.toASCIIString()+" from "+path+" from baseURI="+baseURI);
                        return uri.toASCIIString();
                } catch (URISyntaxException e) {
                        Logger.error(this, "Could not parse own URI: 
path="+path+", typeOverride="+typeOverride+", frag="+u.getFragment()+" : "+e, 
e);

Modified: trunk/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeClientCore.java  2006-12-07 22:41:19 UTC 
(rev 11300)
+++ trunk/freenet/src/freenet/node/NodeClientCore.java  2006-12-07 23:05:16 UTC 
(rev 11301)
@@ -793,6 +793,7 @@
        }

        public FilterCallback createFilterCallback(URI uri, FoundURICallback 
cb) {
+               if(logMINOR) Logger.minor(this, "Creating filter callback: 
"+uri+", "+cb);
                return new GenericReadFilterCallback(uri, cb);
        }
 }