Bug 62

.gitignore

@@ -128,4 +128,4 @@ node_modules
 .DS_Store
 .idea
 
-/config/credentials/demo-rockjy.key
+/app/views/guide/scratch.html

app/controllers/api_dataset_controller.rb

@@ -14,11 +14,11 @@ class ApiDatasetController < ApplicationController
   # Responds to `POST /api/datasets/:dataset_key/datafile`
   def datafile
 
-    @dataset = Dataset.find_by_key(params['dataset_key'])
+    @dataset = Dataset.find_by(key: params['dataset_key'])
 
-    raise ActiveRecord::RecordNotFound unless @dataset
+    Rails.logger.warn "dataset NOT FOUND during API upload to dataset_key=#{params['dataset_key']}" unless @dataset
 
-    # Rails.logger.warn params.to_yaml
+    raise ActiveRecord::RecordNotFound unless @dataset
 
     if params.has_key?('binary')
 
@@ -78,7 +78,7 @@ def authenticate
     # Rails.logger.warn params
     if params.has_key?(:dataset_key)
       @dataset = Dataset.find_by_key(params[:dataset_key])
-      if @dataset  && @dataset.publication_state == Databank::PublicationState::DRAFT
+      if @dataset  && Databank::PublicationState::DRAFT_ARRAY.include?(@dataset.publication_state)
         authenticate_token || render_unauthorized
       else
         render_not_found

app/models/dataset/publishable.rb

@@ -55,8 +55,8 @@ def ok_to_publish?
     return true if publication_state == Databank::PublicationState::DRAFT
 
     # if the dataset is not in a state that is ok to publish, return false
-    Rails.logger.warn( "Dataset is not ok to publish. Dataset: #{key} publication_state: #{publication_state} hold_state: #{hold_state}" )
-    Rails.logger.warn( self.to_yaml )
+    #Rails.logger.warn( "Dataset is not ok to publish. Dataset: #{key} publication_state: #{publication_state} hold_state: #{hold_state}" )
+    #Rails.logger.warn( self.to_yaml )
     false
   end
 

app/views/metrics/index.html.haml

@@ -12,7 +12,7 @@
     =link_to("Metrics Dashboard", "/metrics_dashboard.html")
   .indent
     %p
-      Charts and tables analyzing dataset count, size, subject, file type, and downloads over time from May 2016 through December 2023.
+      Charts and tables analyzing dataset count, size, subject, file type, and downloads over time from May 2016 through June 2025.
 .metrics-border
   %h3
     -link = '<a href="/dataset_downloads.json" >Dataset downloads json</a>'.html_safe
@@ -265,4 +265,3 @@
         %strong grant:
         The grant identifier
 
-