From aa98919e88929ccdfa5d8325891425db768714dc Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 14 Dec 2014 21:30:09 +0100
Subject: [PATCH] searchable

---
 app/models/calentry.rb | 2 +-
 app/models/gallery.rb  | 6 +++++-
 app/models/gremium.rb  | 6 +++++-
 app/models/lva.rb      | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/models/calentry.rb b/app/models/calentry.rb
index 4c25840..8347a90 100644
--- a/app/models/calentry.rb
+++ b/app/models/calentry.rb
@@ -57,7 +57,7 @@ end
   end
   def name
     unless self.object.nil?
-      self.object.name
+      self.object.title
     else
       summary
     end
diff --git a/app/models/gallery.rb b/app/models/gallery.rb
index ac5855c..7c2079e 100644
--- a/app/models/gallery.rb
+++ b/app/models/gallery.rb
@@ -15,7 +15,11 @@ class Gallery < ActiveRecord::Base
   attr_accessible :datum, :desc, :name
   has_many :fotos
   has_many :nlinks, as: :link
-    scope :search, ->(query) {where("name like ? or galleries.desc like ?", "%#{query}%", "%#{query}%")}
+#    scope :search, ->(query) {where("name like ? or galleries.desc like ?", "%#{query}%", "%#{query}%")}
+  searchable do 
+    text :desc
+    text :name, :boost=>3.0
+  end
 
   def title
     name
diff --git a/app/models/gremium.rb b/app/models/gremium.rb
index aef3387..8fd3c7e 100644
--- a/app/models/gremium.rb
+++ b/app/models/gremium.rb
@@ -22,7 +22,11 @@ class Gremium < ActiveRecord::Base
   attr_accessible :desc, :name, :typ, :geschlecht,:thema_id, :memberships_attributes
   has_many :memberships, dependent: :destroy # Mitgliedschaften bei dem Gremium
   has_many :nlinks, as: :link, dependent: :destroy
-  scope :search, ->(query) {where("gremien.name like ? or gremien.desc like ?", "%#{query}%", "%#{query}%")}
+#  scope :search, ->(query) {where("gremien.name like ? or gremien.desc like ?", "%#{query}%", "%#{query}%")}
+  searchable do
+    text :desc
+    text :name, :boost=>4.0
+  end
 
   belongs_to :thema # Gehört zu einem Thema
   scope :tabs, -> { where(:typ => [1,3]).order(:typ).order(:name) } # Gremien die in Tabs angezeigt werden (Alle Anderen nur in der Liste
diff --git a/app/models/lva.rb b/app/models/lva.rb
index c24cd22..c8752b4 100755
--- a/app/models/lva.rb
+++ b/app/models/lva.rb
@@ -47,7 +47,7 @@ class Lva < ActiveRecord::Base
   has_and_belongs_to_many :lecturers
   has_many :nlinks, as: :link
   
-  scope :search, ->(query) {where("name like ? or lvas.desc like ?", "%#{query}%", "%#{query}%")} 
+#  scope :search, ->(query) {where("name like ? or lvas.desc like ?", "%#{query}%", "%#{query}%")} 
   
   validates :lvanr,:format=>{ :with => /^[0-9][0-9][0-9]\.[0-9A][0-9][0-9]$/}, :presence=>true, :uniqueness=>true # , :uniqueness=>true # LVA-Nummer muss das Format 000.000 besitzen (uniqueness?) oder 000 für nicht 
   validates_presence_of :ects  # ECTS vorhanden?