diff -r 88d675d5e27e -r 6b45fd23e4a0 src/p4l/models/data.py --- a/src/p4l/models/data.py Mon Sep 02 16:27:06 2013 +0200 +++ b/src/p4l/models/data.py Mon Sep 02 16:40:28 2013 +0200 @@ -19,18 +19,18 @@ class ProjectName(P4lModel): uri = models.URLField(max_length=2048, unique=True, db_index=True) - label = models.CharField(max_length=2048, blank=False, null=False, db_index=True) - acronym = models.CharField(max_length=2048, blank=True, null=True, db_index=True) #iiep:acronym # - class Meta(P4lModel.Meta): - unique_together = ['label', 'acronym'] +# label = models.CharField(max_length=2048, blank=False, null=False, db_index=True) +# acronym = models.CharField(max_length=2048, blank=True, null=True, db_index=True) #iiep:acronym # +# class Meta(P4lModel.Meta): +# unique_together = ['label', 'acronym'] class CorporateAuthor(P4lModel): uri = models.URLField(max_length=2048, unique=True, db_index=True) - label = models.CharField(max_length=2048, blank=True, null=True, db_index=True) - acronym = models.CharField(max_length=2048, blank=True, null=True, db_index=True) #iiep:acronym - class Meta(P4lModel.Meta): - unique_together = ['label','acronym'] +# label = models.CharField(max_length=2048, blank=True, null=True, db_index=True) +# acronym = models.CharField(max_length=2048, blank=True, null=True, db_index=True) #iiep:acronym +# class Meta(P4lModel.Meta): +# unique_together = ['label','acronym'] class Url(P4lModel): record = models.ForeignKey('p4l.Record', related_name="urls", db_index=True) @@ -41,16 +41,16 @@ class Subject(P4lModel): uri = models.URLField(max_length=2048, unique=True, db_index=True) - label = models.CharField(max_length=2048, blank=True, null=True, db_index=True) # filled from sparql request after import + #label = models.CharField(max_length=2048, blank=True, null=True, db_index=True) # filled from sparql request after import class Theme(P4lModel): uri = models.URLField(max_length=2048, unique=True, db_index=True) - label = models.CharField(max_length=2048, blank=True, null=True, db_index=True) # filled from sparql request after import + #label = models.CharField(max_length=2048, blank=True, null=True, db_index=True) # filled from sparql request after import class Country(P4lModel): uri = models.URLField(max_length=2048, unique=True, db_index=True) - label = models.CharField(max_length=2048, blank=True, null=True, db_index=True) # filled from sparql request after import + #label = models.CharField(max_length=2048, blank=True, null=True, db_index=True) # filled from sparql request after import class Isbn(P4lModelLang): @@ -68,7 +68,7 @@ class Language(P4lModel): uri = models.URLField(max_length=2048, unique=True, db_index=True) - label = models.CharField(max_length=2048, blank=True, null=True, db_index=True) # filled from sparql request after import + #label = models.CharField(max_length=2048, blank=True, null=True, db_index=True) # filled from sparql request after import class BaseTitle(P4lModelLang): title = models.CharField(max_length=2048, blank=False, null=False, db_index=True)