@@ -40,15 +40,18 @@ module JasperServer params_xml = "" params.each do |name, value| - if value.kind_of? Array + case value + when Array value.each do |item| params_xml << %{<parameter name="#{name}" isListItem="true">#{@@html_encoder.encode(item, :decimal)}</parameter>\n} end - elsif value.kind_of? Time + when Time, DateTime, Date ts = ReportRequest.convert_time_to_jasper_timestamp(value) params_xml << %{<parameter name="#{name}">#{ts}</parameter>\n} - elsif !value.blank? - params_xml << %{<parameter name="#{name}"><![CDATA[#{value}]]></parameter>\n} + else + unless value.blank? + params_xml << %{<parameter name="#{name}"><![CDATA[#{value}]]></parameter>\n} + end end end lib/jasper_server/protocols/soap.rb @@ -24,9 +24,11 @@ module JasperServer @report_params = report_params end - # Converts the given Time into a timestamp integer acceptable by JasperServer. + # Converts the given Time/DateTime/Date into a timestamp integer acceptable by JasperServer. # The timezone adjustment is performed (converted to UTC). def self.convert_time_to_jasper_timestamp(time) + time = Time.parse(time.to_s) unless time.kind_of?(Time) + # convert to milisecond timestamp ts = time.to_i * 1000 # adjust for timezone lib/jasper_server/report_request.rb fb38a12dfbb8df74221975838e197156a3381d6f zuk zuk@roughest.net http://github.com/gunark/jasperserver-client/commit/fd5bb0db90cf6bd5acf7ac89194e670f23b679ef fd5bb0db90cf6bd5acf7ac89194e670f23b679ef 2009-10-14T08:38:47-07:00 2009-10-14T08:38:47-07:00 should now be able to handle DateTime and Date values (in addition to just Time) in ReportRequest c6ef80298784955cfa7483348d46daa927a1c082 zuk zuk@roughest.net