From e9e6c828d08627cc047bc3cbddd56a2a2075806f Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 22 Nov 2016 17:03:24 +0100
Subject: [PATCH] Fix CREM import with existing codes

---
 .../commands/telemeta-import-collections-from-crem.py    | 9 ++++++---
 telemeta/models/resource.py                              | 3 +--
 telemeta/urls.py                                         | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/telemeta/management/commands/telemeta-import-collections-from-crem.py b/telemeta/management/commands/telemeta-import-collections-from-crem.py
index d286f973..58745b84 100644
--- a/telemeta/management/commands/telemeta-import-collections-from-crem.py
+++ b/telemeta/management/commands/telemeta-import-collections-from-crem.py
@@ -198,7 +198,12 @@ class Command(BaseCommand):
 
                     if items:
                         item = items[0]
-                        msg = code + ' : ' + item.old_code + ' : Cas 1 ou 2 : id = ' + str(item.id)
+                        if item.code:
+                            msg = code + ' : ' + item.code + ' : Cas 1 ou 2 : id = ' + str(item.id)
+                        elif item.old_code:
+                            msg = code + ' : ' + item.old_code + ' : Cas 1 ou 2 : id = ' + str(item.id)
+                        else:
+                            msg = code + ' : ' + ' Cas 1 ou 2 : id = ' + str(item.id)
                         self.logger.info('item', msg)
                         item.code = code
                     else:
@@ -229,5 +234,3 @@ class Command(BaseCommand):
         for collection in collections:
             msg = 'http://'+self.domain+'/archives/collections/'+collection
             self.logger.info(collection, msg)
-
-
diff --git a/telemeta/models/resource.py b/telemeta/models/resource.py
index 73cbafc2..07454b8a 100644
--- a/telemeta/models/resource.py
+++ b/telemeta/models/resource.py
@@ -26,6 +26,7 @@ from django.utils.translation import ugettext_lazy as _
 from telemeta.models.core import *
 from telemeta.models.system import *
 
+
 class MediaResource(ModelCore):
     "Base class of all media objects"
 
@@ -126,5 +127,3 @@ class MediaRelated(MediaResource):
 
     class Meta:
         abstract = True
-
-
diff --git a/telemeta/urls.py b/telemeta/urls.py
index 408bf9f1..8456c858 100644
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -225,7 +225,7 @@ urlpatterns = patterns('',
     url(r'^playlists/(?P<public_id>[a-zA-Z0-9]+)/(?P<resource_type>[a-zA-Z0-9]+)/csv/$', playlist_view.playlist_csv_export, name="telemeta-playlist-csv-export"),
     url(r'^playlists/playlist_add/$', NewPlaylistView().display, name='playlist'),
 
-                       # RSS feeds
+    # RSS feeds
     url(r'^rss/$', LastestRevisionsFeed(), name="telemeta-rss"),
 
     # Static media
-- 
2.39.5