--- a/web/hdabo/management/commands/import_csv.py	Fri Jul 08 02:10:01 2011 +0200
+++ b/web/hdabo/management/commands/import_csv.py	Fri Jul 08 03:12:59 2011 +0200
@@ -184,7 +184,16 @@
                 if len(tag) == 0:
                     continue
                 tag_label = normalize_tag(tag)
-                tag_obj, created = Tag.objects.get_or_create(label__iexact=tag_label, defaults={'label':tag_label, 'original_label':tag}) #@UnusedVariable
+                tag_obj = None
+                for t in Tag.objects.filter(label__iexact=tag_label):
+                    if tag_obj is None or t.url_status != Tag.TAG_URL_STATUS_DICT['null_result']:
+                        tag_obj = t
+                        if tag_obj.url_status != Tag.TAG_URL_STATUS_DICT['null_result']:
+                            break
+ 
+                if tag_obj is None:
+                    tag_obj = Tag(label=tag_label, original_label=tag)
+
                 tagged_ds = TaggedSheet(datasheet=datasheet, tag=tag_obj, original_order=i + 1, order=i + 1)
                 tagged_ds.save()