From: Bill Erickson <berick@esilibrary.com>
Date: Tue, 15 May 2012 16:55:44 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into kpac
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=8d0b6b94b6abb6038f08d1ce8ff073b444547bdd;p=working%2FEvergreen.git

Merge branch 'master' of git.evergreen-ils.org:Evergreen into kpac

Minor conflict repair

Conflicts:
	Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---

8d0b6b94b6abb6038f08d1ce8ff073b444547bdd
diff --cc Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
index c8a4ea77fa,af1c3fc3d4..d86a1f4075
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
@@@ -36,8 -36,10 +37,10 @@@ sub load_record 
      if ($ctx->{staff_saved_search_size}) {
          $ctx->{saved_searches} = ($self->staff_load_searches)[1];
      }
+     $self->timelog("past staff saved searches");
  
 -    $self->fetch_related_search_info($rec_id);
 +    $self->fetch_related_search_info($rec_id) unless $kwargs{no_search};
+     $self->timelog("past related search info");
  
      # run copy retrieval in parallel to bib retrieval
      # XXX unapi