You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by eh...@apache.org on 2007/03/21 03:27:05 UTC
svn commit: r520719 - in /lucene/solr/trunk/client/ruby/flare:
app/controllers/application.rb app/controllers/browse_controller.rb
app/views/browse/index.rhtml lib/flare_context.rb
Author: ehatcher
Date: Tue Mar 20 19:27:05 2007
New Revision: 520719
URL: http://svn.apache.org/viewvc?view=rev&rev=520719
Log:
Take advantage of flare as a plugin, removing code that is now in the plugin
Removed:
lucene/solr/trunk/client/ruby/flare/lib/flare_context.rb
Modified:
lucene/solr/trunk/client/ruby/flare/app/controllers/application.rb
lucene/solr/trunk/client/ruby/flare/app/controllers/browse_controller.rb
lucene/solr/trunk/client/ruby/flare/app/views/browse/index.rhtml
Modified: lucene/solr/trunk/client/ruby/flare/app/controllers/application.rb
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/flare/app/controllers/application.rb?view=diff&rev=520719&r1=520718&r2=520719
==============================================================================
--- lucene/solr/trunk/client/ruby/flare/app/controllers/application.rb (original)
+++ lucene/solr/trunk/client/ruby/flare/app/controllers/application.rb Tue Mar 20 19:27:05 2007
@@ -24,7 +24,7 @@
def flare_before
session[:page] ||= 1
- session[:flare_context] ||= FlareContext.new(SOLR_CONFIG)
+ session[:flare_context] ||= Flare::Context.new(SOLR_CONFIG)
@flare = session[:flare_context]
end
Modified: lucene/solr/trunk/client/ruby/flare/app/controllers/browse_controller.rb
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/flare/app/controllers/browse_controller.rb?view=diff&rev=520719&r1=520718&r2=520719
==============================================================================
--- lucene/solr/trunk/client/ruby/flare/app/controllers/browse_controller.rb (original)
+++ lucene/solr/trunk/client/ruby/flare/app/controllers/browse_controller.rb Tue Mar 20 19:27:05 2007
@@ -1,129 +1,15 @@
-# Copyright:: Copyright (c) 2007 Apache Software Foundation
-# License:: Apache Version 2.0 (see http://www.apache.org/licenses/)
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
class BrowseController < ApplicationController
- # def self.flare(options={})
- # define_method() do
- # end
- # end
- #
- # flare do |f|
- # f.facet_fields = []
- # end
-
- def index
- session[:page] = params[:page].to_i if params[:page]
- session[:page] = 1 if session[:page] <= 0
-
- @results_per_page = 25
-
- @start = (session[:page] - 1) * @results_per_page
-
- @response = @flare.search(@start, @results_per_page)
- end
-
- def facet
- puts "---- facet: #{params[:field]}"
- @facets = @flare.retrieve_field_facets(params[:field])
- end
-
- def auto_complete_for_search_query
- # TODO instead of "text", default to the default search field configured in schema.xml
- @values = @flare.retrieve_field_facets("text", 5, params['search']['query'].downcase)
-
- render :partial => 'suggest'
- end
-
-
- def add_query
- @flare.queries << {:query => params[:search][:query]}
- session[:page] = 1
- redirect_to :action => 'index'
- end
-
- def update_query
- logger.debug "update_query: #{params.inspect}"
- @flare.queries[params[:index].to_i][:query] = params[:value]
- session[:page] = 1
- render :update do |page|
- page.redirect_to '/browse'
- end
- end
-
- def invert_query
- q = @flare.queries[params[:index].to_i]
- q[:negative] = !q[:negative]
- session[:page] = 1
- redirect_to :action => 'index'
- end
-
- def remove_query
- @flare.queries.delete_at(params[:index].to_i)
- session[:page] = 1
- redirect_to :action => 'index'
- end
-
- def invert_filter
- f = @flare.filters[params[:index].to_i]
- f[:negative] = !f[:negative]
- session[:page] = 1
- redirect_to :action => 'index'
- end
-
- def remove_filter
- @flare.filters.delete_at(params[:index].to_i)
- session[:page] = 1
- redirect_to :action => 'index'
- end
-
- def add_filter
- @flare.filters << {:field => params[:field], :value => params[:value], :negative => (params[:negative] ? true : false)}
- session[:page] = 1
- redirect_to :action => 'index'
- end
-
- def add_saved_search
- @flare.applied_facet_queries << {:name => params[:name], :negative => (params[:negative] ? true : false)}
- redirect_to :action => 'index'
- end
-
- def remove_saved_constraint
- @flare.applied_facet_queries.delete_at(params[:index].to_i)
- session[:page] = 1
- redirect_to :action => 'index'
- end
-
- def clear
- @flare.clear
- redirect_to :action => 'index'
- end
-
- def show_saved
- query = @flare.facet_queries[params[:name]]
- @flare.applied_facet_queries << {:name => params[:name], :negative => (params[:negative] ? true : false)}
- index
- render :action => 'index'
- end
-
- def save
- @flare.facet_queries[params[:name]] = {:filters => @flare.filters.clone, :queries => @flare.queries.clone}
- redirect_to :action => 'index'
- end
-
- def remove_saved_search
- puts "---- BEFORE", @flare.to_s
- @flare.facet_queries.delete(params[:name])
- @flare.applied_facet_queries.delete_if {|f| params[:name] == f[:name]}
- puts "---- AFTER", @flare.to_s
- session[:page] = 1
- redirect_to :action => 'index'
- end
-
- def invert_saved_constraint
- f = @flare.applied_facet_queries[params[:index].to_i]
- f[:negative] = !f[:negative]
- session[:page] = 1
- redirect_to :action => 'index'
- end
-
+ flare
end
Modified: lucene/solr/trunk/client/ruby/flare/app/views/browse/index.rhtml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/flare/app/views/browse/index.rhtml?view=diff&rev=520719&r1=520718&r2=520719
==============================================================================
--- lucene/solr/trunk/client/ruby/flare/app/views/browse/index.rhtml (original)
+++ lucene/solr/trunk/client/ruby/flare/app/views/browse/index.rhtml Tue Mar 20 19:27:05 2007
@@ -89,6 +89,10 @@
</div>
+<% if @flare.empty_constraints? %>
+click click click
+<% else %>
+
<div class="resultsheader">Results <strong><%=[@start + 1,@response.total_hits].min%>-<%=[@response.total_hits,@results_per_page + @start].min%></strong> of <strong><%=@response.total_hits%></strong></div>
<div id="results"><table cellpadding="10">
@@ -100,3 +104,4 @@
<div class="resultsheader"><%=link_to_if session[:page] != 1, "<<", :page => session[:page] - 1%> Results <strong><%=[@start + 1,@response.total_hits].min%>-<%=[@response.total_hits,@results_per_page + @start].min%></strong> of <strong><%=@response.total_hits%></strong><%=link_to_if session[:page] < (@response.total_hits.to_f / @results_per_page).ceil, ">>", :page => session[:page] + 1%></div>
+<% end %>
\ No newline at end of file