From fdc526d5d47a191d169d296686f9fd9e307fdb60 Mon Sep 17 00:00:00 2001 From: Art Rhyno Date: Wed, 4 Jan 2012 19:39:42 -0500 Subject: [PATCH] Update evergreen support for 2.1 The prefix/suffix support for call numbers impacts the call for status information in the display screen. This change will cause the copyids to be returned so that the status of a physical item can be displayed. Signed-off-by: Art Rhyno --- conifer/integration/evergreen_site.py | 4 ++-- conifer/syrup/migrations/0001_initial.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conifer/integration/evergreen_site.py b/conifer/integration/evergreen_site.py index 9843994..9bdbec5 100644 --- a/conifer/integration/evergreen_site.py +++ b/conifer/integration/evergreen_site.py @@ -115,8 +115,8 @@ class EvergreenIntegration(object): # Used if you're doing updates to Evergreen from Syrup. UPDATE_CHOICES = [ - ('One', 'Syrup only'), ('Cat', 'Catalogue'), + ('One', 'Syrup only'), ('Zap', 'Remove from Syrup'), ] @@ -217,7 +217,7 @@ class EvergreenIntegration(object): # Another MassLNC variation, needs same refactoring as above if version >= 2.1: - copyids = E1(OPENSRF_CN_CALL, bib_id, [callnum], org) + copyids = E1(OPENSRF_CN_CALL, bib_id, [prefix,callnum,suffix], org) else: copyids = E1(OPENSRF_CN_CALL, bib_id, callnum, org) diff --git a/conifer/syrup/migrations/0001_initial.py b/conifer/syrup/migrations/0001_initial.py index 3173834..883b600 100644 --- a/conifer/syrup/migrations/0001_initial.py +++ b/conifer/syrup/migrations/0001_initial.py @@ -152,7 +152,7 @@ class Migration(SchemaMigration): ('orig_prefix', self.gf('django.db.models.fields.IntegerField')(default='-1')), ('orig_callno', self.gf('django.db.models.fields.CharField')(max_length=64, null=True, blank=True)), ('orig_suffix', self.gf('django.db.models.fields.IntegerField')(default='-1')), - ('evergreen_update', self.gf('django.db.models.fields.CharField')(default='One', max_length=4, blank=True)), + ('evergreen_update', self.gf('django.db.models.fields.CharField')(default='Cat', max_length=4, blank=True)), ('copyright_status', self.gf('django.db.models.fields.CharField')(default='UK', max_length=2)), ('circ_modifier', self.gf('django.db.models.fields.CharField')(default='CIRC', max_length=50, blank=True)), ('circ_desk', self.gf('django.db.models.fields.CharField')(default='6329', max_length=5, blank=True)), @@ -309,7 +309,7 @@ class Migration(SchemaMigration): 'circ_modifier': ('django.db.models.fields.CharField', [], {'default': "'CIRC'", 'max_length': '50', 'blank': 'True'}), 'copyright_status': ('django.db.models.fields.CharField', [], {'default': "'UK'", 'max_length': '2'}), 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'evergreen_update': ('django.db.models.fields.CharField', [], {'default': "'One'", 'max_length': '4', 'blank': 'True'}), + 'evergreen_update': ('django.db.models.fields.CharField', [], {'default': "'Cat'", 'max_length': '4', 'blank': 'True'}), 'fileobj': ('django.db.models.fields.files.FileField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}), 'fileobj_mimetype': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), 'fileobj_origname': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}), -- 2.11.0