umlaut 3.0.0alpha11 → 3.0.0alpha12

data/app/assets/stylesheets/umlaut.css

@@ -854,5 +854,47 @@ body.banner {
 }
 
 	
-  
+/***************
+ *  ADMIN SCREENS
+ *
+ *  Most of admin screen CSS is about _undoing_ general customizations
+ *  umlaut css (or over-eager reset.css we're using, bah) 
+ *  did to all HTML elements, oops. 
+ **************************/
+ 
+.admin {
+ padding: 1em;
+}
+ 
+.admin h1 {
+   margin-top: .67em;
+   margin-bottom: .67em;
+}
+
+.admin h2 {
+  margin-top: 1em;
+  margin-bottom: .5em;
+}
+
+.admin ul {
+  list-style-type: disc;
+  padding-left: 40px;
+}
+
+.admin form {
+  margin-bottom: 1em;
+}
+
+.admin table {
+  margin-top: 2em;
+  border-spacing: 0;
+}
+
+.admin td {
+  padding: 6px 8px;
+}
+
+.admin tr.dispatch_line td {
+    border-top: 1px grey solid;
+}
 

data/app/controllers/admin/service_errors_controller.rb

@@ -0,0 +1,57 @@
+module Admin
+  class ServiceErrorsController < UmlautController
+    # by default, force ssl connection in production env, but can be
+    # config'd. 
+    force_ssl if umlaut_config.lookup!("admin.force_ssl", Rails.env.production? )
+    # Cheesy way to do auth from config single or multiple. Alternately,
+    # you might want to protect at apache level, for instance for shib
+    # or SSO integration
+    if (admin_auth = umlaut_config.lookup!("admin.auth"))
+      before_filter lambda {
+        authenticate_or_request_with_http_basic do |login, password|                    
+          login == admin_auth[:username] && password == admin_auth[:password]
+        end
+      }
+    end
+    
+    
+    def index
+      # grab the earliest dispatch to see how far back our db goes
+      @earliest_dispatch = DispatchedService.select("updated_at").
+        order("updated_at").
+        limit(1).
+        first.
+        updated_at
+      
+      
+      errors_base = DispatchedService.
+        where(:status => [DispatchedService::FailedFatal, DispatchedService::FailedTemporary])
+      
+      if params[:service_id]
+        errors_base = errors_base.where(:service_id => params[:service_id])
+      end
+      
+      if params[:q]
+        errors_base = errors_base.where("exception_info #{" NOT " if params[:q_not]} like ?", "%#{params[:q]}%")
+      end
+      
+      # will miraculously return a hash whose key is service_id, value
+      # is count of failed service dispatches. 
+      @failed_by_service = errors_base.select("service_id").        
+        group("service_id").
+        count
+      
+      # And get the most recent batch of failed services
+      # kaminari page/per
+      @offset = params[:offset].to_i 
+      @limit = params[:per_page].to_i 
+      @limit = 10 if @limit == 0
+      
+      @dispatched_services = errors_base.order("updated_at DESC").
+        limit(@limit).offset(@offset)             
+      @dispatched_services_count = errors_base.count
+    end
+    
+    
+  end  
+end

data/app/controllers/store_controller.rb

@@ -19,8 +19,13 @@ class StoreController < UmlautController
       # And a referrent, no referrer for now, we'll restore it later. 
       referent = Referent.create_by_context_object( stored_co, nil, :permalink => false )
       perm.referent = referent
-      perm.save!
     end
+
+    perm.last_access = Time.now # keep track of when permalink last actually retrieved
+
+    # will catch possible new referent to be saved, as well as
+    # update to last_access
+    perm.save!
     
 
     unless ( referent )

data/app/helpers/umlaut/helper.rb

@@ -25,7 +25,7 @@ module Umlaut::Helper
     if ( params[:params])
       link_to_arg = params[:params]
     else
-      link_params = {:controller=>'resolve'}
+      link_params = {:controller=>'/resolve', :action => "index"}
       link_params.merge!( params[:extra_params] ) if params[:extra_params]
       link_to_arg = url_for_with_co( link_params, context_object )      
     end

data/app/views/admin/service_errors/_dispatched_service.html.erb

@@ -0,0 +1,21 @@
+<tr class="dispatch_line">
+  <td><%= dispatched_service.updated_at.to_s(:short) %></td>
+  <td><%= dispatched_service.service_id %></td>    
+  <td><%= dispatched_service.status %></td>
+  <td><%= link_to "[Re-request live]", url_for_with_co({:controller => "/resolve", :action => :index},  dispatched_service.request.to_context_object) %></td>
+  <td><%= link_to "[View cached request]", url_for(:controller => "/resolve", :action => :index, "umlaut.request_id" => dispatched_service.request_id ) %></td>
+</tr>
+<tr>
+<% if dispatched_service.exception_info %>
+  <td colspan="5">  
+    <%= dispatched_service.exception_info[:class_name] %>: <%= dispatched_service.exception_info[:message] %>
+    <% if dispatched_service.exception_info[:backtrace] %>
+    <ul>
+      <% dispatched_service.exception_info[:backtrace].each do |line| %>
+        <%= simple_format line %>
+      <% end %>
+    </ul>
+    <% end %>
+  </td>
+</tr>
+<% end %>

data/app/views/admin/service_errors/index.html.erb

@@ -0,0 +1,45 @@
+<div class="admin">
+  
+  <h1>Admin: Service Errors Report</h1>
+  
+  <p>Reports on rows in dispatched_services table that have failed status.</p>
+  
+  <ul>
+    <li>Can be caused by uncaught exception in service.</li>
+    <li>Can be caused by service intentionally reporting failure</li>
+    <li>Other kinds of unexpected failure conditions may occur in your app that are not caught here, check logs</li>
+    <li>Only can report on dispatched_services rows that haven't been purged yet. <b>Current oldest record: <%= @earliest_dispatch.to_s(:short) %></b>
+  </ul>
+  
+  <% if params[:service_id] %>
+    <h2>Service: <%= params[:service_id] %></h2>
+    <%= link_to "[View All]", params.merge(:service_id => nil) %>
+  <% else %>
+    <h2>By service</h2>
+    
+    <table>
+    <% @failed_by_service.each_pair do |service_id, count| %>
+      <tr><td><%= link_to service_id, params.merge(:service_id => service_id) %></td><td><%= count %></td></tr>
+    <% end %>
+    </table>
+  <% end %>
+    
+  
+  <h2>Latest</h2>
+  
+  <form>
+    <%= label_tag "q", "Filter on exception_info" %>
+    <%= text_field_tag "q", params[:q] %>
+    <%= check_box_tag 'q_not',"1", params[:q_not] %>
+    <%= label_tag "q_not", "NOT having query term" %>
+    <%= submit_tag "Filter" %>
+  </form>
+  
+  <p>
+  <%= @offset + 1 %> - <%= [@offset + @limit, @dispatched_services_count].min  %> of <%= @dispatched_services_count %>. <%= link_to "[Next]", params.merge("offset" => @offset + @limit ) %>
+  
+  <table>
+  <%= render  :partial => "dispatched_service", :collection => @dispatched_services %>  
+  </table>
+  
+</div>

data/app/views/resolve/_cover_image.html.erb

@@ -5,11 +5,22 @@
 
   # small med and x-large correspond roughly to amazon sm, med and lg. 
   # large corresponds roughly to google medium. Just one dimension to
-  # prevent disproportionate scaling. 
-  dimensions = { "small" => { "height" => 80 },
-                 "medium" => { "height" => 160},
-                 "large" => { "height" => 200 },
-                 "extra-large" => { "height" => 475}}
+  # prevent disproportionate scaling. We use CSS so we can set maximums
+  # in BOTH dimensions but let aspect ratio remain the same. We put it
+  # inline so HTML Snippet API clients get images constrained to reasonable
+  # sizes without extra CSS. IE6 won't do max-height/max-width, sorry IE6, no
+  # way to accomodate you (trying to put a width and a max-width triggers
+  # weird IE8 bugs!). Best we can do.
+  #
+  # generally the 'max-height' is our operative maximum for ordinary ratios,
+  # but we let the width be more than the height for weird ratio'd covers
+  # that are wider than square. 
+  dimensions_style = { 
+            "small"       => "max-height: 80px; max-width: 100px;",
+            "medium"      => "max-height: 160px; max-width: 200px;",
+            "large"       => "max-height: 200px; max-width: 240px;",
+            "extra-large" => "max-height: 475px; max-width: 570px;"
+  }
 
 
 
@@ -27,7 +38,7 @@
         img_params['src'] = url_for(:controller => "resource", :action => "proxy", :id => img_st.id )
       end
       
-      img_params.merge!( dimensions[size]) if fix_size
+      img_params.merge!( "style" => dimensions_style[size]) if fix_size
       
       tag('img', img_params )
       

data/db/migrate/01_umlaut_init.rb

@@ -22,10 +22,11 @@ class UmlautInit < ActiveRecord::Migration
     add_index "dispatched_services", ["request_id", "service_id"], :name => "dptch_request_id"
   
     create_table "permalinks" do |t|
-      t.integer "referent_id",                           :default => 0
-      t.date    "created_on",                                           :null => false
+      t.integer "referent_id",     :default => 0
+      t.date    "created_on",      :null => false
       t.text    "context_obj_serialized"
-      t.string  "orig_rfr_id",            :limit => 256
+      t.string  "orig_rfr_id",     :limit => 256
+      t.date    "last_access"
     end
   
     add_index "permalinks", ["referent_id"], :name => "plink_referent_idx"

data/lib/umlaut/routes.rb

@@ -26,7 +26,8 @@ module Umlaut
     end
 
     def route_sets
-      (@options[:only] || default_route_sets) - (@options[:except] || [])
+      # :admin is not included by default, needs to be turned on. 
+      (@options[:only] || default_route_sets) - (@options[:except] || []) + (@options[:admin] == true ? [:admin] : [])
     end
 
     def default_route_sets
@@ -142,6 +143,14 @@ module Umlaut
           match 'images/spinner.gif' => redirect("/assets/spinner.gif")
         end
       end
+      
+      def admin
+        add_routes do |options|
+          namespace "admin" do
+            match 'service_errors(/:service_id)' => "service_errors#index"
+          end
+        end
+      end
    
     end
     include RouteSets

data/lib/umlaut/version.rb

@@ -1,3 +1,3 @@
 module Umlaut
-  VERSION = "3.0.0alpha11"
+  VERSION = "3.0.0alpha12"
 end

data/test/dummy/config/routes.rb

@@ -1,6 +1,6 @@
 Dummy::Application.routes.draw do
     
-  Umlaut::Routes.new(self).draw
+  Umlaut::Routes.new(self, :admin => true).draw
 
   # The priority is based upon order of creation:
   # first created -> highest priority.

data/test/dummy/db/migrate/{20111228211210_umlaut_init.rb → 20120229192032_umlaut_init.umlaut.rb}

@@ -1,3 +1,4 @@
+# This migration comes from umlaut (originally 1)
 class UmlautInit < ActiveRecord::Migration
   def change    
     create_table "clickthroughs" do |t|
@@ -22,10 +23,11 @@ class UmlautInit < ActiveRecord::Migration
     add_index "dispatched_services", ["request_id", "service_id"], :name => "dptch_request_id"
   
     create_table "permalinks" do |t|
-      t.integer "referent_id",                           :default => 0
-      t.date    "created_on",                                           :null => false
+      t.integer "referent_id",     :default => 0
+      t.date    "created_on",      :null => false
       t.text    "context_obj_serialized"
-      t.string  "orig_rfr_id",            :limit => 256
+      t.string  "orig_rfr_id",     :limit => 256
+      t.date    "last_access"
     end
   
     add_index "permalinks", ["referent_id"], :name => "plink_referent_idx"

data/test/dummy/db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -10,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111228211210) do
+ActiveRecord::Schema.define(:version => 20120229192032) do
 
   create_table "clickthroughs", :force => true do |t|
     t.integer  "request_id",          :default => 0, :null => false
@@ -38,6 +39,7 @@ ActiveRecord::Schema.define(:version => 20111228211210) do
     t.date    "created_on",                                           :null => false
     t.text    "context_obj_serialized"
     t.string  "orig_rfr_id",            :limit => 256
+    t.date    "last_access"
   end
 
   add_index "permalinks", ["referent_id"], :name => "plink_referent_idx"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: umlaut
 version: !ruby/object:Gem::Version
-  version: 3.0.0alpha11
+  version: 3.0.0alpha12
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-28 00:00:00.000000000 Z
+date: 2012-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &240729180 !ruby/object:Gem::Requirement
+  requirement: &77416980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *240729180
+  version_requirements: *77416980
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &240728040 !ruby/object:Gem::Requirement
+  requirement: &77416420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *240728040
+  version_requirements: *77416420
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &240726520 !ruby/object:Gem::Requirement
+  requirement: &77415440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *240726520
+  version_requirements: *77415440
 - !ruby/object:Gem::Dependency
   name: openurl
-  requirement: &240741860 !ruby/object:Gem::Requirement
+  requirement: &77414420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *240741860
+  version_requirements: *77414420
 - !ruby/object:Gem::Dependency
   name: marc
-  requirement: &240735720 !ruby/object:Gem::Requirement
+  requirement: &77413900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *240735720
+  version_requirements: *77413900
 - !ruby/object:Gem::Dependency
   name: isbn
-  requirement: &240765740 !ruby/object:Gem::Requirement
+  requirement: &77413440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *240765740
+  version_requirements: *77413440
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &240763540 !ruby/object:Gem::Requirement
+  requirement: &77412600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *240763540
+  version_requirements: *77412600
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &240773780 !ruby/object:Gem::Requirement
+  requirement: &77412040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *240773780
+  version_requirements: *77412040
 - !ruby/object:Gem::Dependency
   name: confstruct
-  requirement: &240770680 !ruby/object:Gem::Requirement
+  requirement: &77411220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *240770680
+  version_requirements: *77411220
 - !ruby/object:Gem::Dependency
   name: soap4r-ruby1.9
-  requirement: &240815460 !ruby/object:Gem::Requirement
+  requirement: &77410200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *240815460
+  version_requirements: *77410200
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &240834480 !ruby/object:Gem::Requirement
+  requirement: &77425780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *240834480
+  version_requirements: *77425780
 - !ruby/object:Gem::Dependency
   name: ruby-prof
-  requirement: &240831480 !ruby/object:Gem::Requirement
+  requirement: &77425140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *240831480
+  version_requirements: *77425140
 description: 
 email:
 - umlaut-general@rubyforge.org
@@ -164,6 +164,7 @@ files:
 - app/controllers/umlaut/controller_behavior.rb
 - app/controllers/resource_controller.rb
 - app/controllers/resolve_controller.rb
+- app/controllers/admin/service_errors_controller.rb
 - app/controllers/umlaut_controller.rb
 - app/controllers/search_controller.rb
 - app/assets/images/jhu_findit.gif
@@ -265,6 +266,8 @@ files:
 - app/views/umlaut/error.html.erb
 - app/views/umlaut/README
 - app/views/layouts/umlaut.html.erb
+- app/views/admin/service_errors/index.html.erb
+- app/views/admin/service_errors/_dispatched_service.html.erb
 - app/helpers/emailer_helper.rb
 - app/helpers/export_email_helper.rb
 - app/helpers/umlaut/html_head_helper.rb
@@ -356,34 +359,26 @@ files:
 - LICENSE
 - Rakefile
 - README.md
-- ./test/dummy/tmp/cache/assets/DA6/A80/sprockets%2F92e26d8e58d5bcc8b8f6c25d1b05b9c1
 - ./test/dummy/tmp/cache/assets/D16/F90/sprockets%2F5fe3c021048c6f9a6086bed7736d87b1
 - ./test/dummy/tmp/cache/assets/DE8/790/sprockets%2Fd1333bde2b9aafcc712d11dd09ab35d8
 - ./test/dummy/tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
 - ./test/dummy/tmp/cache/assets/D94/FF0/sprockets%2F3b56a1aa77de0d570c38a4a9d5f4b1d6
 - ./test/dummy/tmp/cache/assets/CBD/730/sprockets%2F034c1086748b981c36672d5a56e7fed6
-- ./test/dummy/tmp/cache/assets/DF5/5E0/sprockets%2F8e64a37c73cdc0b37a4ccfcb42ab45d8
 - ./test/dummy/tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
 - ./test/dummy/tmp/cache/assets/E5F/960/sprockets%2Fdc007b6cad5c7ef08e33ec28cfff0ef6
 - ./test/dummy/tmp/cache/assets/D24/360/sprockets%2F6987b047a96dc685ba3cf39b31477f6d
-- ./test/dummy/tmp/cache/assets/D50/A30/sprockets%2F7d8b294ac433db5d056538f8cf7c66b9
 - ./test/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
 - ./test/dummy/tmp/cache/assets/CFE/080/sprockets%2F37fe9f4255baddbd549a659914929398
 - ./test/dummy/tmp/cache/assets/DFD/300/sprockets%2Fabac9489cf7f1db8ef00d72a1571ee1e
-- ./test/dummy/tmp/cache/assets/CD7/DD0/sprockets%2F4f1fe68aa2042a0970bde9b185530646
 - ./test/dummy/tmp/cache/assets/CF7/2B0/sprockets%2F25a7c73655bd3598173b39d9f98bcd46
-- ./test/dummy/tmp/cache/assets/D43/0D0/sprockets%2F682843a8d0795a5fbcfeb2f0c81727d0
-- ./test/dummy/tmp/cache/assets/C80/980/sprockets%2Fc94807409c1523d43e18d25f35d93c41
 - ./test/dummy/tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
 - ./test/dummy/tmp/cache/assets/D6C/7D0/sprockets%2F8a05d6981ec0d38c51739bef0b3a9c2b
 - ./test/dummy/tmp/cache/assets/D37/2B0/sprockets%2F40834fb07d7318c1fddd5003bd9e04f6
-- ./test/dummy/tmp/cache/assets/CD6/300/sprockets%2F397ec39d3d883789effe506c38760368
 - ./test/dummy/tmp/cache/assets/DFC/040/sprockets%2F15ea81cf915c0cb1dfc9cc04c9fef364
 - ./test/dummy/tmp/cache/assets/DF7/960/sprockets%2F99ac6db10b44a64fbba4ee847b35ba8b
 - ./test/dummy/tmp/cache/assets/CBF/B60/sprockets%2F08ca89671549936265dcb673bf02e36f
 - ./test/dummy/tmp/cache/assets/D97/6B0/sprockets%2Fb070e8c799d1a4ad5e62e0a1ae3b83e6
 - ./test/dummy/tmp/cache/assets/CC9/9F0/sprockets%2F306166316e2cafd13c15e62b51a2339d
-- ./test/dummy/tmp/cache/assets/E38/FE0/sprockets%2Fe1fc875efa817cbb94a5d8de25ea4e6b
 - ./test/dummy/tmp/cache/assets/C70/4D0/sprockets%2F034ad2036e623081bd352800786dfe80
 - ./test/dummy/tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
 - ./test/dummy/tmp/cache/assets/C45/A30/sprockets%2F39494895e462697b478d3d0c79298a26
@@ -414,7 +409,6 @@ files:
 - ./test/dummy/public/422.html
 - ./test/dummy/public/favicon.ico
 - ./test/dummy/public/500.html
-- ./test/dummy/config/environments/profile.rb
 - ./test/dummy/config/environments/development.rb
 - ./test/dummy/config/environments/production.rb
 - ./test/dummy/config/environments/test.rb
@@ -434,10 +428,9 @@ files:
 - ./test/dummy/config/primo.yml
 - ./test/dummy/Rakefile
 - ./test/dummy/script/rails
-- ./test/dummy/profile/sfx_collection_prof.rb
 - ./test/dummy/config.ru
 - ./test/dummy/db/schema.rb
-- ./test/dummy/db/migrate/20111228211210_umlaut_init.rb
+- ./test/dummy/db/migrate/20120229192032_umlaut_init.umlaut.rb
 - ./test/performance/browsing_test.rb
 - ./test/unit/aleph_record_benchmarks.rb
 - ./test/unit/aws_product_sign_test.rb
@@ -473,7 +466,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3714515668251157287
+      hash: 2247708829572197569
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -488,34 +481,26 @@ specification_version: 3
 summary: For Libraries, a just-in-time last-mile service aggregator, taking OpenURL
   input
 test_files:
-- ./test/dummy/tmp/cache/assets/DA6/A80/sprockets%2F92e26d8e58d5bcc8b8f6c25d1b05b9c1
 - ./test/dummy/tmp/cache/assets/D16/F90/sprockets%2F5fe3c021048c6f9a6086bed7736d87b1
 - ./test/dummy/tmp/cache/assets/DE8/790/sprockets%2Fd1333bde2b9aafcc712d11dd09ab35d8
 - ./test/dummy/tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
 - ./test/dummy/tmp/cache/assets/D94/FF0/sprockets%2F3b56a1aa77de0d570c38a4a9d5f4b1d6
 - ./test/dummy/tmp/cache/assets/CBD/730/sprockets%2F034c1086748b981c36672d5a56e7fed6
-- ./test/dummy/tmp/cache/assets/DF5/5E0/sprockets%2F8e64a37c73cdc0b37a4ccfcb42ab45d8
 - ./test/dummy/tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
 - ./test/dummy/tmp/cache/assets/E5F/960/sprockets%2Fdc007b6cad5c7ef08e33ec28cfff0ef6
 - ./test/dummy/tmp/cache/assets/D24/360/sprockets%2F6987b047a96dc685ba3cf39b31477f6d
-- ./test/dummy/tmp/cache/assets/D50/A30/sprockets%2F7d8b294ac433db5d056538f8cf7c66b9
 - ./test/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
 - ./test/dummy/tmp/cache/assets/CFE/080/sprockets%2F37fe9f4255baddbd549a659914929398
 - ./test/dummy/tmp/cache/assets/DFD/300/sprockets%2Fabac9489cf7f1db8ef00d72a1571ee1e
-- ./test/dummy/tmp/cache/assets/CD7/DD0/sprockets%2F4f1fe68aa2042a0970bde9b185530646
 - ./test/dummy/tmp/cache/assets/CF7/2B0/sprockets%2F25a7c73655bd3598173b39d9f98bcd46
-- ./test/dummy/tmp/cache/assets/D43/0D0/sprockets%2F682843a8d0795a5fbcfeb2f0c81727d0
-- ./test/dummy/tmp/cache/assets/C80/980/sprockets%2Fc94807409c1523d43e18d25f35d93c41
 - ./test/dummy/tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
 - ./test/dummy/tmp/cache/assets/D6C/7D0/sprockets%2F8a05d6981ec0d38c51739bef0b3a9c2b
 - ./test/dummy/tmp/cache/assets/D37/2B0/sprockets%2F40834fb07d7318c1fddd5003bd9e04f6
-- ./test/dummy/tmp/cache/assets/CD6/300/sprockets%2F397ec39d3d883789effe506c38760368
 - ./test/dummy/tmp/cache/assets/DFC/040/sprockets%2F15ea81cf915c0cb1dfc9cc04c9fef364
 - ./test/dummy/tmp/cache/assets/DF7/960/sprockets%2F99ac6db10b44a64fbba4ee847b35ba8b
 - ./test/dummy/tmp/cache/assets/CBF/B60/sprockets%2F08ca89671549936265dcb673bf02e36f
 - ./test/dummy/tmp/cache/assets/D97/6B0/sprockets%2Fb070e8c799d1a4ad5e62e0a1ae3b83e6
 - ./test/dummy/tmp/cache/assets/CC9/9F0/sprockets%2F306166316e2cafd13c15e62b51a2339d
-- ./test/dummy/tmp/cache/assets/E38/FE0/sprockets%2Fe1fc875efa817cbb94a5d8de25ea4e6b
 - ./test/dummy/tmp/cache/assets/C70/4D0/sprockets%2F034ad2036e623081bd352800786dfe80
 - ./test/dummy/tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
 - ./test/dummy/tmp/cache/assets/C45/A30/sprockets%2F39494895e462697b478d3d0c79298a26
@@ -546,7 +531,6 @@ test_files:
 - ./test/dummy/public/422.html
 - ./test/dummy/public/favicon.ico
 - ./test/dummy/public/500.html
-- ./test/dummy/config/environments/profile.rb
 - ./test/dummy/config/environments/development.rb
 - ./test/dummy/config/environments/production.rb
 - ./test/dummy/config/environments/test.rb
@@ -566,10 +550,9 @@ test_files:
 - ./test/dummy/config/primo.yml
 - ./test/dummy/Rakefile
 - ./test/dummy/script/rails
-- ./test/dummy/profile/sfx_collection_prof.rb
 - ./test/dummy/config.ru
 - ./test/dummy/db/schema.rb
-- ./test/dummy/db/migrate/20111228211210_umlaut_init.rb
+- ./test/dummy/db/migrate/20120229192032_umlaut_init.umlaut.rb
 - ./test/performance/browsing_test.rb
 - ./test/unit/aleph_record_benchmarks.rb
 - ./test/unit/aws_product_sign_test.rb

data/test/dummy/config/environments/profile.rb

@@ -1,24 +0,0 @@
-# Settings specified here will take precedence over those in config/environment.rb
-# The profile environment should match the same settings
-# as the production environment to give a reasonalbe
-# approximation of performance.  However, it should
-# definitely not use the production databse!
-
-
-# Cache classes - otherwise your code
-# will run approximately 5 times slower and the
-# profiling results will be overwhelmed by Rails
-# dependency loading mechanism
-config.cache_classes = true
-
-# Don't check template timestamps - once again this
-# is to avoid IO times overwhelming profile results
-config.action_view.cache_template_loading            = true
-
-# This is debatable, but turn off action controller
-# caching to see how long it really takes to run
-# queries and render templates
-config.action_controller.perform_caching             = false
-
-# Turn off most logging
-config.log_level = :info

data/test/dummy/profile/sfx_collection_prof.rb

@@ -1,22 +0,0 @@
-# Just a hacky script I'm using for trying to examine performance, 
-# run with 'rails runner script_name'
-# Couldn't get it working within test env, sorry. 
-
-params = {"genre" => "article",
-          "issn" => "09237534",
-          "title" => "Annals of Oncology",
-          "volume" => "23",
-          "issue" => "1",
-          "date" => "20120101",
-          "atitle" => "Risk for incident and fatal prostate cancer in men with a family history of any incident and fatal cancer.",
-          "aulast" => "Brandt, A.",
-          "spage" => "251",
-          "sid"  => "EBSCO:Academic Search Complete"
-}
-session = {}
-umlaut_request = Request.create_new_request!(:params => params, :session => session)
-
-
-collection = Collection.new(umlaut_request, services)
-
-