Update of /cvsroot/freenet/freenet/src/freenet/client/http
In directory sc8-pr-cvs1:/tmp/cvs-serv14016/src/freenet/client/http
Modified Files:
StreamServlet.java StreamInsertServlet.java FproxyServlet.java
SFRContext.java SplitFileRequestServlet.java
NodeStatusServlet.java
Log Message:
6290: don't show the request box either when in simple mode.
Index: StreamServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/StreamServlet.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- StreamServlet.java 30 Oct 2003 01:34:06 -0000 1.11
+++ StreamServlet.java 31 Oct 2003 19:21:15 -0000 1.12
@@ -101,7 +101,7 @@
done=true;
return false;
}
- if(g.state()==g.DONE)
+ if(g.state()==Request.DONE)
{
// handle redirects
// FIXME: add DBR handling
@@ -154,7 +154,7 @@
Thread.sleep(100);
} catch (InterruptedException e) {}
}
- if(g.state()==g.DONE)
+ if(g.state()==Request.DONE)
return true;
else
return false;
@@ -641,7 +641,7 @@
return;
if(r.done)
{
- if(r.g.state()==r.g.DONE)
+ if(r.g.state()==Request.DONE)
{
FieldSet streamMetadata=null;
try {
Index: StreamInsertServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/StreamInsertServlet.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- StreamInsertServlet.java 30 Oct 2003 01:34:06 -0000 1.19
+++ StreamInsertServlet.java 31 Oct 2003 19:21:15 -0000 1.20
@@ -388,15 +388,15 @@
q=insertDbr(requestUri, myHtl, dbrTime, publicUri, pw);
else
q=insertMetadata(requestUri, myHtl, null, feck, fecn,
0, streamType, mimeType, pw);
- while(q.state()>=0 && q.state()!=q.DONE) {
- pw.println(q.nameOf(q.state()));
+ while(q.state()>=0 && q.state()!=Request.DONE) {
+ pw.println(Request.nameOf(q.state()));
pw.flush();
try {
Thread.sleep(1000);
} catch (Exception e) {}
}
if(q.state()<0) {
- pw.println(q.nameOf(q.state()));
+ pw.println(Request.nameOf(q.state()));
pw.println("----------------------------------");
pw.println("WARNING: Metadata insert failed!\n");
pw.println("----------------------------------");
@@ -445,7 +445,7 @@
myIs=myUrl.openStream();
} catch (IOException e) {
Core.logger.log(this, "Aborting
StreamInsertServlet due to "+
- "IOException:
"+e, e, Core.logger.ERROR);
+ "IOException:
"+e, e, Logger.ERROR);
pw.println("Aborting stream insert due to
IOException: "+e);
e.printStackTrace(pw);
if(autoReconnect) {
@@ -494,11 +494,11 @@
if(dbrRequest.state()<0) {
// FIXME: Give some reason.
pw.println("dbrish Metadata insert
failed!: "+suri);
-
pw.println(dbrRequest.nameOf(dbrRequest.state()));
+
pw.println(Request.nameOf(dbrRequest.state()));
resp.flushBuffer();
//
dbrRequest.finalize();
dbrRequest=null;
- } else if(dbrRequest.state()==dbrRequest.DONE)
{
+ } else if(dbrRequest.state()==Request.DONE) {
pw.println("dbrish metadata insert
done: "+suri);
resp.flushBuffer();
//
dbrRequest.finalize();
@@ -511,7 +511,7 @@
resp.flushBuffer();
//
mainDbr.finalize();
mainDbr=null;
- } else if(mainDbr.state()==dbrRequest.DONE) {
+ } else if(mainDbr.state()==Request.DONE) {
pw.println("*** main DBR reinserted");
resp.flushBuffer();
//
mainDbr.finalize();
@@ -546,7 +546,7 @@
} catch (IOException
e) {
logger.log(this, "StreamInsertServlet fetching source "+
"stream failed due to IOException: "+e, e,
-
Core.logger.ERROR);
+
Logger.ERROR);
pw.println("Fetching source stream due to "+
"IOException: "+e);
pw.flush();
@@ -637,7 +637,7 @@
pw.println(j.uri+" failed to insert!");
j.finalize();
l.remove();
- } else if(j.r.state()==j.r.DONE) {
+ } else if(j.r.state()==Request.DONE) {
if(j.needMore) {
pw.println(j.uri+": inserted
data, inserting redirect");
j.more();
@@ -646,12 +646,12 @@
j.finalize();
l.remove();
}
- } else if(j.r.state()==j.r.INIT) {
+ } else if(j.r.state()==Request.INIT) {
pw.println(j.uri+": something went
hairy, stuck in INIT state - restarting!");
j.restart();
} else {
long x = System.currentTimeMillis();
- pw.println(j.uri+":
"+j.r.nameOf(j.r.state())+" for "+
+ pw.println(j.uri+":
"+Request.nameOf(j.r.state())+" for "+
((x-j.restartedTime)/1000)+", started "+
((x-j.constructedTime)/1000));
}
@@ -727,7 +727,7 @@
dc.addPart(info);
} catch (InvalidPartException e) {
Core.logger.log(this, "Invalid part exception adding info", e,
- Core.logger.ERROR);
+ Logger.ERROR);
}
StreamPart st = new StreamPart(1, (streamType!=staticStream),
"OnionFEC_a_1_2",
@@ -738,11 +738,11 @@
dc.addPart(st);
} catch (InvalidPartException e) {
Core.logger.log(this, "Invalid part exception adding stream",
e,
- Core.logger.ERROR);
+ Logger.ERROR);
}
String mymeta = meta.writeString();
- Core.logger.log(this, "Inserting: "+mymeta, Core.logger.DEBUG);
+ Core.logger.log(this, "Inserting: "+mymeta, Logger.DEBUG);
// mymeta="Version\nRevision=1\nEndPart\nDocument\n";
// mymeta=mymeta+"Info.Stream.Format=fproxy\n";
// if(streamUri!=null)
Index: FproxyServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/FproxyServlet.java,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -w -r1.110 -r1.111
--- FproxyServlet.java 30 Oct 2003 01:34:06 -0000 1.110
+++ FproxyServlet.java 31 Oct 2003 19:21:15 -0000 1.111
@@ -1616,7 +1616,7 @@
if(!(t instanceof Exception)) {
logger.log(this,
"Non-Exception Throwable from AutoRequester",
- t, logger.NORMAL);
+ t, Logger.NORMAL);
return new
Exception("Non-Exception Throwable from AutoRequester: "+
t.toString());
Index: SFRContext.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/SFRContext.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -w -r1.25 -r1.26
--- SFRContext.java 18 Sep 2003 17:48:06 -0000 1.25
+++ SFRContext.java 31 Oct 2003 19:21:15 -0000 1.26
@@ -105,7 +105,7 @@
SFRContext(long lifeTimeMs, String uri, String path, SplitFileRequestServlet
servlet, BucketFactory bf) {
super(lifeTimeMs);
this.uri = uri;
- this.bf = bf;
+ SFRContext.bf = bf;
this.path = path;
this.servlet = servlet;
servlet.setDefaultContextValues(this);
Index: SplitFileRequestServlet.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/client/http/SplitFileRequestServlet.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -w -r1.54 -r1.55
--- SplitFileRequestServlet.java 7 Oct 2003 21:45:16 -0000 1.54
+++ SplitFileRequestServlet.java 31 Oct 2003 19:21:15 -0000 1.55
@@ -674,15 +674,15 @@
Writer w = resp.getWriter();
String s = "<html><head><title>";
- if(context.state == context.STATE_FILTER_FAILED ||
- context.state == context.STATE_CANCELED ||
- context.state == context.STATE_FAILED)
+ if(context.state == SFRContext.STATE_FILTER_FAILED ||
+ context.state == SFRContext.STATE_CANCELED ||
+ context.state == SFRContext.STATE_FAILED)
s += "Failed download - ";
- else if(context.state == context.STATE_DONE)
+ else if(context.state == SFRContext.STATE_DONE)
s += "Finished download - ";
- else if (context.state == context.STATE_SENDING_DATA)
+ else if (context.state == SFRContext.STATE_SENDING_DATA)
s += "Sending data - ";
- else if (context.state == context.STATE_FILTERING_DATA)
+ else if (context.state == SFRContext.STATE_FILTERING_DATA)
s += "Filtering data - ";
else s += ((int)(context.progress()*100.0))+" % - ";
w.write(s + HTMLEncoder.encode(context.filename())+
@@ -2001,7 +2001,7 @@
protected void setDefaultContextValues(SFRContext context) {
context.logger = logger;
context.cf = cf;
- context.bf = bf;
+ SFRContext.bf = bf;
context.htl = defaultHtl;
context.blockHtl = defaultBlockHtl;
Index: NodeStatusServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/NodeStatusServlet.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -w -r1.76 -r1.77
--- NodeStatusServlet.java 30 Oct 2003 01:34:06 -0000 1.76
+++ NodeStatusServlet.java 31 Oct 2003 19:21:15 -0000 1.77
@@ -961,9 +961,9 @@
String date = df.format(new Date(System.currentTimeMillis()));
pw.println(date);
float pMax = 0;
- int iMax = node.binLength(detail);
+ int iMax = Node.binLength(detail);
for (int i = 0; i < iMax; i++) {
- float p = node.pSuccess(i, detail, inserts);
+ float p = Node.pSuccess(i, detail, inserts);
if(Float.isNaN(p))
{
pw.println(Integer.toString(i, 16) + " | -");
@@ -976,7 +976,7 @@
};
pw.println("");
pw.println("Max: " + pMax);
- int x = node.binMostSuccessful(detail, inserts);
+ int x = Node.binMostSuccessful(detail, inserts);
if(x != -1) pw.println("Most successful: " + Integer.toString(x,16));
resp.flushBuffer();
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
