diff -r 71532a54d1c4 -r 53c9233a7684 src/p4l/models/data.py --- a/src/p4l/models/data.py Fri Sep 20 00:03:31 2013 +0200 +++ b/src/p4l/models/data.py Fri Sep 20 00:14:42 2013 +0200 @@ -28,7 +28,6 @@ record = models.ForeignKey('p4l.Record', related_name="urls", db_index=True) address = models.CharField(max_length=2048, blank=False, null=False, db_index=True) #iiep:address display = models.CharField(max_length=2048, blank=True, null=True, db_index=True) #iiep:display - accessLevel = models.CharField(max_length=512, blank=True, null=True, db_index=True) #iiep:accessLevel class Subject(P4lModel): @@ -37,8 +36,10 @@ class Theme(P4lModel): uri = models.URLField(max_length=2048, unique=True, db_index=True) +class Country(P4lModel): + uri = models.URLField(max_length=2048, unique=True, db_index=True) -class Country(P4lModel): +class Audience(P4lModel): uri = models.URLField(max_length=2048, unique=True, db_index=True) @@ -154,11 +155,14 @@ subjectCorporateBodies = models.ManyToManyField('p4l.CorporateAuthor', related_name='recordsSubjectCorporateBody') #iiep:subjectCorporateBody # #subjectMeetings = foreign key from 'p4l.SubjectMeeting' #iiep:subjectMeeting corporateAuthors = models.ManyToManyField('p4l.CorporateAuthor', related_name='recordsCorporateAuthor') #iiep:subjectCorporateBody # + corporateAuthorLabel = models.CharField(max_length=2048, blank=True, null=True, db_index=True) #iiep:corporateAuthorLabel #urls foreign Key from Url #iiep:url - recordType = models.URLField(max_length=2048) #dct:type # + audiences = models.ManyToManyField('p4l.Audience') #dct:audience # Unknown thesaurus + recordType = models.URLField(max_length=2048, blank=True, null=True) #dct:type # isDocumentPart = models.BooleanField() #iiep:isDocumentPart - isMultilingual = models.BooleanField() #iiep:isMultilingual + hidden = models.BooleanField(default=False) #iiep:hidden + restricted = models.BooleanField(default=False) #iiep:restricted def get_imprints_years(self): return sorted(set([i.imprintDate for i in self.imprints.all() if i.imprintDate]))