NAS-2642: Displaying test information

netarchivesuite · Sep 12, 2017 · bedfbdf · bedfbdf
1 parent f9d406f
commit bedfbdf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 20 deletions.
diff --git a/harvester/harvester-core/pom.xml b/harvester/harvester-core/pom.xml
@@ -156,16 +156,6 @@
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-all</artifactId>
-      <version>2.5.0-alpha-1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-all</artifactId>
-      <version>2.5.0-alpha-1</version>
-    </dependency>
 
   </dependencies>
 

diff --git a/...harvester-core/src/main/resources/dk/netarkivet/harvester/webinterface/servlet/nas.groovy b/...harvester-core/src/main/resources/dk/netarkivet/harvester/webinterface/servlet/nas.groovy
@@ -66,17 +66,18 @@ void listFrontier(String regex, long limit) {
     pendingUris = job.crawlController.frontier.pendingUris
     htmlOut.println '<p>Limit: ' + 100 + '\n<br/>'
     htmlOut.println 'Total queued URIs: ' + pendingUris.pendingUrisDB.count() + '\n<br/>'
-    htmlOut.println '--------------'
-    htmlOut.println '-------------------------'
-    long totalCachedSize = getPages(pendingUris, limit)
-    htmlOut.println '---'
-    htmlOut.println 'Total cached size: ' + totalCachedSize + '\n<br/>'
-    htmlOut.println '---------------------------------------------------------'
-    //htmlOut.println 'Page: ' + page + '\n<br/>'
-    def page = 2
     htmlOut.println '-'
+    htmlOut.println '---'
+    htmlOut.println '-----'
+    htmlOut.println 'Total cached size: ' + getPages(pendingUris, limit) + '\n<br/>'
+    htmlOut.println '-------'
+    page = 2
+    htmlOut.println 'Page: ' + page + '\n<br/>'
+    htmlOut.println '---------'
     totalCachedLines = pendingUris;
-
+    htmlOut.println '-----------'
+    totalCachedSize = getPages(pendingUris, limit)
+    htmlOut.println '-------------'
     content = '<pre>'
     //iterates over the raw underlying instance of com.sleepycat.je.Database
     cursor = pendingUris.pendingUrisDB.openCursor(null, null)
@@ -146,7 +147,7 @@ public static long getPages(long items, long itemsPerPage) {
     if (pages == 0) {
         pages = 1
     }
-    pages
+    return pages
 }
 
 void pageFrontier(long skip, int items) {