lib/openstudio/analysis/server_api.rb in openstudio-analysis-0.3.0 vs lib/openstudio/analysis/server_api.rb in openstudio-analysis-0.3.1

@@ -107,20 +107,29 @@
         end
 
         analysis_ids
       end
 
-      def download_dataframe(analysis_id, save_directory=".")
-        response = @conn.get "/analyses/#{analysis_id}/download_data.rdata"
+      def download_dataframe(analysis_id, format='rdata', save_directory=".")
+        response = @conn.get "/analyses/#{analysis_id}/download_data.#{format}"
         if response.status == 200
           filename = response['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
           puts "File #{filename} already exists, overwriting" if File.exist?("#{save_directory}/#{filename}")
           File.open("#{save_directory}/#{filename}",'w') {|f| f << response.body}
         end
       end
 
-      def download_variables(analysis_id, save_directory=".")
-        response = @conn.get "/analyses/#{analysis_id}/download_variables.rdata"
+      def download_variables(analysis_id, format='rdata', save_directory=".")
+        response = @conn.get "/analyses/#{analysis_id}/variables/download_variables.#{format}"
+        if response.status == 200
+          filename = response['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
+          puts "File #{filename} already exists, overwriting" if File.exist?("#{save_directory}/#{filename}")
+          File.open("#{save_directory}/#{filename}",'w') {|f| f << response.body}
+        end
+      end
+
+      def download_all_data_points(analysis_id, save_directory=".")
+        response = @conn.get "/analyses/#{analysis_id}/download_all_data_points"
         if response.status == 200
           filename = response['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
           puts "File #{filename} already exists, overwriting" if File.exist?("#{save_directory}/#{filename}")
           File.open("#{save_directory}/#{filename}",'w') {|f| f << response.body}
         end