From: <jh...@us...> - 2010-12-18 06:49:12
|
Revision: 229 http://etch.svn.sourceforge.net/etch/?rev=229&view=rev Author: jheiss Date: 2010-12-18 06:49:06 +0000 (Sat, 18 Dec 2010) Log Message: ----------- Add searchlogic searching to controllers that didn't have search functionality. The clients and results controllers still have their homegrown search functionality that will need to be migrated to searchlogic at some point. Modified Paths: -------------- trunk/server/app/controllers/etch_configs_controller.rb trunk/server/app/controllers/facts_controller.rb trunk/server/app/controllers/originals_controller.rb Modified: trunk/server/app/controllers/etch_configs_controller.rb =================================================================== --- trunk/server/app/controllers/etch_configs_controller.rb 2010-12-18 02:02:52 UTC (rev 228) +++ trunk/server/app/controllers/etch_configs_controller.rb 2010-12-18 06:49:06 UTC (rev 229) @@ -1,9 +1,19 @@ +require 'intmax' + class EtchConfigsController < ApplicationController # GET /etch_configs def index - @etch_configs = EtchConfig.find :all - + # Clients requesting XML get no pagination (all entries) + per_page = EtchConfig.per_page # will_paginate's default value respond_to do |format| + format.html {} + format.xml { per_page = Integer::MAX } + end + + @search = EtchConfig.search(params[:search]) + @etch_configs = @search.paginate(:page => params[:page], :per_page => per_page) + + respond_to do |format| format.html # index.html.erb format.xml { render :xml => @etch_configs } end Modified: trunk/server/app/controllers/facts_controller.rb =================================================================== --- trunk/server/app/controllers/facts_controller.rb 2010-12-18 02:02:52 UTC (rev 228) +++ trunk/server/app/controllers/facts_controller.rb 2010-12-18 06:49:06 UTC (rev 229) @@ -1,9 +1,19 @@ +require 'intmax' + class FactsController < ApplicationController # GET /facts def index - @facts = Fact.find :all - + # Clients requesting XML get no pagination (all entries) + per_page = Fact.per_page # will_paginate's default value respond_to do |format| + format.html {} + format.xml { per_page = Integer::MAX } + end + + @search = Fact.search(params[:search]) + @facts = @search.paginate(:page => params[:page], :per_page => per_page) + + respond_to do |format| format.html # index.html.erb format.xml { render :xml => @facts } end Modified: trunk/server/app/controllers/originals_controller.rb =================================================================== --- trunk/server/app/controllers/originals_controller.rb 2010-12-18 02:02:52 UTC (rev 228) +++ trunk/server/app/controllers/originals_controller.rb 2010-12-18 06:49:06 UTC (rev 229) @@ -1,9 +1,19 @@ +require 'intmax' + class OriginalsController < ApplicationController # GET /originals def index - @originals = Original.find :all - + # Clients requesting XML get no pagination (all entries) + per_page = Original.per_page # will_paginate's default value respond_to do |format| + format.html {} + format.xml { per_page = Integer::MAX } + end + + @search = Original.search(params[:search]) + @originals = @search.paginate(:page => params[:page], :per_page => per_page) + + respond_to do |format| format.html # index.html.erb format.xml { render :xml => @originals } end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |