Update of /cvsroot/freenet/freenet/src/freenet/node/http/infolets
In directory sc8-pr-cvs1:/tmp/cvs-serv14016/src/freenet/node/http/infolets
Modified Files:
GeneralInfolet.java DefaultInfolet.java RTInfolet.java
DistributionServletInfolet.java
Log Message:
6290: don't show the request box either when in simple mode.
Index: GeneralInfolet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/http/infolets/GeneralInfolet.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- GeneralInfolet.java 28 Oct 2003 05:10:00 -0000 1.23
+++ GeneralInfolet.java 31 Oct 2003 19:21:16 -0000 1.24
@@ -191,18 +191,18 @@
sb.append("<tr><td nowrap>Pooled threads running jobs</td><td>" + msg +
"</td></tr>");
sb.append("<tr><td nowrap>Pooled threads which are idle</td><td>" +
available + "</td></tr>");
- LimitCounter outboundRequestLimit = node.outboundRequestLimit;
+ LimitCounter outboundRequestLimit = Node.outboundRequestLimit;
if(outboundRequestLimit != null)
sb.append("<tr><td nowrap>Outbound request quota used</td><td>" +
outboundRequestLimit.toString()+"</td></tr>");
- if(node.diagnostics != null && (node.outputBandwidthLimit != 0) &&
- (node.doOutLimitCutoff || node.doOutLimitConnectCutoff)) {
- double sent = node.diagnostics.getValue("outputBytes",
+ if(Core.diagnostics != null && (Node.outputBandwidthLimit != 0) &&
+ (Node.doOutLimitCutoff || Node.doOutLimitConnectCutoff)) {
+ double sent = Core.diagnostics.getValue("outputBytes",
Diagnostics.MINUTE,
Diagnostics.COUNT_CHANGE)
/ 60;
- double limit = node.outputBandwidthLimit;
+ double limit = Node.outputBandwidthLimit;
sb.append("<tr><td nowrap>Current upstream bandwidth usage</td><td>"
+ nf0.format(sent) +
" bytes/second (" + nfp.format(sent / limit) +
")</td></tr>");
}
Index: DefaultInfolet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/http/infolets/DefaultInfolet.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -w -r1.70 -r1.71
--- DefaultInfolet.java 20 Sep 2003 22:26:14 -0000 1.70
+++ DefaultInfolet.java 31 Oct 2003 19:21:16 -0000 1.71
@@ -33,7 +33,7 @@
public DefaultInfolet(String path) {
bookmarks = null;
- Core.logger.log(DefaultInfolet.class, "Registering the defaultInfolet as a
listener on " + path, Core.logger.DEBUG);
+ Core.logger.log(DefaultInfolet.class, "Registering the defaultInfolet as a
listener on " + path, Logger.DEBUG);
NodeConfigUpdater.addUpdateListener(path, this);
if(bookmarks == null) throw new IllegalStateException("Bookmarks NOT
INITIALIZED!");
}
@@ -207,7 +207,7 @@
sw = new PrintWriter(ssw);
sw.println("<form action=\"" + fproxyAddr + "\">");
sw.println("<table><tr><td>Key</td><td align=\"left\">");
- if (node.firstTime) {
+ if (Node.firstTime) {
sw.println("<input size=\"50\" name=\"key\" value=\"Enter a Freesite URI
here\">");
} else {
sw.println("<input size=\"50\" name=\"key\">");
@@ -215,6 +215,7 @@
sw.println("</td></tr></table>");
sw.println("<div align=\"right\"><input type=\"submit\"
value=\"Request\"></div>");
sw.println("</form>");
+ if(SimpleAdvanced_ModeUtils.isAdvancedMode(req)) {
titleBoxTmp.set("TITLE", "Request Freesite by URI");
titleBoxTmp.set("CONTENT", ssw.toString());
titleBoxTmp.toHtml(pw);
@@ -223,8 +224,7 @@
* Insert Freesite
* I have used an external template since the insert HTML is quite complex
*/
-
- if (Node.httpInserts && SimpleAdvanced_ModeUtils.isAdvancedMode(req)) {
+ if (Node.httpInserts) {
ssw = new StringWriter(100);
sw = new PrintWriter(ssw);
insertTmp.toHtml(sw);
@@ -233,6 +233,7 @@
titleBoxTmp.toHtml(pw);
}
}
+ }
private String getBookmarkHTML() {
StringBuffer link = new StringBuffer();
@@ -250,7 +251,7 @@
if ( (maxCount != -1) && (maxCount <= i) ) break;
boolean isSet = bookmarks.isSet(i+"");
- Core.logger.log(DefaultInfolet.class, "looking for bookmark [" + i + "]:
isSet: " + isSet, Core.logger.DEBUG);
+ Core.logger.log(DefaultInfolet.class, "looking for bookmark [" + i + "]:
isSet: " + isSet, Logger.DEBUG);
Params bookmark = (Params)bookmarks.getSet(i+"");
if (bookmark == null) break;
String key = bookmark.getString("key");
@@ -266,7 +267,7 @@
activelink = key.substring(0, key.lastIndexOf('/')+1) +
activelinkFile;
}
- Core.logger.log(DefaultInfolet.class, "Found full bookmark [" + i + "]: "
+ key + "/" + title + "/"+ activelink+"/"+description, Core.logger.DEBUG);
+ Core.logger.log(DefaultInfolet.class, "Found full bookmark [" + i + "]: "
+ key + "/" + title + "/"+ activelink+"/"+description, Logger.DEBUG);
link.append("<tr><td><a href=\"/").append(key).append("\">\n");
if (activelink != null)
@@ -310,7 +311,7 @@
while (true) {
if ( (maxCount != -1) && (maxCount <= i) ) break;
boolean isSet = bookmarks.isSet(i+"");
- Core.logger.log(DefaultInfolet.class, "looking for bookmark [" + i +
"]: isSet: " + isSet, Core.logger.DEBUG);
+ Core.logger.log(DefaultInfolet.class, "looking for bookmark [" + i +
"]: isSet: " + isSet, Logger.DEBUG);
Params bookmark = (Params)bookmarks.getSet(i+"");
if (bookmark == null) break;
String key = bookmark.getString("key");
@@ -341,12 +342,12 @@
if(Core.logger.shouldLog(Logger.DEBUG,this))
Core.logger.log(DefaultInfolet.class, "configPropertyUpdated "+
"called w/ path [" + path + "]: fs = "+fs,
- Core.logger.DEBUG);
+ Logger.DEBUG);
if (fs.isSet("bookmarks")) {
bookmarks = (Params)fs.getSet("bookmarks");
Core.logger.log(DefaultInfolet.class,
"Bookmarks updated on request: new bookmarks: " +
bookmarks.toString(),
- Core.logger.NORMAL);
+ Logger.NORMAL);
backgroundFetch();
} else {
bookmarks = null;
Index: RTInfolet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/http/infolets/RTInfolet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- RTInfolet.java 18 Jul 2003 18:07:54 -0000 1.13
+++ RTInfolet.java 31 Oct 2003 19:21:16 -0000 1.14
@@ -100,7 +100,7 @@
paddedFormat(dim.end*2)+"</td></tr></table>");
RTDiagSnapshot snapshot = n.rt.getSnapshot();
StringMap tableData = snapshot.tableData();
- status.makePerTableData(snapshot, tableData, sw);
+ NodeStatusServlet.makePerTableData(snapshot, tableData, sw);
sw.println("<a href=\"/servlet/nodestatus/nodestatus.html\">" /*
FIXME! */
+ "Click here</a> for more details.");
sw.println("<hr>");
Index: DistributionServletInfolet.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/http/infolets/DistributionServletInfolet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- DistributionServletInfolet.java 29 Jun 2003 23:39:10 -0000 1.4
+++ DistributionServletInfolet.java 31 Oct 2003 19:21:16 -0000 1.5
@@ -26,13 +26,13 @@
}
public String target(String base, String container) {
- if(n.distributionURIOverride == null ||
- (n.distributionURIOverride.equals(""))) {
+ if(Node.distributionURIOverride == null ||
+ (Node.distributionURIOverride.equals(""))) {
InetAddress i = Main.getDetectedAddress(0);
try {
if(i == null) i = InetAddress.getByName("127.0.0.1");
} catch (UnknownHostException e) { /* impossible */ };
- return "http://"+i.getHostAddress()+":"+n.distributionPort+"/";
- } else return n.mainportURIOverride;
+ return "http://"+i.getHostAddress()+":"+Node.distributionPort+"/";
+ } else return Node.mainportURIOverride;
}
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
