cul_hydra 1.0.0

data/fixtures/spec/FOXML/static-image-aggregator.xml

@@ -0,0 +1,31 @@
+<foxml:digitalObject xmlns:foxml="info:fedora/fedora-system:def/foxml#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1" PID="test:si_agg" xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
+<foxml:objectProperties>
+<foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+<foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE="Untitled"/>
+<foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+</foxml:objectProperties>
+<foxml:datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+<foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/">
+<foxml:xmlContent>
+<oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+<dc:identifier>prd.custord.070103.003</dc:identifier>
+<dc:type>Image</dc:type>
+<dc:title>Untitled</dc:title>
+</oai_dc:dc>
+</foxml:xmlContent>
+</foxml:datastreamVersion>
+</foxml:datastream>
+<foxml:datastream ID="RELS-EXT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+<foxml:datastreamVersion ID="RELS-EXT1.0" LABEL="RDF Statements about this object" MIMETYPE="application/rdf+xml" FORMAT_URI="info:fedora/fedora-system:FedoraRELSExt-1.0">
+<foxml:xmlContent>
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<rdf:Description rdf:about="info:fedora/test:si_agg">
+<type xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" rdf:resource="http://purl.oclc.org/NET/CUL/Aggregator"/>
+<hasModel xmlns="info:fedora/fedora-system:def/model#" rdf:resource="info:fedora/ldpd:StaticImageAggregator"/>
+<memberOf xmlns="http://purl.oclc.org/NET/CUL/" rdf:resource="info:fedora/test:c_agg"/>
+</rdf:Description>
+</rdf:RDF>
+</foxml:xmlContent>
+</foxml:datastreamVersion>
+</foxml:datastream>
+</foxml:digitalObject>

data/fixtures/spec/STRUCTMAP/structmap-examples.xml

@@ -0,0 +1,21 @@
+<mets:structMap TYPE="physical" LABEL="Sides" xmlns:mets="http://www.loc.gov/METS/">
+    <mets:div ORDER="1" LABEL="Recto" CONTENTIDS="rbml_css_0702r" />
+    <mets:div ORDER="2" LABEL="Verso" CONTENTIDS="rbml_css_0702v" />
+</mets:structMap>
+
+<mets:structMap TYPE="logical" LABEL="Sequence" xmlns:mets="http://www.loc.gov/METS/">
+    <mets:div ORDER="1" LABEL="Item 1" CONTENTIDS="prd.custord.060108.001" />
+    <mets:div ORDER="2" LABEL="Item 2" CONTENTIDS="prd.custord.060108.002" />
+    <mets:div ORDER="3" LABEL="Item 3" CONTENTIDS="prd.custord.060108.003" />
+</mets:structMap>
+
+<mets:structMap TYPE="physical" LABEL="Leaves" xmlns:mets="http://www.loc.gov/METS/">
+<mets:div ORDER="1" LABEL="Leaf">
+    <mets:div ORDER="1" LABEL="Recto" CONTENTIDS="rbml_css_0702r" />
+    <mets:div ORDER="2" LABEL="Verso" CONTENTIDS="rbml_css_0702v" />
+</div>
+<mets:div ORDER="2" LABEL="Leaf">
+    <mets:div ORDER="1" LABEL="Recto" CONTENTIDS="rbml_css_0703r" />
+    <mets:div ORDER="2" LABEL="Verso" CONTENTIDS="rbml_css_0703v" />
+</div>
+</mets:structMap>

data/fixtures/spec/STRUCTMAP/structmap-nested.xml

@@ -0,0 +1,10 @@
+<mets:structMap TYPE="http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Filesystem" LABEL="Device" xmlns:mets="http://www.loc.gov/METS/">
+<mets:div ORDER="1" LABEL="Leaf1">
+    <mets:div ORDER="1" LABEL="Recto" CONTENTIDS="rbml_css_0702r" />
+    <mets:div ORDER="2" LABEL="Verso" CONTENTIDS="rbml_css_0702v" />
+</div>
+<mets:div ORDER="2" LABEL="Leaf2">
+    <mets:div ORDER="1" LABEL="Recto" CONTENTIDS="rbml_css_0703r" />
+    <mets:div ORDER="2" LABEL="Verso" CONTENTIDS="rbml_css_0703v" />
+</div>
+</mets:structMap>

data/fixtures/spec/STRUCTMAP/structmap-recto.xml

@@ -0,0 +1,4 @@
+<mets:structMap TYPE="physical" LABEL="Sides" xmlns:mets="http://www.loc.gov/METS/">
+    <mets:div ORDER="1" LABEL="Recto" CONTENTIDS="rbml_css_0702r" />
+    <mets:div ORDER="2" LABEL="Verso" CONTENTIDS="rbml_css_0702v" />
+</mets:structMap>

data/fixtures/spec/STRUCTMAP/structmap-seq.xml

@@ -0,0 +1,5 @@
+<mets:structMap TYPE="logical" LABEL="Sequence" xmlns:mets="http://www.loc.gov/METS/">
+    <mets:div ORDER="1" LABEL="Item 1" CONTENTIDS="prd.custord.060108.001" />
+    <mets:div ORDER="2" LABEL="Item 2" CONTENTIDS="prd.custord.060108.002" />
+    <mets:div ORDER="3" LABEL="Item 3" CONTENTIDS="prd.custord.060108.003" />
+</mets:structMap>

data/fixtures/spec/STRUCTMAP/structmap-unordered-seq.xml

@@ -0,0 +1,5 @@
+<mets:structMap TYPE="logical" LABEL="Sequence" xmlns:mets="http://www.loc.gov/METS/">
+    <mets:div ORDER="2" LABEL="Item 2" CONTENTIDS="prd.custord.060108.002" />
+    <mets:div ORDER="1" LABEL="Item 1" CONTENTIDS="prd.custord.060108.001" />
+    <mets:div ORDER="3" LABEL="Item 3" CONTENTIDS="prd.custord.060108.003" />
+</mets:structMap>

data/lib/cul_hydra.rb

@@ -0,0 +1,20 @@
+require 'hydra/head'
+require 'active_fedora_relsint'
+require 'cul_hydra/solrizer_patch'
+module Cul
+  module Hydra
+    autoload :Controllers, 'cul_hydra/controllers'
+    autoload :Fedora, 'cul_hydra/fedora'
+    autoload :Om, 'cul_hydra/om'
+    autoload :Solrizer, 'cul_hydra/solrizer'
+  end
+end
+
+require "cul_hydra/access_controls_enforcement"
+require "cul_hydra/controllers"
+require "cul_hydra/om"
+require "cul_hydra/indexer"
+require "cul_hydra/risearch_members"
+require "cul_hydra/solrizer"
+require "cul_hydra/version"
+require "cul_hydra/engine" if defined? Rails

data/lib/cul_hydra/access_controls_enforcement.rb

@@ -0,0 +1,53 @@
+module Cul::Hydra::AccessControlsEnforcement
+
+  private
+
+  def build_lucene_query(user_query)
+    q = ""
+    # start query of with user supplied query term
+      q << "_query_:\"{!dismax qf=$qf_dismax pf=$pf_dismax}#{user_query}\""
+
+    # Append the exclusion of Resources
+      q << " AND NOT _query_:\"info\\\\:fedora/ldpd\\\\:Resource\""
+
+    # Append the query responsible for adding the users discovery level
+      permission_types = ["edit","discover","read"]
+      field_queries = []
+      embargo_query = ""
+      permission_types.each do |type|
+        field_queries << "_query_:\"#{type}_access_group_t:public\""
+      end
+
+      unless current_user.nil?
+        # for roles
+        RoleMapper.roles(current_user.login).each do |role|
+          permission_types.each do |type|
+            field_queries << "_query_:\"#{type}_access_group_t:#{role}\""
+          end
+        end
+        # for individual person access
+        permission_types.each do |type|
+          field_queries << "_query_:\"#{type}_access_person_t:#{current_user.login}\""
+        end
+        if current_user.is_being_superuser?(session)
+          permission_types.each do |type|
+            field_queries << "_query_:\"#{type}_access_person_t:[* TO *]\""
+          end
+        end
+
+        # if it is the depositor and it is under embargo, that is ok
+        # otherwise if it not the depositor and it is under embargo, don't show it
+        embargo_query = " OR  ((_query_:\"embargo_release_date_dt:[NOW TO *]\" AND  _query_:\"depositor_t:#{current_user.login}\") AND NOT (NOT _query_:\"depositor_t:#{current_user.login}\" AND _query_:\"embargo_release_date_dt:[NOW TO *]\"))"
+      end
+      
+      # remove anything with an embargo release date in the future  
+#embargo_query = " AND NOT _query_:\"embargo_release_date_dt:[NOW TO *]\"" if embargo_query.blank?
+      field_queries << " NOT _query_:\"embargo_release_date_dt:[NOW TO *]\"" if embargo_query.blank?
+      
+      q << " AND (#{field_queries.join(" OR ")})"
+      q << embargo_query 
+    return q
+  end
+
+
+end

data/lib/cul_hydra/controllers.rb

@@ -0,0 +1,13 @@
+module Cul::Hydra
+  module Controllers
+    autoload :Aggregates, 'cul_hydra/controllers/aggregates'
+    autoload :Catalog, 'cul_hydra/controllers/catalog'
+    autoload :ContentAggregators, 'cul_hydra/controllers/content_aggregators'
+    autoload :Datastreams, 'cul_hydra/controllers/datastreams'
+    autoload :Helpers, 'cul_hydra/controllers/helpers'
+    autoload :Resources, 'cul_hydra/controllers/resources'
+    autoload :StaticImageAggregators, 'cul_hydra/controllers/static_image_aggregators'
+    autoload :Suggestions, 'cul_hydra/controllers/suggestions'
+    autoload :Terms, 'cul_hydra/controllers/terms'
+  end
+end

data/lib/cul_hydra/controllers/aggregates.rb

@@ -0,0 +1,93 @@
+require 'cul_hydra/controllers/aggregator_controller_helper'
+require 'cul_hydra/controllers/helpers/resources_helper_behavior'
+module Cul::Hydra::Controllers
+  module Aggregates
+    extend ActiveSupport::Concern
+    included do
+      include Hydra::AssetsControllerHelper
+      include Cul::Hydra::Controllers::AggregatorControllerHelper
+      include Cul::Hydra::Controllers::Helpers::ResourcesHelperBehavior  
+      include Hydra::RepositoryController  
+      include MediaShelf::ActiveFedoraHelper
+      include Blacklight::SolrHelper
+      before_filter :load_resources, :only=>[:index]
+      prepend_before_filter :sanitize_update_params
+    end
+
+    def index
+
+      if params[:layout] == "false"
+        layout = false
+      end
+      container_uri = "info:fedora/#{params[:asset_id]}"
+      escaped_uri = container_uri.gsub(/(:)/, '\\:')
+      extra_controller_params =  {:q=>"cul_member_of_s:#{escaped_uri}"}
+      @response, @document_list = get_search_results( extra_controller_params )
+      
+        # Including this line so permissions tests can be run against the container
+      @container_response, @document = get_solr_response_for_doc_id(params[:asset_id])
+      
+      render :action=>params[:action], :layout=>layout
+    end
+
+    def load_aggregate
+      if params.has_key? :aggregate_id
+        af_base = ActiveFedora::Base.load_instance(params[:aggregate_id])
+      else
+        af_base = ActiveFedora::Base.load_instance(params[:id])
+      end
+      the_model = ActiveFedora::ContentModel.known_models_for( af_base ).first
+      if the_model.nil? or the_model == ActiveFedora::Base
+        the_model = DcDocument
+      end
+
+      @resource = the_model.load_instance(af_base.pid)
+    end
+  
+    # Creates and Saves a Parent - Child relationship in the Child's RELS-EXT
+    # If container_id is provided:
+    # * the File Asset will use RELS-EXT to assert that it's a part of the specified container
+    # * the method will redirect to the container object's edit view after saving
+    def create
+      if params.has_key?(:aggregate_id)
+        @resource = load_aggregate
+        logger.debug @resource.class
+        logger.debug @resource.datastreams["RELS-EXT"].content
+        logger.debug @resource.to_rels_ext(@resource.pid)
+        if !params[:asset_id].nil?
+          associate_resource_with_container(@resource, params[:asset_id])
+          @resource.save
+          flash[:notice] = "Aggregated #{@resource.pid} under #{params[:asset_id]}."
+        else
+          flash[:notice] = "You must specify a container for the aggregate."
+        end
+      else
+        flash[:notice] = "You must specify a resource to aggregate."
+      end
+    
+      if !params[:asset_id].nil?
+        redirect_params = {:controller=>"aggregates", :id=>params[:asset_id], :action=>:index}
+      end
+    
+      redirect_params ||= {:action=>:index}
+    
+      redirect_to redirect_params
+    end
+  
+    # Common destroy method for all AssetsControllers 
+    def destroy
+      @resource = load_aggregate
+      remove_resource_from_container(@resource, params[:asset_id])
+      @resource.save
+
+      flash[:notice] = "Deleted #{params[:id]} from #{params[:asset_id]}."
+      if !params[:asset_id].nil?
+        redirect_params = {:controller=>"aggregates", :id=>params[:asset_id], :action=>:index}
+      end
+    
+      redirect_params ||= {:action=>:index}
+    
+      redirect_to redirect_params
+    end
+  end
+end

data/lib/cul_hydra/controllers/aggregator_controller_helper.rb

@@ -0,0 +1,27 @@
+require 'active-fedora'
+module Cul::Hydra::Controllers
+module AggregatorControllerHelper
+  def load_fedora_document
+    if params.has_key? :asset_id
+      af_base = ActiveFedora::Base.load_instance(params[:asset_id])
+    else
+      af_base = ActiveFedora::Base.load_instance(params[:id])
+    end
+    the_model = ActiveFedora::ContentModel.known_models_for( af_base ).first
+    if the_model.nil? or the_model == ActiveFedora::Base
+      the_model = DcDocument
+    end
+
+    @document_fedora = af_base.adapt_to the_model
+  end
+  def load_resources
+    @document_fedora ||= load_fedora_document
+    if @document_fedora.is_a? Cul::Hydra::ActiveFedora::Model::Aggregator
+      @resources = @document_fedora.resources
+    else
+      logger.debug "Only aggregators have parts!"
+    end
+    @resources
+  end
+end
+end

data/lib/cul_hydra/controllers/catalog.rb

@@ -0,0 +1,12 @@
+require 'cul_hydra/controllers/aggregator_controller_helper'
+require 'cul_hydra/controllers/helpers/active_fedora_helper_behavior'
+module Cul::Hydra::Controllers
+module Catalog
+  extend ActiveSupport::Concern
+  included do
+    include Cul::Hydra::Controllers::AggregatorControllerHelper
+    include Cul::Hydra::Controllers::Helpers::ActiveFedoraHelperBehavior
+    before_filter :load_resources, :only=>[:show, :edit]
+  end
+end
+end

data/lib/cul_hydra/controllers/content_aggregators.rb

@@ -0,0 +1,81 @@
+require 'cul_hydra/controllers/helpers/resources_helper_behavior'
+module Cul::Hydra::Controllers
+ module ContentAggregators
+  extend ActiveSupport::Concern
+  included do
+    include Hydra::AssetsControllerHelper
+    include Cul::Hydra::Controllers::Helpers::ResourcesHelperBehavior
+    include Hydra::RepositoryController  
+    include MediaShelf::ActiveFedoraHelper
+    include Blacklight::SolrHelper
+    prepend_before_filter :sanitize_update_params
+  end
+  
+  def index
+    if params[:layout] == "false"
+      # action = "index_embedded"
+      layout = false
+    end
+    if !params[:container_id].nil?
+      container_uri = "info:fedora/#{params[:container_id]}"
+      escaped_uri = container_uri.gsub(/(:)/, '\\:')
+      extra_controller_params =  {:q=>"cul_member_of_s:#{escaped_uri}"}
+      @response, @document_list = get_search_results( extra_controller_params )
+      
+      # Including this line so permissions tests can be run against the container
+      @container_response, @document = get_solr_response_for_doc_id(params[:container_id])
+      
+      # Including these lines for backwards compatibility (until we can use Rails3 callbacks)
+      @container =  ActiveFedora::Base.load_instance(params[:container_id])
+      @solr_result = @container.file_objects(:response_format=>:solr)
+    else
+      # @solr_result = ActiveFedora::SolrService.instance.conn.query('has_model_field:info\:fedora/ldpd\:Resource', @search_params)
+      @solr_result = Resource.find_by_solr(:all)
+    end
+    render :action=>params[:action], :layout=>layout
+  end
+  
+  def new
+    @asset = ContentAggregator.new
+    apply_depositor_metadata(@asset)
+    set_collection_type(@asset, params[:content_type])
+    if !params[:container_id].nil?
+      associate_resource_with_container(@asset, params[:container_id])
+    end
+    @asset.save
+    msg = "Created a Content Aggregator with pid #{@asset.pid}. Now it's ready to be edited."
+    flash[:notice]= msg
+  
+    session[:scripts] = params[:combined] == "true"
+    redirect_to url_for(:action=>"edit", :id=>@asset.pid, :new_asset=>true, :controller=>'catalog')
+
+  end
+
+  # Common destroy method for all AssetsControllers 
+  def destroy
+    # The correct implementation, with garbage collection:
+    # if params.has_key?(:container_id)
+    #   container = ActiveFedora::Base.load_instance(params[:container_id]) 
+    #   container.file_objects_remove(params[:id])
+    #   FileAsset.garbage_collect(params[:id])
+    # else
+    
+    # The dirty implementation (leaves relationship in container object, deletes regardless of whether the file object has other containers)
+    ActiveFedora::Base.load_instance(params[:id]).delete 
+    render :text => "Deleted #{params[:id]} from #{params[:container_id]}."
+  end
+  
+  
+  def show
+    @image_agg = ContentAggregator.find(params[:id])
+    if (@image_agg.nil?)
+      logger.warn("No such object: " + params[:id])
+      flash[:notice]= "No such object."
+      redirect_to(:action => 'index', :q => nil , :f => nil)
+    else
+      @id_array = @image_agg.containers(:response_format => :id_array)
+    end
+    render :action=>params[:action], :layout=>(params[:layout]=="false")
+  end
+end
+end

data/lib/cul_hydra/controllers/datastreams.rb

@@ -0,0 +1,145 @@
+require 'cul_hydra/controllers/helpers/application_helper_behavior'
+module Cul::Hydra::Controllers
+  module Datastreams
+  extend ActiveSupport::Concern
+
+  included do
+    include Cul::Hydra::Controllers::Helpers::ApplicationHelperBehavior
+    include Hydra::AssetsControllerHelper
+    include Hydra::AssetsControllerHelper
+    include Hydra::FileAssetsHelper  
+    include Hydra::RepositoryController  
+    include MediaShelf::ActiveFedoraHelper
+    include Blacklight::SolrHelper
+    prepend_before_filter :sanitize_update_params
+  end
+  
+  def index
+    if params[:layout] == "false"
+      # action = "index_embedded"
+      layout = false
+    end
+    unless params[:asset_id].nil?
+      
+      # Including this line so permissions tests can be run against the container
+      @container_response, @document = get_solr_response_for_doc_id(params[:asset_id])
+      
+      # Including these lines for backwards compatibility (until we can use Rails3 callbacks)
+      @container =  ActiveFedora::Base.load_instance(params[:asset_id])
+      @ds = @container.datastreams(params[:id])
+    else
+      # What are we doing here without a containing object?
+      raise "called DatastreamsController#index without containing object"
+    end
+    render :action=>params[:action], :layout=>layout
+  end
+  
+  def new
+    render :partial=>"new", :layout=>false
+  end
+  
+  # Creates and Saves a Datastream to contain the the Uploaded file 
+  def create
+    if params[:asset_id].nil?
+      raise "Cannot created a datastream without a containing object"
+    else
+      @container =  ActiveFedora::Base.load_instance(params[:asset_id])
+    end
+
+    if params[:id].nil?
+      raise "Cannot created a datastream without a datastream id"
+    end
+
+    if params.has_key?(:Filedata)
+      file_name = filename_from_params
+      mime_type = params[:mime_type] || mime_type(file_name)
+      @container.add_file_datastream(posted_file, :dsid=>params[:id], :label=>file_name, :mimeType=>mime_type, :size=>posted_file.size)
+      @container.save
+      # apply_depositor_metadata(@file_asset)
+    
+      flash[:notice] = "The file #{params[:Filename]} has been saved as #{params[:datastream_id]} in <a href=\"#{asset_url(@container.pid)}\">#{@container.pid}</a>."
+            
+      ## Apply any posted file metadata
+      unless params[:asset].nil?
+       # logger.debug("applying submitted file metadata: #{@sanitized_params.inspect}")
+       # apply_file_metadata
+      end
+      # If redirect_params has not been set, use {:action=>:index}
+      logger.debug "Created #{@container.pid}##{params[:datastream_id]}."
+    elsif params.has_key?(:Source)
+      file_name = filename_from_url(params[:Source])
+      mime_type = params[:mime_type] || mime_type(file_name)
+      ds_props = {:dsid=>params[:id], :label=>file_name, :mimeType=>mime_type, :dsLocation=>params[:Source]}
+      @container.add_datastream(ActiveFedora::Datastream.new(ds_props))
+      @container.save
+    
+      flash[:notice] = "#{params[:Source]} has been saved as #{params[:datastream_id]} in <a href=\"#{asset_url(@container.pid)}\">#{@container.pid}</a>."
+    else
+      flash[:notice] = "You must specify a file to upload or a source URL."
+    end
+    
+    unless params[:container_id].nil?
+      redirect_params = {:controller=>"catalog", :id=>params[:asset_id], :action=>:edit}
+    end
+    
+    redirect_params ||= {:action=>:index}
+    
+    redirect_to redirect_params
+  end
+  
+  # Datastream destroy method
+  def destroy
+    @container = ActiveFedora::Base.load_instance(params[:asset_id])
+    @container.datastreams[params[:datastream_id]].delete
+    render :text => "Deleted #{params[:datastream_id]} from #{params[:asset_id]}."
+    # Does the index need to be updated on delete here?
+    @container.save
+  end
+  
+  def update
+    self.create
+  end
+  
+  def show
+    @container = ActiveFedora::Base.find(params[:asset_id])
+    if (@container.nil?)
+      logger.warn("No such fedora object: " + params[:asset_id])
+      flash[:notice]= "No such fedora object."
+      redirect_to(:action => 'index', :q => nil , :f => nil)
+      return
+    else
+      # get array of parent (container) objects for this FileAsset
+      @downloadable = false
+      # A FileAsset is downloadable iff the user has read or higher access to a parent
+      @response, @document = get_solr_response_for_doc_id(params[:asset_id])
+      if reader?
+        @downloadable = true
+      end
+
+      if @downloadable
+        if @container.datastreams_in_memory.include?(params[:id])
+          ds = @container.datastreams_in_memory[params[:id]]
+          opts = {:filename => ds.label}
+          if params[:mime_type].nil?
+            opts[:type] = ds.attributes["mimeType"]
+          else
+            opts[:type] = params[:mime_type]
+          end
+          if params[:disposition].nil?
+            opts[:disposition] = "attachment"
+          else
+            opts[:disposition] = params[:disposition]
+          end
+          logger.debug opts.inspect
+          send_data ds.content, opts
+          return
+        end
+      else
+        flash[:notice]= "You do not have sufficient access privileges to download this document, which has been marked private."
+        redirect_to(:action => 'index', :q => nil , :f => nil)
+        return
+      end
+    end
+  end
+end
+end