merging blacklight update to 2.4

Author: flyingzumwalt

.gitignore

@@ -9,6 +9,9 @@ nohup.out
 coverage.data
 coverage/*
 
+public/plugin_assets
+public/plugin_assets/**/*
+
 tmp/**/*
 tmp/performance 
 

CHANGELOG.txt

@@ -0,0 +1,14 @@
+0.0.0 2010-03-30
+
+Upgraded to Blacklight 2.4 using a git subtree
+
+== Notes
+
+lost support for switching indexes at query time 
+forced to edit Blacklight's routes.rb to expose catalog/{id}/edit 
+* setting the edit_catalog_path separately failed
+
+
+#	modified:   vendor/plugins/blacklight/lib/blacklight.rb
+## this includes a hack to smooth over the usage of Blacklight.solr_config, but SHOULD BE REPLACED
+#	modified:   vendor/plugins/blacklight/lib/blacklight/routes.rb

README.textile

@@ -1,3 +1,70 @@
 h1. Hydrangea
 
-Hydrangea is the first general-purpose Hydra app.  It's built on "Blacklight":http://projectblacklight.org, "ActiveFedora":http://yourmediashelf.com/activefedora and "Ruby on Rails":http://rubyonrails.org
+Hydrangea is the first general-purpose Hydra app.  It's built on "Blacklight":http://projectblacklight.org, "ActiveFedora":http://yourmediashelf.com/activefedora and "Ruby on Rails":http://rubyonrails.org
+
+h2. Basic installation & Running RSpec tests
+
+This is based on Matt Zumwalt's "Hydra Stack: Getting Started"http://docs.google.com/View?id=ddrmhvjh_181gj9b7rcv notes from LibDevConX in March 2010.
+
+Clone the git repository from github and pull the copy of jetty
+
+<pre>
+git clone git://github.com/mediashelf/hydrangea.git
+cd hydrangea
+git submodule init
+git submodule update
+</pre>
+
+This will pull all of the code.  The 'git submodule update' command is pulling a copy of hydra-jetty into the jetty directory within hydrangea.
+
+You are now in your working copy of hydrangea.  Use rake to install the gem dependencies (this might not work perfectly - we're still preparing this code for distribution).
+
+<pre>
+rake gems:install
+</pre>
+
+Run your database migrations (only need to do this once after cloning the git repository).
+<pre>
+rake db:migrate
+</pre>
+
+Now run the bundled copy of Jetty, which has Fedora and Solr installed & configured to work with Hydra.
+
+<pre>
+cd jetty 
+java -jar start.jar
+</pre>
+
+... leave that running and open a new terminal window.  cd to wherever you checked out hydrangea 
+
+Run the Rspec tests to make sure everything is working properly.
+<pre>
+cd hydrangea
+rake hydra:import_fixture pid="druid:tj532xx3843"
+rake spec
+</pre>
+
+Now run the rails lighttpd server
+
+<pre>
+script/server
+</pre>
+
+If all goes well, you will be able to see an empty copy of hydrangea at http://localhost:3000
+
+
+
+h2. To get cucumber features to pass
+
+You must ingest two more fixtures:
+
+<pre>
+  rake hydra:import_fixture pid=druid:sb733gr4073
+  rake hydra:import_fixture pid=druid:bz425fy5289
+</pre>
+
+Then run your tests.
+
+<pre>
+  rake cucumber
+</pre>

app/controllers/catalog_controller.rb

@@ -24,7 +24,7 @@ def edit
   def index
       @extra_controller_params ||= {}
       enforce_search_permissions
-      @response = get_search_results( @extra_controller_params )
+      (@response, @document_list) = get_search_results( @extra_controller_params )
       @filters = params[:f] || []
     respond_to do |format|
       format.html { save_current_search_params }
@@ -100,11 +100,21 @@ def enforce_edit_permissions
   end
 
 
-  def get_search_results(extra_controller_params={})
-    _search_params = self.solr_search_params(extra_controller_params)
-    index = _search_params[:qt] == 'fulltext' ? :fulltext : :default
-    Blacklight.solr(index).find(_search_params)
-  end
+  # 
+  ### This was how get_search_results in SALT deals with switching solr instances
+  #
+  # def get_search_results(extra_controller_params={})
+  #   _search_params = self.solr_search_params(extra_controller_params)
+  #   index = _search_params[:qt] == 'fulltext' ? :fulltext : :default
+  #   
+  #   document_list = solr_response.docs.collect {|doc| SolrDocument.new(doc)}
+  #   
+  #   Blacklight.solr(index).find(_search_params)
+  #   
+  #   return [solr_response, document_list]
+  #   
+  # end
+  
 
   # This method will remove certain params from the session[:search] hash
   # if the values are blank? (nil or empty string)

config/initializers/blacklight_config.rb

@@ -0,0 +1,23 @@
+require 'active-fedora'
+#
+# Misc Config for SALT Application
+#
+
+
+# This initializes ActiveFedora with config info from RAOLS_ROOT/lib/fedora.yml
+# Among other things, it allows you to access Fedora and Solr (ActiveFedora's copy) as ActiveFedora.fedora and ActiveFedora.solr
+ENABLE_SOLR_UPDATES=false
+ActiveFedora.init
+
+#
+# Loads EAD descriptors 
+# Attempts to parse any xml files in lib/stanford/ead/
+#
+# You can access any of the loaded descriptors using Descriptor.retrieve( id ), where "id" is the base filename of the descriptor xml file
+
+# puts "Registering EADs..."
+# Dir[File.join( RAILS_ROOT, 'lib', "stanford", "ead", "/*.xml" )].each do |f| 
+#   puts "... EAD id #{File.basename(f, ".xml")}"
+#   Descriptor.register( File.basename(f, ".xml") ) 
+# end
+

features/edit_document.feature

@@ -8,7 +8,6 @@ Feature: Edit a document
     Given I am logged in as "francis" on the edit document page for druid:sb733gr4073     
     Then the "Date:" inline date edit should contain "1991-00-00"
     And the "Type:" dropdown edit should contain "Paper document"
-    And the "Stories:" inline textarea edit should be empty
     ## Commented out next line b/c the title is not displaying properly due to a bug in the sample data on the testing image.
     # And the "Title:" inline edit should contain "Letter from Ellie Engelmore to Wemara Lichty"
 

features/facet_more_less_links.feature

@@ -1,4 +1,7 @@
-@facets
+@facets @wip
+# Marked @wip until we are able to load solr fixtures.  
+# Currently failing with jetty index because there aren't enough technology facet values in the jetty index to trigger rendering of more/less feature
+# This test will pass with the full SALT sample dataset (from SALT disk image)
 Feature: display more/less links
   As a user
   In order to hide facets when there are more than the configurable amount

lib/tasks/hydra.rake

@@ -2,7 +2,7 @@
 
 namespace :hydra do
 
-  desc "Export the object identified by pid into spec/fixtures"
+  desc "Export the object identified by pid into spec/fixtures. Example:rake hydra:harvest_fixture pid=druid:sb733gr4073 source=http://fedoraAdmin:[email protected]:8080/fedora"
   task :harvest_fixture => :environment do
 
     # If a source url has been provided, attampt to export from the fedora repository there.

public/plugin_assets/README

@@ -96,7 +96,7 @@ th, td {border: 0;}
 #documents #results_label {margin-left: 5px;}
 
 /* Result List (http://www.quirksmode.org/css/clearing.html) */
-h3.index_title {clear: both; margin: 0px; padding: 0px; width: 650px;}
+h3.index_title {clear: both; margin: 0px; padding: 0px; width: 460px;}
 
 dl {margin: 0px; padding: 0px;}
 dl.defList {overflow: auto; padding: 0.5em 0;}
@@ -105,6 +105,12 @@ dl.defList dd {text-align: left; margin: 0; padding: 2px 0;}
 
 /* Individual Result Listing */
 #document h1 {margin: 0px; padding: 0px 0px 1em 0px;}
+#marc_view {padding:5px;}
+#marc_view .ind1, #marc_view .ind2 {padding:0 5px; display:inline;}
+#marc_view .tag_ind {float:left;}
+#marc_view .subfields {padding-left:5em;}
+#marc_view .field {clear:both; border-bottom:1px solid #CCCCCC;}
+#librarian_view{top:10%;left:-17%;text-align:left;width:700px;} /* Lightbox element */
 
 /* FORMS */
 form div.row label {float:left; width:120px; text-align:right; margin-right: .5em;}

public/plugin_assets/blacklight/images/bg.png

@@ -48,7 +48,7 @@
         @private_document.save
 
         @public_only_results = Blacklight.solr.find Hash[:phrases=>{:access_t=>"public"}]
-        @priavte_only_results = Blacklight.solr.find Hash[:phrases=>{:access_t=>"private"}]
+        @private_only_results = Blacklight.solr.find Hash[:phrases=>{:access_t=>"private"}]
 
       end
       after(:all) do
@@ -61,17 +61,13 @@
       it "should only return public documents if role does not have permissions" do
         request.env["WEBAUTH_USER"]="Mr. Notallowed"
         get :index
-        # assigns["response"].docs.should include(@public_only_results.first)
-        # assigns["response"].docs.should_not include(@priavte_only_results.first)
-
-        assigns["response"].docs.count.should == @public_only_results.docs.count
-        #assigns["response"].should == @public_only_results
+        assigns("response").docs.count.should == @public_only_results.docs.count
       end
       it "should return all documents if role does have permissions" do
         request.env["WEBAUTH_USER"]="francis"
         get :index
         # assigns["response"].docs.should include(@public_only_results.first)
-        # assigns["response"].docs.should include(@priavte_only_results.first)
+        # assigns["response"].docs.should include(@private_only_results.first)
         assigns["response"].docs.count.should > @public_only_results.docs.count
       end
     end