From bedfbdfb3f78326b0eb3532d3376ccf52186ed86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Knud=20=C3=85ge=20Hansen?= <kaah@statsbiblioteket.dk>
Date: Tue, 12 Sep 2017 12:43:10 +0200
Subject: [PATCH] NAS-2642:  Displaying test information

---
 harvester/harvester-core/pom.xml              | 10 ---------
 .../harvester/webinterface/servlet/nas.groovy | 21 ++++++++++---------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/harvester/harvester-core/pom.xml b/harvester/harvester-core/pom.xml
index ff97ad9b51..81ffbac8c9 100644
--- 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/harvester-core/src/main/resources/dk/netarkivet/harvester/webinterface/servlet/nas.groovy b/harvester/harvester-core/src/main/resources/dk/netarkivet/harvester/webinterface/servlet/nas.groovy
index 9df14817bb..ea7b62bfe8 100644
--- a/harvester/harvester-core/src/main/resources/dk/netarkivet/harvester/webinterface/servlet/nas.groovy
+++ b/harvester/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) {