From 40d92128d7cdb893218fee336ed3fd4dbcedec67 Mon Sep 17 00:00:00 2001
From: "vit.jonas@gmail.com"
 <vit.jonas@gmail.com@5e329b0b-a2ee-ea63-e329-299493fc886d>
Date: Tue, 31 May 2011 10:56:02 +0000
Subject: [PATCH] * fixed Issue 61: Redmine xapian and dmsf problems

git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@110 5e329b0b-a2ee-ea63-e329-299493fc886d
---
 app/models/dmsf_file.rb | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb
index 14eff9b1..7425072c 100644
--- a/app/models/dmsf_file.rb
+++ b/app/models/dmsf_file.rb
@@ -28,6 +28,9 @@ class DmsfFile < ActiveRecord::Base
   unloadable
   belongs_to :project
   belongs_to :folder, :class_name => "DmsfFolder", :foreign_key => "dmsf_folder_id"
+  has_many :revisions, :class_name => "DmsfFileRevision", :foreign_key => "dmsf_file_id", 
+    :order => "major_version DESC, minor_version DESC, updated_at DESC", 
+    :conditions => { :deleted => false }
   has_many :locks, :class_name => "DmsfFileLock", :foreign_key => "dmsf_file_id", 
     :order => "updated_at DESC"
   belongs_to :deleted_by_user, :class_name => "User", :foreign_key => "deleted_by_user_id"
@@ -78,27 +81,16 @@ class DmsfFile < ActiveRecord::Base
   end
 
   def last_revision
-    if @last_revision.nil?
-      @last_revision = DmsfFileRevision.find(:first, :conditions => 
-        ["dmsf_file_id = :file_id and deleted = :deleted", 
-          {:file_id => self.id, :deleted => false}], 
-          :order => "major_version DESC, minor_version DESC, updated_at DESC")
-    end
-    @last_revision
+    self.revisions.first
   end
   
-  def reload
-    @last_revision = nil
-    super
-  end
-
-  def revisions(offset = nil, limit = nil)
-    DmsfFileRevision.find(:all, :conditions => 
-        ["dmsf_file_id = :file_id and deleted = :deleted", 
-          {:file_id => self.id, :deleted => false}], 
-          :order => "major_version DESC, minor_version DESC, updated_at DESC",
-          :limit => limit, :offset => offset)
-  end
+  #def revisions(offset = nil, limit = nil)
+  #  DmsfFileRevision.find(:all, :conditions => 
+  #      ["dmsf_file_id = :file_id and deleted = :deleted", 
+  #        {:file_id => self.id, :deleted => false}], 
+  #        :order => "major_version DESC, minor_version DESC, updated_at DESC",
+  #        :limit => limit, :offset => offset)
+  #end
 
   def delete
     return false if locked_for_user?