lib/openstudio/analysis/server_api.rb in openstudio-analysis-1.0.0.rc15 vs lib/openstudio/analysis/server_api.rb in openstudio-analysis-1.0.0.rc16

@@ -170,10 +170,12 @@
           resp = @conn.get "analyses/#{analysis_id}/status.json"
           if resp.status == 200
             j = JSON.parse resp.body, symbolize_names: true
             if j && j[:analysis] && j[:analysis][:analysis_type] == analysis_type
               status = j[:analysis][:status]
+            elsif j && j[:analysis] && analysis_type == 'batch_run'
+              status = j[:analysis][:status]
             end
           end
         end
 
         status
@@ -293,16 +295,25 @@
 
       def download_datapoint(datapoint_id, save_directory = '.')
         downloaded = false
         file_path_and_name = nil
 
-        response = @conn.get "/data_points/#{datapoint_id}/download"
+        response = @conn.get "/data_points/#{datapoint_id}/download_result_file?filename=data_point.zip"
         if response.status == 200
           filename = response['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
           downloaded = true
           file_path_and_name = "#{save_directory}/#{filename}"
           puts "File #{filename} already exists, overwriting" if File.exist?(file_path_and_name)
           File.open(file_path_and_name, 'wb') { |f| f << response.body }
+        else
+          response = @conn.get "/data_points/#{datapoint_id}/download"
+          if response.status == 200
+            filename = response['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
+            downloaded = true
+            file_path_and_name = "#{save_directory}/#{filename}"
+            puts "File #{filename} already exists, overwriting" if File.exist?(file_path_and_name)
+            File.open(file_path_and_name, 'wb') { |f| f << response.body }
+          end
         end
 
         [downloaded, file_path_and_name]
       end