diff -r d2c4dbdf3548 -r 12bbec897e48 src/p4l/models/data.py --- a/src/p4l/models/data.py Tue Sep 17 16:58:08 2013 +0200 +++ b/src/p4l/models/data.py Wed Sep 18 15:27:13 2013 +0200 @@ -36,21 +36,19 @@ 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): 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 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 - 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 + +class Audience(P4lModel): + uri = models.URLField(max_length=2048, unique=True, db_index=True) class Isbn(P4lModelLang): @@ -166,11 +164,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, blank=True, null=True) #dct:type # + audiences = models.ManyToManyField('p4l.Audience') #dct:audience # Unknow thesaurus + recordType = models.URLField(max_length=2048, blank=True, null=True) #dct:type # isDocumentPart = models.BooleanField() #iiep:isDocumentPart - isMultilingual = models.BooleanField() #iiep:isMultilingual + isHidden = models.BooleanField() #iiep:hidden + isRestricted = models.BooleanField() #iiep:restricted def get_imprints_years(self): return sorted(set([i.imprintDate for i in self.imprints.all() if i.imprintDate]))