From fdcc3eb068c190b53bfdb8b619b181aaae5585ed Mon Sep 17 00:00:00 2001 From: Art Rhyno Date: Mon, 6 Feb 2012 22:15:43 -0500 Subject: [PATCH] handle multiple reserves locations --- conifer/integration/evergreen_site.py | 4 ++-- conifer/local_settings.py.example | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/conifer/integration/evergreen_site.py b/conifer/integration/evergreen_site.py index 9bdbec5..2f52760 100644 --- a/conifer/integration/evergreen_site.py +++ b/conifer/integration/evergreen_site.py @@ -197,7 +197,7 @@ class EvergreenIntegration(object): # attachment test attachtest = re.search(self.IS_ATTACHMENT, callnum) - if loc == self.RESERVES_DESK_NAME: + if loc in self.RESERVES_DESK_NAME: desk += anystatus_here avail += avail_here dueinfo = '' @@ -230,7 +230,7 @@ class EvergreenIntegration(object): if thisloc: thisloc = thisloc.get("name") - if thisloc == self.RESERVES_DESK_NAME: + if thisloc in self.RESERVES_DESK_NAME: bringfw = attachtest # multiple volumes diff --git a/conifer/local_settings.py.example b/conifer/local_settings.py.example index e519a01..f6cc3f9 100644 --- a/conifer/local_settings.py.example +++ b/conifer/local_settings.py.example @@ -52,7 +52,9 @@ CAS_SERVER_URL = 'https://uwinid.uwindsor.ca/cas/' EVERGREEN_SERVER = 'www.concat.ca' EVERGREEN_VERSION = 2.1 -RESERVES_DESK_NAME = 'Leddy: Course Reserves - Main Bldng - 1st Flr - Reserve Counter at Circulation Desk' + +# list of locations +RESERVES_DESK_NAME = ['Leddy: Course Reserves - Main Bldng - 1st Flr - Reserve Counter at Circulation Desk', 'Leddy: Reserves 2'] SYRUP_TIME_FORMAT = '%Y-%m-%dT%H:%M:%S' SYRUP_DUE_FORMAT = '%b %d %Y, %r' ATTACHMENT_REGEXP ='\w*DVD\s?|\w*CD\s?|\w[Gg]uide\s?|\w[Bb]ooklet\s?|\w*CD\-ROM\s?' -- 2.11.0