From: gfawcett <gfawcett@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Date: Tue, 28 Dec 2010 01:07:53 +0000 (+0000)
Subject: make import-all-depts-and-courses code more tolerant of redundant course codes in... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4e1e6fd428c7b1b080eaf2a090008b59a21f8202;p=syrup%2Fmasslnc.git

make import-all-depts-and-courses code more tolerant of redundant course codes in the imported data.

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@1124 6d9bc8c9-1ec2-4278-b937-99fde70a366f
---

diff --git a/conifer/syrup/views/admin.py b/conifer/syrup/views/admin.py
index 3ec2fe1..3a1d4b7 100644
--- a/conifer/syrup/views/admin.py
+++ b/conifer/syrup/views/admin.py
@@ -124,12 +124,13 @@ def admin_update_depts_courses(request):
             'hook %r not found.' % HOOKNAME)
     else:
         for deptname, ccode, cname in catalogue:
+            print (deptname, ccode, cname)
             if not (deptname.strip() and ccode.strip() and cname.strip()):
                 continue
             dept, x = models.Department.objects.get_or_create(
-                name=deptname, service_desk=desk)
+                name=deptname, defaults={'service_desk': desk})
             models.Course.objects.get_or_create(
-                department=dept, name=cname, code=ccode)
+                code=ccode, defaults={'department': dept, 'name': cname})
         return simple_message('Courses and departments updated.', '')
 
 def admin_update_terms(request):