[freenet-cvs] r11199 - trunk/freenet/src/freenet/clients/http

[nextgens at freenetproject.org]

Author: nextgens
Date: 2006-12-02 19:43:37 +0000 (Sat, 02 Dec 2006)
New Revision: 11199

Modified:
   trunk/freenet/src/freenet/clients/http/QueueToadlet.java
Log:
more untested work on #889

Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java	2006-12-02 19:43:20 UTC (rev 11198)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java	2006-12-02 19:43:37 UTC (rev 11199)
@@ -52,7 +52,6 @@
 	private static final int LIST_PROGRESS = 11;
 	private static final int LIST_REASON = 12;
 
-	private static final int MAX_IDENTIFIER_LENGTH = 1024*1024;
 	private static final int MAX_FILENAME_LENGTH = 1024*1024;
 	private static final int MAX_TYPE_LENGTH = 1024;
 	static final int MAX_KEY_LENGTH = 1024*1024;
@@ -89,7 +88,7 @@
 			boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
 			
 			if(request.isPartSet("remove_request") && (request.getPartAsString("remove_request", 32).length() > 0)) {
-				String identifier = request.getPartAsString("identifier", MAX_IDENTIFIER_LENGTH);
+				String identifier = request.getParam("identifier");
 				if(logMINOR) Logger.minor(this, "Removing "+identifier);
 				try {
 					fcp.removeGlobalRequest(identifier);
@@ -99,7 +98,7 @@
 				writePermanentRedirect(ctx, "Done", "/queue/");
 				return;
 			} else if(request.isPartSet("restart_request") && (request.getPartAsString("restart_request", 32).length() > 0)) {
-				String identifier = request.getPartAsString("identifier", MAX_IDENTIFIER_LENGTH);
+				String identifier = request.getParam("identifier");
 				if(logMINOR) Logger.minor(this, "Restarting "+identifier);
 				ClientRequest[] clientRequests = fcp.getGlobalRequests();
 				for (int requestIndex = 0, requestCount = clientRequests.length; requestIndex < requestCount; requestIndex++) {
@@ -151,7 +150,7 @@
 				writePermanentRedirect(ctx, "Done", "/queue/");
 				return;
 			} else if (request.isPartSet("change_priority")) {
-				String identifier = request.getPartAsString("identifier", MAX_IDENTIFIER_LENGTH);
+				String identifier = request.getParam("identifier");
 				short newPriority = Short.parseShort(request.getPartAsString("priority", 32));
 				ClientRequest[] clientRequests = fcp.getGlobalRequests();
 				for (int requestIndex = 0, requestCount = clientRequests.length; requestIndex < requestCount; requestIndex++) {
@@ -219,7 +218,7 @@
 				writePermanentRedirect(ctx, "Done", "/queue/");
 				return;
 			} else if (request.isPartSet("get")) {
-				String identifier = request.getPartAsString("identifier", MAX_IDENTIFIER_LENGTH);
+				String identifier = request.getParam("identifier");
 				ClientRequest[] clientRequests = fcp.getGlobalRequests();
 				for (int requestIndex = 0, requestCount = clientRequests.length; requestIndex < requestCount; requestIndex++) {
 					ClientRequest clientRequest = clientRequests[requestIndex];