Taxonomy subset dl (#31)

* Bump version

* add flag to enable formatting based on a search

* Enable subset taxonomy download (fixes #29)

* Add padding to prevent overflow on toggle

* Bump version to reflect release

* ignore cruft

* Stop spinning appropriately when PDF creation fails

.gitignore

@@ -52,6 +52,7 @@ errors/
 *.out
 *.aux
 
+.vscode        
 bower_components/bootstrap/node_modules/
 node_modules/
 admin/node_modules/

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "ASM Mammal Database",
-  "version": "0.6.4",
+  "version": "1.1.2",
   "homepage": "https://github.com/tigerhawkvok/asm-mammal-database",
   "authors": [
     "Philip Kahn <[email protected]>"

coffee/download.coffee

@@ -2,7 +2,7 @@
 # Depends on the service worker to do some of the load off-thread
 # See ./serviceWorker.coffee
 
-downloadCSVList = ->
+downloadCSVList = (useLastSearch = false) ->
   ###
   # Download a CSV file list
   #
@@ -13,12 +13,18 @@ downloadCSVList = ->
   startTime = Date.now()
   _asm.progressTracking =
     estimate: new Array()
+  try
+    searchString = if useLastSearch then searchParams.lastSearch else "*"
+    if isNull searchString
+      searchString = "*"
+  catch
+    searchString = "*"
   try
     for button in $("#download-chooser .buttons paper-button")
       p$(button).disabled = true
   #filterArg = "eyJpc19hbGllbiI6MCwiYm9vbGVhbl90eXBlIjoib3IifQ"
   #args = "filter=#{filterArg}"
-  args = "q=*"
+  args = "q=#{searchString}"
   d = new Date()
   adjMonth = d.getMonth() + 1
   month = if adjMonth.toString().length is 1 then "0#{adjMonth}" else adjMonth
@@ -195,7 +201,7 @@ downloadCSVList = ->
 
 
 
-downloadHTMLList = ->
+downloadHTMLList = (useLastSearch = false) ->
   ###
   # Download a HTML file list
   #
@@ -216,6 +222,12 @@ downloadHTMLList = ->
   startTime = Date.now()
   _asm.progressTracking =
     estimate: new Array()
+  try
+    searchString = if useLastSearch then searchParams.lastSearch else "*"
+    if isNull searchString
+      searchString = "*"
+  catch
+    searchString = "*"
   try
     for button in $("#download-chooser .buttons paper-button")
       p$(button).disabled = true
@@ -245,7 +257,7 @@ downloadHTMLList = ->
               <article>
                 <h1 class="text-center">ASM Species Checklist ver. #{dateString}</h1>
     """
-    args = "q=*&order=linnean_order,linnean_family,genus,species,subspecies"
+    args = "q=#{searchString}&order=linnean_order,linnean_family,genus,species,subspecies"
     $.get "#{searchParams.apiPath}", args, "json"
     .done (result) ->
       startLoad()
@@ -284,7 +296,8 @@ downloadHTMLList = ->
               </p>
               """
               $("#download-chooser .dialog-content .scrollable").append html
-            p$("#download-progress-indicator").value = e.data.progress
+            try
+              p$("#download-progress-indicator").value = e.data.progress
             timeElapsed = Date.now() - startTime
             fractionalProgress = toFloat(e.data.progress) / 1000.0
             totalTimeEstimate = timeElapsed / fractionalProgress
@@ -360,10 +373,10 @@ downloadHTMLList = ->
             """
             $("#download-html-file #download-html-summary").after pdfDownload
           else
-            console.error "Couldn't make PDF file"
+            stopLoadError "Couldn't make PDF file"
             $("#download-html-file #download-html-summary").after pdfError
         .error (result, status) ->
-          console.error "Wasn't able to fetch PDF"
+          stopLoadError "Wasn't able to fetch PDF"
           $("#download-html-file #download-html-summary").after pdfError
         .always ->
           try
@@ -388,6 +401,9 @@ showDownloadChooser = ->
       <p>
         Once you select a file type, it will take a moment to prepare your download. Please be patient.
       </p>
+      <div>
+        <paper-toggle-button id="use-search">Use current search results</paper-toggle-button>
+      </div>
     </paper-dialog-scrollable>
     <div class="buttons">
       <paper-button dialog-dismiss>Cancel</paper-button>
@@ -400,9 +416,21 @@ showDownloadChooser = ->
     $("body").append(html)
   $("#initiate-csv-download").click ->
     # Show a notice to docs for direct queries
-    downloadCSVList()
+    try
+      isChecked = p$("#use-search").checked
+    catch
+      isChecked = false
+    try
+      p$("#use-search").disabled = true
+    downloadCSVList(isChecked)
   $("#initiate-html-download").click ->
-    downloadHTMLList()
+    try
+      isChecked = p$("#use-search").checked
+    catch
+      isChecked = false
+    try
+      p$("#use-search").disabled = true
+    downloadHTMLList(isChecked)
   ## Close events
   # When we close it, we want to remove it to reset the
   # progress bar and the disabled's, etc.

coffee/search.coffee

@@ -1,6 +1,7 @@
-searchParams = new Object()
-searchParams.targetApi = "api.php"
-searchParams.targetContainer = "#result_container"
+searchParams =
+  lastSearch: "*"
+  targetApi: "api.php"
+  targetContainer: "#result_container"
 searchParams.apiPath = uri.urlString + searchParams.targetApi
 
 window._asm = new Object()
@@ -235,6 +236,7 @@ performSearch = (stateArgs = undefined) ->
     return false
   animateLoad()
   console.log("Got search value #{s}, hitting","#{searchParams.apiPath}?#{args}")
+  searchParams.lastSearch = s
   $.get(searchParams.targetApi,args,"json")
   .done (result) ->
     # Populate the result container
@@ -1528,6 +1530,8 @@ $ ->
   # Perform the initial search
   if not isNull(loadArgs) and loadArgs isnt "#"
     # console.log("Doing initial search with '#{loadArgs}', hitting","#{searchParams.apiPath}?q=#{loadArgs}")
+    try
+      searchParams.lastSearch = loadArgs
     $.get searchParams.targetApi,"q=#{loadArgs}","json"
     .done (result) ->
       # Populate the result container

css/main.css

@@ -6945,6 +6945,9 @@ main #images-block div.no-image {
 #eutheria-extra {
   display: inline-block;
 }
+paper-dialog#download-chooser paper-dialog-scrollable .scrollable {
+  padding-bottom: 2rem;
+}
 paper-dialog#set-license-value {
   width: 85vw;
 }

currentVersion

@@ -1 +1 @@
-v0.6.4
+v1.1.2

js/c.src.coffee

@@ -1809,9 +1809,10 @@ $ ->
       lightboxImages()
       false
 
-searchParams = new Object()
-searchParams.targetApi = "api.php"
-searchParams.targetContainer = "#result_container"
+searchParams =
+  lastSearch: "*"
+  targetApi: "api.php"
+  targetContainer: "#result_container"
 searchParams.apiPath = uri.urlString + searchParams.targetApi
 
 window._asm = new Object()
@@ -2046,6 +2047,7 @@ performSearch = (stateArgs = undefined) ->
     return false
   animateLoad()
   console.log("Got search value #{s}, hitting","#{searchParams.apiPath}?#{args}")
+  searchParams.lastSearch = s
   $.get(searchParams.targetApi,args,"json")
   .done (result) ->
     # Populate the result container
@@ -3339,6 +3341,8 @@ $ ->
   # Perform the initial search
   if not isNull(loadArgs) and loadArgs isnt "#"
     # console.log("Doing initial search with '#{loadArgs}', hitting","#{searchParams.apiPath}?q=#{loadArgs}")
+    try
+      searchParams.lastSearch = loadArgs
     $.get searchParams.targetApi,"q=#{loadArgs}","json"
     .done (result) ->
       # Populate the result container