From alois-commits-return-158-apmail-incubator-alois-commits-archive=incubator.apache.org@incubator.apache.org Mon Apr 04 08:04:18 2011 Return-Path: Delivered-To: apmail-incubator-alois-commits-archive@minotaur.apache.org Received: (qmail 11865 invoked from network); 4 Apr 2011 08:04:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Apr 2011 08:04:18 -0000 Received: (qmail 19195 invoked by uid 500); 4 Apr 2011 08:04:17 -0000 Delivered-To: apmail-incubator-alois-commits-archive@incubator.apache.org Received: (qmail 19176 invoked by uid 500); 4 Apr 2011 08:04:17 -0000 Mailing-List: contact alois-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: alois-dev@incubator.apache.org Delivered-To: mailing list alois-commits@incubator.apache.org Received: (qmail 19166 invoked by uid 99); 4 Apr 2011 08:04:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Apr 2011 08:04:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Apr 2011 08:04:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AC02023888CE; Mon, 4 Apr 2011 08:03:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1088496 - /incubator/alois/trunk/rails/app/models/table.rb Date: Mon, 04 Apr 2011 08:03:52 -0000 To: alois-commits@incubator.apache.org From: flavio@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110404080352.AC02023888CE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: flavio Date: Mon Apr 4 08:03:52 2011 New Revision: 1088496 URL: http://svn.apache.org/viewvc?rev=1088496&view=rev Log: Fixed condition forwarding for data selection in table Modified: incubator/alois/trunk/rails/app/models/table.rb Modified: incubator/alois/trunk/rails/app/models/table.rb URL: http://svn.apache.org/viewvc/incubator/alois/trunk/rails/app/models/table.rb?rev=1088496&r1=1088495&r2=1088496&view=diff ============================================================================== --- incubator/alois/trunk/rails/app/models/table.rb (original) +++ incubator/alois/trunk/rails/app/models/table.rb Mon Apr 4 08:03:52 2011 @@ -95,7 +95,7 @@ class Table < ActiveRecord::Base return if File.exist?(text_filename) and not (text_date < data_date rescue false) save_yaml - data = get_data + data = get_data(options) if data.column_names.length == 0 txt = "--------------------------\n" txt += "| No columns to display. |\n" @@ -137,7 +137,7 @@ class Table < ActiveRecord::Base get_data.to_csv end def as(type, options = {}) - d = get_data + d = get_data(options) return nil if d.length == 0 d.as(type,options) end @@ -149,8 +149,8 @@ class Table < ActiveRecord::Base File.delete(data_filename) if File.exists?(data_filename) end - def get_data(recreate_data = false) - if !recreate_data and File.exists?(data_filename) + def get_data(options = {}) + if File.exists?(data_filename) and not options[:recreate_data] @data = YAML::load(File.open(data_filename)) else @@ -175,7 +175,7 @@ class Table < ActiveRecord::Base :only => if (columns.nil? or columns == "") then nil else columns.split(",").map{|n| n.strip} end, :order => order_by, :group => group_by, - :conditions => conditions) + :conditions => options[:conditions]) end File.open(data_filename, 'w') { |f| f.puts @data.to_yaml }