NAS-2642: Further information displayed

netarchivesuite · Sep 12, 2017 · e6883f0 · e6883f0
1 parent 34ef4a9
commit e6883f0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
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
@@ -68,13 +68,16 @@ void listFrontier(String regex, long limit) {
     htmlOut.println 'Total queued URIs: ' + pendingUris.pendingUrisDB.count() + '\n<br/>'
     if (linesPerPage == 0)
         linesPerPage = 100
+    htmlOut.println '-------------------------'
     totalCachedSize = getPages(pendingUris, linesPerPage)
+    htmlOut.println '---'
     htmlOut.println 'Total cached size: ' + totalCachedSize + '\n<br/>'
+    htmlOut.println '---------------------------------------------------------'
     //htmlOut.println 'Page: ' + page + '\n<br/>'
     page = 2
+    htmlOut.println '-'
     totalCachedLines = pendingUris;
 
-
     content = '<pre>'
     //iterates over the raw underlying instance of com.sleepycat.je.Database
     cursor = pendingUris.pendingUrisDB.openCursor(null, null)
@@ -83,17 +86,19 @@ void listFrontier(String regex, long limit) {
     matchingCount = 0
     index = 0
     try {
+        /*
         htmlOut.println lines
 
         totalCachedLines = pendingUris;
         if (linesPerPage == 0)
             linesPerPage = 100
         totalCachedSize = getPages(pendingUris, linesPerPage)
+        */
 
         while (cursor.getNext(key, value, null) == OperationStatus.SUCCESS && ((long)index) < ((long)(page * linesPerPage))) {
         //while (cursor.getNext(key, value, null) == OperationStatus.SUCCESS && index < 25) {
             index++
-            content = content + index + '\n'
+            //content = content + index + '\n'
         }
 
 //        while (cursor.getNext(key, value, null) == OperationStatus.SUCCESS && limit > 0) {
@@ -103,7 +108,7 @@ void listFrontier(String regex, long limit) {
                 continue
             }
 */
-            content = content + index + '\n'
+            //content = content + index + '\n'
 
             if (value.getData().length == 0) {
                 continue

diff --git a/quickstart-vagrant-environment/run-vagrant.sh b/quickstart-vagrant-environment/run-vagrant.sh
@@ -50,7 +50,7 @@ else
 			# Insert code into Vagrantfile-include that retrieves a local copy
 			# of the requested branch
 			# git clone -b <branch> --depth 1 <remote_repo>
-			echo 'pwd; mkdir gitting; cd gitting; git clone -b "$bargument" --depth 1 https://github.com/netarchivesuite/netarchivesuite.git' >'Vagrantfile-include'
+			echo "pwd; mkdir gitting; cd gitting; git clone -b $bargument --depth 1 https://github.com/netarchivesuite/netarchivesuite.git" >'Vagrantfile-include'
 
 			# Build the newly cloned NAS using maven
 			#echo ''>'Vagrantfile-include'
@@ -81,5 +81,7 @@ vagrant destroy -f
 echo 'Running: vagrant up'
 vagrant up >vagrant-up-output.txt
 echo 'Vagrant is up!'
+echo 'To build from a totally clean vagrant, do'
+echo '   vagrant destroy -f; vagrant box remove "ubuntu/precise64"'
+echo 'before running this script.'
 date
-