umlaut 3.0.0alpha10 → 3.0.0alpha11

data/app/models/collection.rb

@@ -18,7 +18,13 @@ class Collection
   # configs
   attr_accessor :response_expire_interval, :response_expire_crontab_format, :background_service_timeout, :requeue_failedtemporary_services
   
-   
+  # a_umlaut_request is an UmlautRequest, representing a request for services for a context
+  # object. 
+  # service_hash is a hash of hashes with service definitions, as would 
+  # be in services.yml
+  # config is a Confstruct::Configuration associated with the current controller,
+  # has a few config options in it relevant to collection service exec; but
+  # don't pass in, we'll use a blank one with default values, no prob. 
   def initialize(a_umlaut_request, service_hash, config = Confstruct::Configuration.new)    
     self.umlaut_request = a_umlaut_request
     

data/app/models/referent.rb

@@ -1,95 +1,29 @@
+# Note: There are a few actual attributes stored as Columns in referent --
+# these were originally used for identifying a Referent identifying the
+# 'same thing' as an incoming OpenURL, to re-use it. But we don't re-use
+# cached referents anymore. So these attributes are NOT USED -- actual
+# values are over in ReferentValues. But the attributes are left for now
+# (and set) merely for making it easier to eyeball the database by hand:
+# atitle, title, issn, isbn, volume, year. (why no issue/page number? hell
+# if i know). 
 class Referent < ActiveRecord::Base
   # for shortcut metadata manipulations
   include MetadataHelper
   
-  # Shortcuts are really used as retrieval keys to 'shortcut' matching
-  # referent. They hold normalized value (use ReferentValue.normalize) or
-  # empty string. Never nil. 
-  @@shortcut_attributes = [:atitle, :title, :issn, :isbn, :volume, :year]
+
   has_many :requests
   has_many :referent_values
   has_many :permalinks
 
-  def before_validation_on_create
-    # shortcuts initialize to empty string, they should never be null.
-    @@shortcut_attributes.each do |key|
-      self[key] = "" if self[key].nil?
-    end
-  end
-  
-  # When provided an OpenURL::ContextObject, it will return a Referent object
-  # (if one exists). At least that's the intent. 
-  #This turns out to be a really
-  # tricky task, identifying when two citations that may not match exactly
-  # are the same citation. So this doesn't really work well--we err
-  # on the side of missing existing matches, better than finding
-  # a false match. So there are seldom matches found. A particular
-  # problem is that when the Referent is enhanced by a service,
-  # it will no longer match _itself_ as it came in! Oh well. 
-  def self.find_by_context_object(co)
-    
-    rft = co.referent
-
-        
-    # Try to find for re-use by special indexed shortcut values. Create hash
-    # of shortcuts. 
-    
-    # Preload values as empty, even if they aren't found in our
-    # incoming referent--we want to find a match with them empty too, then! 
-    shortcuts = {:atitle=>"", :title=>"", :issn=>"", :isbn=>"", :volume=>"", :year=>""}
-    
-    # Special handling of title
-    incoming_title = rft.metadata['jtitle'] || rft.metadata['btitle'] || rft.metadata['title']
-    # DC OpenURL is an array, not a single value. Grr. 
-    incoming_title = incoming_title[0] if incoming_title.kind_of?(Array)
-    shortcuts[:title] = ReferentValue.normalize(incoming_title) if incoming_title
-    # Special handling of date/year, since we use year instead of date for
-    # stored shortcut. 
-    # I don't know why.
-    shortcuts[:year] = rft.metadata['date'] if rft.metadata['date']
-
-    # Other four. 
-    [:atitle, :issn, :isbn, :volume].each do |att|
-      shortcuts[att] = ReferentValue.normalize( rft.metadata[att.to_s]) if rft.metadata[ att.to_s ]
-    end
-    # Don't look up by shortcuts if they're ALL blank. That doesn't do us well.
-    found_rft = nil
-    found_rft = Referent.find(:first, :conditions => shortcuts) if  shortcuts.values.find {|v| ! v.empty?}
-    if ( found_rft && found_rft.metadata_intersects?( rft ) )
-      return found_rft
-    end
-    
-    # found nothing?
-    return nil
-  end
-
-  # When provided an OpenURL::ContextObject, it will return a Referent object
-  # (creating one if doesn't already exist)  . At least that's the idea.
-  # But see caveats at #find_by_context_object . Most of the time
-  # this ends up creating a new Referent.
-  # pass in referrer for source-specific referent munging. 
-  def self.find_or_create_by_context_object(co)
-    # Okay, we need to do some pre-processing on weird context objects
-    # sent by, for example, firstSearch.
-    self.clean_up_context_object(co)
-    
-    if rft = Referent.find_by_context_object(co) 
-      return rft
-    else
-      rft = Referent.create_by_context_object(co)
-      return rft
-    end
-  end
-
   # Does call save! on referent created.
   # :permalink => false if you already have a permalink and don't
   # need to create one. Caller should attach that permalink to this referent!
   def self.create_by_context_object(co, options = {})    
     options = { :permalink => UmlautController.umlaut_config.create_permalinks    
     }.merge(options)
-    
-    
+        
     self.clean_up_context_object(co)    
+    
     rft = Referent.new
 
     # Wrap everything in a transaction for better efficiency, at least

data/app/models/request.rb

@@ -62,7 +62,7 @@ class Request < ActiveRecord::Base
     # Okay, if we found a req, it might NOT have a referent, it might
     # have been purged. If so, create a new one.
     if ( req && ! req.referent )
-      req.referent = Referent.find_or_create_by_context_object(context_object, req.referrer)
+      req.referent = Referent.create_by_context_object(context_object)
     end
 
     unless (req || options[:allow_create] == false)
@@ -367,7 +367,7 @@ class Request < ActiveRecord::Base
    
     # No id given, or no object found? Create it. 
     unless (rft )
-      rft = Referent.find_or_create_by_context_object(context_object)
+      rft = Referent.create_by_context_object(context_object)
     end
 
     # Create the Request

data/app/models/service_store.rb

@@ -29,6 +29,10 @@ class ServiceStore
       config.each_pair do |group_name, group|
         @@service_definitions.merge!(  group["services"]  ) if group["services"]
       end
+      # set service_id key in each based on hash key
+      @@service_definitions.each_pair do |key, hash|
+        hash["service_id"] =  key
+      end
     end
     return @@service_definitions
   end

data/app/models/service_wave.rb

@@ -42,7 +42,7 @@ class ServiceWave
     return if (@services.nil? || @services.empty?)
 
     bundle_start = Time.now
-    Rails.logger.info(TermColor.color("Umlaut: Launching service wave #{@priority_level}", :yellow) + ", request #{request.id}") if @log_timing
+    Rails.logger.info(TermColor.color("Umlaut: Launching service wave #{@priority_level} #{'(non-threaded)' unless config.lookup!("threaded_service_wave", true) }", :yellow) + ", request #{request.id}") if @log_timing
 
     
     

data/lib/section_renderer.rb

@@ -388,11 +388,7 @@ class SectionRenderer
       when true, false
         @options[:visibility]
       when :any_services
-        # do any services exist which even potentially generate our types, even
-        # if they've completed without doing so?. 
-        nil != @umlaut_request.dispatched_services.to_a.find do |ds|
-          ! (service_type_values & ds.service.service_types_generated ).empty? 
-        end
+        any_services?
       when :in_progress
         # Do we have any of our types generated, or any services in progress
         # that might generate them?
@@ -408,6 +404,14 @@ class SectionRenderer
       else true        
     end
   end
+  
+  # do any services exist which even potentially generate our types, even
+  # if they've completed without doing so?.         
+  def any_services?
+    nil != @umlaut_request.dispatched_services.to_a.find do |ds|
+        ! (service_type_values & ds.service.service_types_generated ).empty? 
+    end
+  end
 
   def list_visible_limit
     @options[:list_visible_limit]

data/lib/service.rb

@@ -43,7 +43,6 @@ class Service
 
   
   def initialize(config)
-    
     config.each do | key, val |
       self.instance_variable_set(('@'+key).to_sym, val)
     end
@@ -179,67 +178,6 @@ class Service
     return @session_id
   end
 
-  # FakeSession little placeholder class we'll use in self.session to trick
-  # out Rails.
-  class FakeSession
-    attr_accessor :session_id  
-    def initialize(a_session_id)
-      self.session_id = a_session_id
-    end
-    def new_session
-      return self.session_id
-    end
-  end
-  # Returns a read-only version of the session hash. Lazy loaded. 
-  # See #update_session for making changes. Will have to be fixed
-  # for Rails 2.3.
-  def session    
-    #lazy load
-    unless (@session_data || session_id.blank? )           
-      # Craziness to restore a session in Rails pre 2.2. Will definitely
-      # need to be changed for Rails 2.3
-      
-      fake_cgi_session = FakeSession.new(session_id)
-  
-      @session_store_obj = 
-          ActionController::Base.session_store.new(fake_cgi_session)
-      @_session_data = @session_store_obj.restore
-      # modifications here are not going to be automatically stored,
-      # so don't do them. See #update_session instead. 
-      @session_data = @_session_data.clone
-      @session_data.freeze
-    end
-    if ( session_id.blank? && @session_data.nil?)
-      raise Exception.new("No session_id is available, therefore no session is available.")
-    end
-    return @session_data
-  end
-
-  
-  # If we just allowed changes to our session hash, and rewrote it to
-  # the store, we'd get a race condition where we could over-write another
-  # service's changes. Rails itself is actually subject to that too.
-  # So, you tell us exactly which values you want to update, we'll
-  # refetch a fresh session, and save it with your changes.
-  #
-  # We're not actually guarding against the race condition, just
-  # fetching and storing quickly and hoping to miss it. FIXME.
-  #
-  # example: update_session( :new_value => "foo", :other => "bar")
-  #
-  # Will have to be fixed for Rails 2.3.
-  def update_session(new_values)
-    # force a new fetch
-    @session = nil
-    session
-    #and update that guy, with our mutable version
-    @_session_data.merge!(new_values)
-    @session_store_obj.close
-    # and update our cached copy to have the changes. 
-    @session_data = @_session_data.clone
-    @session_data.freeze
-  end
-
  # This method is called by Umlaut when user clicks on a service response. 
  # Default implementation here just returns response['url']. You can
  # over-ride in a sub-class to provide custom implementation of on-demand

data/lib/service_adaptors/isi.rb

@@ -9,7 +9,7 @@
 # 
 # You need to register for the  the Thomson 'Links Article Match Retrieval'
 # (LAMR) service api, which is used here. To register, see:
-# http://isiwebofknowledge.com/products_tools/products/related/trlinks/.
+# http://wokinfo.com/products_tools/products/related/amr/
 #
 # You register by IP address, so no API key is needed once your registration
 # goes through. 

data/lib/service_adaptors/jcr.rb

@@ -10,7 +10,7 @@
 # You need to register for the  the Thomson 'Links Article Match Retrieval'
 # (LAMR) service api, which is used here (and also in the Isi plugin). To
 # register, see:
-# http://isiwebofknowledge.com/products_tools/products/related/trlinks/.
+# http://wokinfo.com/products_tools/products/related/amr/
 #
 # You register by IP address, so no API key is needed once your registration
 # goes through. 

data/lib/umlaut/version.rb

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

data/lib/umlaut_configurable.rb

@@ -349,6 +349,7 @@ module UmlautConfigurable
         # custom visibility, show it for item-level cites,
         # or if we actually have some
         visibility(  lambda do |renderer|
+                        renderer.any_services? &&
                         (! renderer.request.title_level_citation?) ||
                         (! renderer.responses_empty?)
                       end )

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

@@ -0,0 +1,24 @@
+# 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/config/primo.yml

@@ -0,0 +1,271 @@
+libraries:
+  "BAFC": "NYU Bobst Avery Fisher Center"
+  "BARCH": "NYU Bobst University Archives"
+  "BCHIL": "NYU Bobst Children's Literature"
+  "BFALE": "NYU Bobst Fales"
+  "BHS": "Brooklyn Historical Society"
+  "BLCC": "NYU Bobst Library"
+  "BOBST": "NYU Bobst"
+  "BREF": "NYU Bobst Reference"
+  "BREF6": "NYU Bobst 6th Floor Reference"
+  "BTAM": "NYU Bobst Tamiment/Wagner Archives"
+  "BWEB": "NYU Restricted Internet"
+  "CARCH": "Cooper Union Archives"
+  "CCLOS": "Cooper Union Closed Stacks"
+  "CGEN": "Cooper Union General"
+  "CMEZZ": "Cooper Union Mezzanine"
+  "CMICRO": "Cooper Union Microform"
+  "COUR": "NYU Courant"
+  "CPER": "Cooper Union Periodicals"
+  "CREF": "Cooper Union Reference"
+  "CRES": "Cooper Union Reserves"
+  "CU": "Cooper Union"
+  "CWEB": "Cooper Union Restricted Internet Resources"
+  "IFA": "NYU Inst Fine Arts"
+  "IFAC": "NYU Inst Fine Arts Conservation"
+  "ISAW": "NYU Inst Study Ancient World"
+  "KEV": "NYU Kevorkian"
+  "LAPI": "NYU La Pietra (Italy)"
+  "NABUD": "NYU Abu Dhabi Library (UAE)"
+  "NOFFS": "NYU Offsite Storage"
+  "NSFO": "New School Fogelman Library"
+  "NSGI": "New School Gimbel Library"
+  "NSKE": "New School Kellen Archives Library"
+  "NSOS": "New School Offsite Storage"
+  "NSSC": "New School Scherman Library"
+  "NYHS": "New-York Historical Society"
+  "NYHSBR": "NYHS Broadsides"
+  "NYHSLAN": "NYHS Landauer"
+  "NYHSM": "New-York Historical Society"
+  "NYHSMAPS": "NYHS Maps"
+  "NYHSMSS": "NYHS Mss Collection"
+  "NYHSPAM": "NYHS Pamphlets"
+  "NYHSPR": "NYHS Print Room"
+  "NYHSREF": "NYHS Reference"
+  "NYSID": "New York School of Interior Design"
+  "REI": "NYU Real Estate"
+  "TWEB": "New School Restricted Internet"
+  "WEB": "Unrestricted Internet Access"
+aleph_sub_library_codes:
+  "BARCH": "BOBST"
+  "BCHIL": "BOBST"
+  "BHS": "KBHS"
+  "BREF": "BOBST"
+  "CARCH": "CU"
+  "CCLOS": "CU"
+  "CGEN": "CU"
+  "CMEZZ": "CU"
+  "CMICRO": "CU"
+  "COUR": "NCOUR"
+  "CPER": "CU"
+  "CREF": "CU"
+  "CRES": "CU"
+  "CWEB": "CU"
+  "IFA": "NIFA"
+  "IFAC": "NIFAC"
+  "ISAW": "NISAW"
+  "KEV": "NKEV"
+  "LAPI": "NLAPI"
+  "NSFO": "TNSFO"
+  "NSGI": "TNSGI"
+  "NSKE": "TNSKE"
+  "NSOS": "TNSOS"
+  "NSSC": "TNSSC"
+  "NYHSBR": "NYHS"
+  "NYHSLAN": "NYHS"
+  "NYHSM": "NYHS"
+  "NYHSMAPS": "NYHS"
+  "NYHSMSS": "NYHS"
+  "NYHSPAM": "NYHS"
+  "NYHSPR": "NYHS"
+  "NYHSREF": "NYHS"
+  "REI": "NREI"
+statuses:
+  "available": "Available"
+  "requested": "Requested"
+  "unavailable": "Check Availability"
+  "check_holdings": "Check Availability"
+  "request_ill": "Request ILL"
+  "billed_as_lost": "Request ILL"
+  "offsite": "Offsite Available"
+  "processing": "In Processing"
+  "in_transit": "In Processing"
+  "ask_afc": "Ask at Avery Fisher Center"
+  "ask_archives": "Ask at NYU Archives"
+  "ask_fales": "Ask at Fales"
+  "ask_reference": "Ask at Reference"
+  "ask_tam": "Ask at Tamiment"
+  "at_bindery": "At Bindery"
+  "on_order": "On Order"
+  "on_exhibit": "On Exhibit"
+  
+sources:
+  nyu_aleph:
+     base_url: "http://alephstage.library.nyu.edu"
+     rest_url: "http://alephstage.library.nyu.edu:1891/rest-dlf"
+     illiad_url: "http://illdev.library.nyu.edu"
+     type: aleph
+     class_name: NYUAleph
+     local_base: "PRIMOCOMMON"
+     "866$l_mappings": 
+       Bobst: 
+         sub_library: BOBST
+         collection: MAIN
+       NYHistSoc: 
+         sub_library: NYHS
+         collection: MAIN
+       Bobst Microform: 
+         sub_library: BOBST
+         collection: MFORM
+       Bobst Tamiment: 
+         sub_library: BTAM
+         collection: TAM
+       Bobst REF6: 
+         sub_library: BREF6
+         collection: RF6
+       Bobst REF6 IntlDocs: 
+         sub_library: BREF6
+         collection: RF6IN
+       Bobst SpecCol Downtown: 
+         sub_library: BFALE
+         collection: FDOWN
+       IFA: 
+         sub_library: NIFA
+         collection: MAIN
+       Cooper: 
+         sub_library: CU
+         collection: MAIN
+       Cooper Periodicals: 
+         sub_library: CU
+         collection: PERIO
+       Bobst SpecCol: 
+         sub_library: BFALE
+         collection: FALES
+       Bobst Tamiment Microfilm: 
+         sub_library: BTAM
+         collection: MAIN
+       Parsons: 
+         sub_library: TNSGI
+         collection: MAIN
+       NewSchool Reference: 
+         sub_library: TNSFO
+         collection: REF
+       NewSchool Periodicals: 
+         sub_library: TNSFO
+         collection: PERIO
+       Bobst REF1: 
+         sub_library: BOBST
+         collection: REF1
+       Courant: 
+         sub_library: NCOUR
+         collection: MAIN
+       NewSchool: 
+         sub_library: TNSFO
+         collection: MAIN
+       Courant Periodicals:
+         sub_library: NCOUR
+         collection: PERIO
+       RealEstate:
+         sub_library: NREI
+         collection: MAIN
+       ConservIFA: 
+         sub_library: NIFAC
+         collection: MAIN
+       Bobst REF9: 
+         sub_library: BOBST
+         collection: REF9
+       Cooper Reference: 
+         sub_library: CU
+         collection: REF
+       Bobst Offsite: 
+         sub_library: BOBST
+         collection: MAIN
+       NYIntDes: 
+         sub_library: NYSID
+         collection: MAIN
+       Cooper Mezzanine: 
+         sub_library: CU
+         collection: MEZZ
+       NYHistSoc Bella C. Landauer Collection of Business and Advertising Ephemera.: 
+         sub_library: NYHS
+         collection: LANDA
+       Bobst Tamiment Microform: 
+         sub_library: BTAM
+         collection: MAIN
+       Bobst Ref6: 
+         sub_library: BREF6
+         collection: RF6
+       Bobst Archives: 
+         sub_library: BOBST
+         collection: ARCH
+       Bobst REF6 IntlRef: 
+         sub_library: BREF6
+         collection: RF6IR
+       Brooklyn HistSoc Microform: 
+         sub_library: KBHS
+         collection: MFORM
+       IFA Periodicals: 
+         sub_library: NIFA
+         collection: PERIO
+       Parsons Reference: 
+         sub_library: TNSGI
+         collection: REF
+       N-YHistSoc Bella C. Landauer Collection of Business and Advertising Ephemera.: 
+         sub_library: NYHS
+         collection: LANDA
+       Mannes: 
+         sub_library: TNSSC
+         collection: MAIN
+       Bobst REF6 Index: 
+         sub_library: BREF6
+         collection: RF6I
+       Bobst REF6 Desk: 
+         sub_library: BREF6
+         collection: RF6DR
+       IFA Offsite: 
+         sub_library: NIFA
+         collection: OFFSI
+       Bobst REF6 USDocs: 
+         sub_library: BREF6
+         collection: RF6US
+       ConservIFA Periodicals: 
+         sub_library: NIFAC
+         collection: PERIO
+       Bobst REF6I Microform: ???
+       Bobst REF6 Microform: ???
+       Bobst REF6 Micro: ???
+     statuses:
+       available: ["On Shelf", "Available"]
+       requested: ["Requested"]
+       request_ill: ["Request ILL"]
+       billed_as_lost: ["Billed as Lost", "Claimed Returned"]
+       offsite: ["Offsite Available"]
+       checked_out: !ruby/regexp '/([0-9]{2}\/[0-9]{2}\/[0-9]{2})/'
+       unavailable: ["Unavailable"]
+       processing: ["In Processing", "In Transit"]
+       ask_afc: ["Ask at Avery Fisher Center"]
+       ask_archives: ["Ask at NYU Archives"]
+       ask_tam: ["Ask at Tamiment"]
+       ask_fales: ["Ask at Fales"]
+       ask_reference: ["Ask at Reference"]
+       on_exhibit: ["On Exhibit"]
+       #new_books: ["New Books Display", "New Books Display"]
+       #sorting: ["Sorting Shelves", "Sorting Shelves", "Sorting Shelves"]
+       #bound: "Bound"
+       #order_initiated: "Order initiated"
+     requestable_statuses: ["checked_out", "offsite", available_requestable, "Depository", "Offsite Available"]
+     requestable_collections: ["checked_out", "offsite", available_requestable, "Depository", "Offsite Available"]
+  COURSES:
+     base_url: "http://alephstage.library.nyu.edu"
+     rest_url: "http://alephstage.library.nyu.edu:1891/rest-dlf"
+     illiad_url: "http://illdev.library.nyu.edu"
+     type: aleph
+     class_name: NYUAleph
+     local_base: "PRIMOCOMMON"
+  ADCOURSES:
+     base_url: "http://alephstage.library.nyu.edu"
+     rest_url: "http://alephstage.library.nyu.edu:1891/rest-dlf"
+     illiad_url: "http://illdev.library.nyu.edu"
+     type: aleph
+     class_name: NYUAleph
+     local_base: "PRIMOCOMMON"

data/test/dummy/config/umlaut_services-TEST.yml

@@ -0,0 +1,37 @@
+
+  # Configure what service plugins are used by Umlaut. This skeleton file
+  # has been generated into your app to help you get started. 
+  #
+  # If a service has "disabled:true", it's currently turned off. 
+  #
+  # Some services require local api key or connection details as config.
+  # Most services take other options for custom configuration too, not
+  # all options are neccesarily listed as examples here, see source
+  # or source-generated docs for more info.   
+
+default:
+    services:
+      JH_SFX:
+        name: Find It @ JH 
+        display_name: Find It @ JH
+        type: Sfx
+        base_url: http://sfx.library.jhu.edu:8000/sfxlcl41 #http://sfx.library.jhu.edu:8000/sfxlcl3
+        priority: 3
+        status: active
+        # click_passthrough: true
+        click_passthrough: false
+        sfx_requests_expire_crontab: '00 00 * * 00' 
+        sfx_timeout: 9
+        # We do NOT include abstract and ToC from SFX.  
+        services_of_interest:
+          getFullTxt: fulltext
+          getSelectedFullTxt: fulltext
+          getDocumentDelivery: document_delivery                         
+          getDOI: highlighted_link
+        extra_targets_of_interest: 
+            LOCAL_FEEDBACK_MSE_LCL: help
+            LOCAL_FEEDBACK_SAIS_LCL: help
+            LOCAL_FEEDBACK_WELCH_LCL: help
+            LOCAL_FEEDBACK_AFL_LCL: help
+            LOCAL_FEEDBACK_APL_LCL: help
+

data/test/dummy/profile/sfx_collection_prof.rb

@@ -0,0 +1,22 @@
+# 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)
+
+