Model modifications

cards/management/commands/gcstar_import.py

@@ -112,15 +112,13 @@ class Command(BaseCommand):
 		country, created = Country.objects.get_or_create(label=item.country.strip())
 		i.country = country
 
-		category, created = Category.objects.get_or_create(label=item.category.strip())
+		#category, created = Category.objects.get_or_create(label=item.category.strip())
 		#i.category = category
-
-		subcategory, created = SubCategory.objects.get_or_create(label=item.subcategory.strip())
-		subcategory.category = category
-		i.subcategory = subcategory
-
-		i.subcategory.save()
-
+		#subcategory, created = SubCategory.objects.get_or_create(label=item.subcategory.strip())
+		#subcategory.category = category
+		#i.subcategory = subcategory
+		#i.subcategory.save()
+			
 		i.units = item.units
 		i.label = item.label
 		i.emissionDate = item.emissionDate
@@ -134,6 +132,21 @@ class Command(BaseCommand):
 
 		i.save()
 
+		try:
+			t1, created1 = Tag.objects.get_or_create(label=unicode(item.subcategory.strip()))
+			t2, created2 = Tag.objects.get_or_create(label=unicode(item.category.strip()))
+	
+			t1.save()
+			t2.save()
+	
+		
+			i.tags.add(t1)
+			i.tags.add(t2)
+		
+			i.save()
+		except:
+			print 'exception @ ' + i.label
+
 		
 class GCItem():
 	"""

cards/models.py

@@ -68,7 +68,7 @@ class Card(models.Model):
 	emissionDate = models.CharField(verbose_name="Année ou date d'émission", max_length=10, blank=True)
 	expirationDate = models.CharField(verbose_name="Année ou date d'expiration", max_length=10, blank=True)
 	numberOfCopies = models.CharField(verbose_name='Tirage', max_length=50, blank=True)
-	tags = models.ManyToManyField(Tag, verbose_name='Liste des tags')
+	tags = models.ManyToManyField(Tag, null=True, blank=True, verbose_name='Liste des tags')
 	created_at = models.DateTimeField(auto_now_add=True)
 	updated_at = models.DateTimeField(auto_now=True)