From d24624a7378de92cfb45e9fe74477e2096033962 Mon Sep 17 00:00:00 2001 From: Art Rhyno Date: Wed, 6 Jul 2011 22:07:55 -0400 Subject: [PATCH] Bumped up the circ modifier size for MARS. Cleaned up opensrf calls a bit. Signed-off-by: Art Rhyno --- conifer/libsystems/evergreen/opensrf.py | 32 ++++++++++++++++---------------- conifer/syrup/models.py | 4 +--- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/conifer/libsystems/evergreen/opensrf.py b/conifer/libsystems/evergreen/opensrf.py index 833e7df..9db25da 100644 --- a/conifer/libsystems/evergreen/opensrf.py +++ b/conifer/libsystems/evergreen/opensrf.py @@ -135,9 +135,17 @@ def ils_patron_details(usrname): ["first_given_name","family_name","email","cards"]) patron_info = req.send() if patron_info: - dir_entry['given_name'] = patron_info.first_given_name() - dir_entry['surname'] = patron_info.family_name() - dir_entry['email'] = patron_info.email() + given_name = "" + if patron_info.first_given_name(): + given_name = patron_info.first_given_name() + dir_entry['given_name'] = given_name + surname = "" + if patron_info.family_name(): + surname = patron_info.family_name() + dir_entry['surname'] = surname + email = "" + if patron_info.email(): + dir_entry['email'] = email cards = patron_info.cards() if cards: @@ -158,7 +166,7 @@ def ils_patron_details(usrname): def ils_patron_lookup(name, is_staff=True, is_usrname=False, is_everyone=False): """ - This is the barebones of a fuzzy lookup using opensrf + This is an implementation of a fuzzy lookup using opensrf """ RESULT_LIMIT = 5 @@ -268,19 +276,11 @@ def ils_patron_lookup(name, is_staff=True, is_usrname=False, is_everyone=False): ["first_given_name","family_name","email","usrname"]) patron_info = req.send() if patron_info.usrname(): - first_name = "" - family_name = "" - email = "" - if patron_info.first_given_name(): - first_name = patron_info.first_given_name() - if patron_info.family_name(): - family_name = patron_info.family_name() - if patron_info.email(): - email = patron_info.email() display = ('%s %s, ' - '<%s>. [%s]') % (first_name, - family_name, - email, patron_info.usrname()) + '<%s>. [%s]') % (patron_info.first_given_name(), + patron_info.family_name(), + patron_info.email(), + patron_info.usrname()) out.append((patron_info.usrname(), display)) #clean up session diff --git a/conifer/syrup/models.py b/conifer/syrup/models.py index 3e048f6..fdabe85 100644 --- a/conifer/syrup/models.py +++ b/conifer/syrup/models.py @@ -147,8 +147,6 @@ class UserExtensionMixin(object): self.get_profile().ils_userid = dir_entry['patron_id'] profile.save() - - for k,v in [(k,v) for k,v in UserExtensionMixin.__dict__.items() \ if not k.startswith('_')]: setattr(User, k, v) @@ -704,7 +702,7 @@ class Item(BaseModel): CIRC_MODIFIER_CHOICES = getattr(integration_class, 'MODIFIER_CHOICES', [('', 'n/a')]) - circ_modifier = m.CharField(max_length=10, + circ_modifier = m.CharField(max_length=50, choices=CIRC_MODIFIER_CHOICES, default=CIRC_MODIFIER_CHOICES[0][0], blank=True) -- 2.11.0