From: Dan Scott Date: Tue, 27 Dec 2011 23:36:32 +0000 (-0500) Subject: TPAC: Resolve conflict with master X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c3583b4788574ad6b940f447b69c303c1c7810f0;p=evergreen%2Fmasslnc.git TPAC: Resolve conflict with master The changes for LP909111 ended up causing a conflict with this branch. Resolve! Signed-off-by: Dan Scott Signed-off-by: Jason Stephenson --- diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm index 7fa671d96e..6e74628a9a 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm @@ -124,8 +124,6 @@ sub _prepare_biblio_search { $depth = $org->ou_type->depth; } $query .= " depth($depth)"; - } else { - $depth = $ctx->{get_aou}->($org)->ou_type->depth; } $logger->info("tpac: site=$site, depth=$depth, query=$query");