*) now showing the total number of entries in the queue in addition t…

…o the number of entries in the list git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1168 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · Dec 5, 2005 · d5c36c8 · d5c36c8
1 parent dc77865
commit d5c36c8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/htroot/IndexCreateIndexingQueue_p.html b/htroot/IndexCreateIndexingQueue_p.html
@@ -18,7 +18,7 @@ <h2>Index Creation: Indexing Queue</h2>
 <input type="submit" name="clearIndexingQueue" value="clear indexing queue">
 </form>
 <br>
-There are #[num]# entries with a total size of #[totalSize]# in the indexing queue:<br>
+There are #[num]# entries in the indexing queue. Showing #[show]# entries with a total size of #[totalSize]#:<br>
 <table border="0" cellpadding="2" cellspacing="1">
 <tr class="TableHeader">
 <th class="small">Initiator</th>

diff --git a/htroot/IndexCreateIndexingQueue_p.java b/htroot/IndexCreateIndexingQueue_p.java
@@ -124,7 +124,7 @@ public static serverObjects respond(httpHeader header, serverObjects post, serve
 
             dark = true;
             plasmaSwitchboardQueue.Entry pcentry;
-            int inProcessCount = 0, entryCount = 0;
+            int inProcessCount = 0, entryCount = 0, totalCount = 0; 
             long totalSize = 0;
             try {
                 ArrayList entryList = new ArrayList();
@@ -141,6 +141,7 @@ public static serverObjects respond(httpHeader header, serverObjects post, serve
                 }
 
                 int count=entryList.size();
+                totalCount = count;
                 if(count>100)count=100;
                 for (int i = 0; i < count; i++) {
 
@@ -164,8 +165,9 @@ public static serverObjects respond(httpHeader header, serverObjects post, serve
                     }
                 }
             } catch (IOException e) {}
-
-            prop.put("indexing-queue_num", entryCount);//num entries in queue
+
+            prop.put("indexing-queue_show", entryCount);//show shown entries
+            prop.put("indexing-queue_num", totalCount);//num entries in queue 
             prop.put("indexing-queue_totalSize", bytesToString(totalSize));//num entries in queue 
             prop.put("indexing-queue_list", entryCount);
         }