diff --git a/htroot/IndexCreateIndexingQueue_p.html b/htroot/IndexCreateIndexingQueue_p.html index 1711cbcb7..c4799ff59 100644 --- a/htroot/IndexCreateIndexingQueue_p.html +++ b/htroot/IndexCreateIndexingQueue_p.html @@ -18,7 +18,9 @@ The indexing queue is empty

-There are #[num]# entries in the indexing queue. Showing #[show]# entries with a total size of #[totalSize]#:
+

There are #[num]# entries in the indexing queue. Showing #[show]# entries with a total size of #[totalSize]#.

+

Show last 50 | 100 | 250 | 500 entries.

+ diff --git a/htroot/IndexCreateIndexingQueue_p.java b/htroot/IndexCreateIndexingQueue_p.java index c88f01948..b11893069 100644 --- a/htroot/IndexCreateIndexingQueue_p.java +++ b/htroot/IndexCreateIndexingQueue_p.java @@ -75,7 +75,14 @@ public class IndexCreateIndexingQueue_p { prop.put("rejected", 0); int showRejectedCount = 10; + int showLimit = 100; if (post != null) { + if (post.containsKey("limit")) { + try { + showLimit = Integer.valueOf((String)post.get("limit")).intValue(); + } catch (NumberFormatException e) {} + } + if (post.containsKey("clearRejected")) { switchboard.urlPool.errorURL.clearStack(); } @@ -143,8 +150,7 @@ public class IndexCreateIndexingQueue_p { int count=entryList.size(); totalCount = count; - if(count>100)count=100; - for (int i = 0; i < count; i++) { + for (int i = 0; (i < count) && (entryCount < showLimit); i++) { boolean inProcess = i < inProcessCount; pcentry = (plasmaSwitchboardQueue.Entry) entryList.get(i); diff --git a/htroot/IndexCreateWWWGlobalQueue_p.html b/htroot/IndexCreateWWWGlobalQueue_p.html index fcd6824b7..a5cd6699a 100644 --- a/htroot/IndexCreateWWWGlobalQueue_p.html +++ b/htroot/IndexCreateWWWGlobalQueue_p.html @@ -21,7 +21,8 @@ The global crawler queue is empty


-There are #[num]# entries in the global crawler queue. Showing #[show-num]# most recent entries: +

There are #[num]# entries in the global crawler queue. Showing #[show-num]# most recent entries.

+

Show last 50 | 100 | 250 | 500 entries.

Initiator
diff --git a/htroot/IndexCreateWWWGlobalQueue_p.java b/htroot/IndexCreateWWWGlobalQueue_p.java index c9121a414..89088f0d2 100644 --- a/htroot/IndexCreateWWWGlobalQueue_p.java +++ b/htroot/IndexCreateWWWGlobalQueue_p.java @@ -70,7 +70,14 @@ public class IndexCreateWWWGlobalQueue_p { plasmaSwitchboard switchboard = (plasmaSwitchboard) env; serverObjects prop = new serverObjects(); + int showLimit = 100; if (post != null) { + if (post.containsKey("limit")) { + try { + showLimit = Integer.valueOf((String)post.get("limit")).intValue(); + } catch (NumberFormatException e) {} + } + if (post.containsKey("clearcrawlqueue")) { int c = switchboard.urlPool.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_LIMIT); switchboard.urlPool.noticeURL.clear(plasmaCrawlNURL.STACK_TYPE_LIMIT); @@ -92,16 +99,15 @@ public class IndexCreateWWWGlobalQueue_p { prop.put("crawler-queue", 0); } else { prop.put("crawler-queue", 1); - plasmaCrawlNURL.Entry[] crawlerList = switchboard.urlPool.noticeURL.top(plasmaCrawlNURL.STACK_TYPE_LIMIT, 100); + plasmaCrawlNURL.Entry[] crawlerList = switchboard.urlPool.noticeURL.top(plasmaCrawlNURL.STACK_TYPE_LIMIT, showLimit); prop.put("crawler-queue_num", stackSize);//num Entries - prop.put("crawler-queue_show-num", crawlerList.length); //showin sjow-num most recent plasmaCrawlNURL.Entry urle; boolean dark = true; yacySeed initiator; String profileHandle; plasmaCrawlProfile.entry profileEntry; int i, showNum = 0; - for (i = 0; i < crawlerList.length; i++) { + for (i = 0; (i < crawlerList.length) && (showNum < showLimit); i++) { urle = crawlerList[i]; if ((urle != null)&&(urle.url()!=null)) { initiator = yacyCore.seedDB.getConnected(urle.initiator()); @@ -118,6 +124,7 @@ public class IndexCreateWWWGlobalQueue_p { showNum++; } } + prop.put("crawler-queue_show-num", showNum); //showin sjow-num most recent prop.put("crawler-queue_list", showNum); } diff --git a/htroot/IndexCreateWWWLocalQueue_p.html b/htroot/IndexCreateWWWLocalQueue_p.html index 4f6333806..96261434f 100644 --- a/htroot/IndexCreateWWWLocalQueue_p.html +++ b/htroot/IndexCreateWWWLocalQueue_p.html @@ -32,7 +32,8 @@ The local crawler queue is empty



-There are #[num]# entries in the local crawler queue. Showing #[show-num]# most recent entries: +

There are #[num]# entries in the local crawler queue. Showing #[show-num]# most recent entries.

+

Show last 50 | 100 | 250 | 500 entries.

Initiator
diff --git a/htroot/IndexCreateWWWLocalQueue_p.java b/htroot/IndexCreateWWWLocalQueue_p.java index d4d7b166c..079d9ffa1 100644 --- a/htroot/IndexCreateWWWLocalQueue_p.java +++ b/htroot/IndexCreateWWWLocalQueue_p.java @@ -76,7 +76,14 @@ public class IndexCreateWWWLocalQueue_p { plasmaSwitchboard switchboard = (plasmaSwitchboard) env; serverObjects prop = new serverObjects(); + int showLimit = 100; if (post != null) { + if (post.containsKey("limit")) { + try { + showLimit = Integer.valueOf((String)post.get("limit")).intValue(); + } catch (NumberFormatException e) {} + } + if (post.containsKey("deleteEntries")) { int c = 0; @@ -163,7 +170,7 @@ public class IndexCreateWWWLocalQueue_p { String profileHandle; plasmaCrawlProfile.entry profileEntry; int i; - for (i = 0; (i < crawlerList.length) && (showNum < 100); i++) { + for (i = 0; (i < crawlerList.length) && (showNum < showLimit); i++) { urle = crawlerList[i]; if ((urle != null)&&(urle.url()!=null)) { initiator = yacyCore.seedDB.getConnected(urle.initiator());
Initiator