--- a/src/p4l/models/data.py Fri Aug 30 17:09:14 2013 +0200
+++ b/src/p4l/models/data.py Fri Aug 30 17:58:35 2013 +0200
@@ -11,18 +11,10 @@
imprintDate = models.CharField(max_length=512, blank=True, null=True, db_index=True)
-class Serie(P4lModel):
+class Serie(P4lModelLang):
+ record = models.ForeignKey('p4l.Record', related_name="series")
title = models.CharField(max_length=2048, blank=False, null=False, db_index=True)
volume = models.CharField(max_length=2048, blank=True, null=True, db_index=True)
- class Meta(P4lModel.Meta):
- unique_together = ['title', 'volume']
-
-class RecordSerie(P4lModelLang):
- record = models.ForeignKey('p4l.Record', related_name="series+")
- serie = models.ForeignKey('p4l.Serie', related_name="records")
- class Meta(P4lModelLang.Meta):
- unique_together = ['record','serie']
-
class ProjectName(P4lModel):
@@ -33,14 +25,13 @@
class CorporateAuthor(P4lModel):
+ record = models.ForeignKey('p4l.Record', related_name="corporateAuthors", 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']
class Url(P4lModel):
- record = models.ForeignKey('p4l.Record', related_name="urls")
+ 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
@@ -61,16 +52,16 @@
class Isbn(P4lModelLang):
- record = models.ForeignKey('p4l.Record', related_name="isbns")
+ record = models.ForeignKey('p4l.Record', related_name="isbns", db_index=True)
isbn = models.CharField(max_length=128) #iiep:isbn
class Issn(P4lModelLang):
- record = models.ForeignKey('p4l.Record', related_name="issns")
+ record = models.ForeignKey('p4l.Record', related_name="issns", db_index=True)
issn = models.CharField(max_length=128) #iiep:issn
class DocumentCode(P4lModelLang):
- record = models.ForeignKey('p4l.Record', related_name="documentCodes")
+ record = models.ForeignKey('p4l.Record', related_name="documentCodes", db_index=True)
documentCode = models.CharField(max_length=128) #iiep:issn
class Language(P4lModel):
@@ -85,52 +76,46 @@
abstract = True
class Title(BaseTitle):
- record = models.ForeignKey('p4l.Record', related_name="titles")
+ record = models.ForeignKey('p4l.Record', related_name="titles", db_index=True)
class AddedTitle(BaseTitle):
- record = models.ForeignKey('p4l.Record', related_name="addedTitles")
+ record = models.ForeignKey('p4l.Record', related_name="addedTitles", db_index=True)
class TitleMainDocument(BaseTitle):
- record = models.ForeignKey('p4l.Record', related_name="titlesMainDocument")
+ record = models.ForeignKey('p4l.Record', related_name="titlesMainDocument", db_index=True)
class Abstract(P4lModelLang):
- record = models.ForeignKey('p4l.Record', related_name="abstracts")
+ record = models.ForeignKey('p4l.Record', related_name="abstracts", db_index=True)
abstract = models.TextField(blank=True, null=True)
class Collation(P4lModelLang):
- record = models.ForeignKey('p4l.Record', related_name="collations")
+ record = models.ForeignKey('p4l.Record', related_name="collations", db_index=True)
collation = models.CharField(max_length=1024, blank=False, null=False, db_index=True)
class VolumeIssue(P4lModelLang):
- record = models.ForeignKey('p4l.Record', related_name="volumeIssues")
+ record = models.ForeignKey('p4l.Record', related_name="volumeIssues", db_index=True)
volume = models.CharField(max_length=1024, blank=True, null=True, db_index=True) #iiep:volume
number = models.CharField(max_length=1024, blank=True, null=True, db_index=True) #iiep:number
class P4lPerson(P4lModel):
- name = models.CharField(max_length=2048, blank=False, null=False, db_index=True, unique=True)
+ name = models.CharField(max_length=2048, blank=False, null=False, db_index=True)
class Meta(P4lModel.Meta):
abstract = True
class Author(P4lPerson):
- pass
+ record = models.ForeignKey('p4l.Record', related_name="authors", db_index=True)
class SubjectPerson(P4lPerson):
- pass
-
-
-class Periodical(P4lModel):
- label = models.CharField(max_length=2048, blank=False, null=False, db_index=True, unique=True) #iiep:periodical
+ record = models.ForeignKey('p4l.Record', related_name="subjectPersons", db_index=True)
-class RecordPeriodical(P4lModelLang):
- record = models.ForeignKey('p4l.Record', related_name="periodicals+")
- periodical = models.ForeignKey('p4l.Periodical', related_name="records")
- class Meta(P4lModelLang.Meta):
- unique_together = ['record','periodical']
+class Periodical(P4lModelLang):
+ record = models.ForeignKey('p4l.Record', related_name="periodicals", db_index=True)
+ label = models.CharField(max_length=2048, blank=False, null=False, db_index=True) #iiep:periodical
class BaseMeeting(P4lModel):
@@ -141,21 +126,15 @@
meetingYear = models.PositiveSmallIntegerField(blank=True, null=True, db_index=True) #iiep:meetingYear
class Meta(P4lModel.Meta):
abstract = True
- unique_together = ['label', 'meetingNumber', 'meetingPlace', 'meetingDate', 'meetingYear']
class Meeting(BaseMeeting):
- pass
-
-class RecordMeeting(P4lModelLang):
- record = models.ForeignKey('p4l.Record', related_name="meetings+")
- meeting = models.ForeignKey('p4l.Meeting', related_name="records")
- class Meta(P4lModelLang.Meta):
- unique_together = ['record','meeting']
+ lang = models.CharField(max_length=15, blank=True, null=True, db_index=True) #@xml:lang
+ record = models.ForeignKey('p4l.Record', related_name="meetings")
class SubjectMeeting(BaseMeeting):
- pass
+ record = models.ForeignKey('p4l.Record', related_name="subjectMeetings", db_index=True)
class CorporateBody(P4lModel):
@@ -177,6 +156,7 @@
language = models.ForeignKey('p4l.Language', blank=True, null=True) #dct:language # Language
otherLanguages = models.ManyToManyField('p4l.Language', related_name='otherLanguage_record') #iiep:otherLanguage # Language
#titles foreign Key from Title #dct:title
+ #abstracts foreign Key from Abstract #dct:abstract
#addedTitles foreign Key from AddedTitle #iiep:addedTitle
#titlesMainDocument foreign Key from TitleMainDocument #iiep:titleMainDocument
editionStatement = models.CharField(max_length=1024, blank=True, null=True) #iiep:editionStatement
@@ -184,14 +164,14 @@
#collations = foreign Key from Collation #iiep:collation
#volumeIssues = foreign Key from VolumeIssue #iiep:volumeIssue
projectNames = models.ManyToManyField('p4l.ProjectName') #iiep:projectName
- periodicals = models.ManyToManyField('p4l.Periodical', through='p4l.RecordPeriodical') #iiep:periodical
- meetings = models.ManyToManyField('p4l.Meeting', through='p4l.RecordMeeting') #iiep:meeting
- series = models.ManyToManyField('p4l.Serie', through='p4l.RecordSerie') #iiep:serie
- authors = models.ManyToManyField('p4l.Author') #iiep:author
- subjectPersons = models.ManyToManyField('p4l.SubjectPerson') #iiep:subjectPerson
+ #periodicals = foreign key from 'p4l.Periodical' #iiep:periodical
+ #meetings = foreign key from 'p4l.Meeting' #iiep:meeting
+ #series = foreign key from 'p4l.Serie' #iiep:serie
+ #authors = foreign key from 'p4l.Author' #iiep:author
+ #subjectPersons = foreign key from 'p4l.SubjectPerson' #iiep:subjectPerson
subjectCorporateBodies = models.ManyToManyField('p4l.CorporateBody') #iiep:subjectCorporateBody # Organisation ?
- subjectMeetings = models.ManyToManyField('p4l.SubjectMeeting') #iiep:subjectMeeting
- corporateAuthors = models.ManyToManyField('p4l.CorporateAuthor') #iiep:corporateAuthor # Organisation ?
+ #subjectMeetings = foreign key from 'p4l.SubjectMeeting' #iiep:subjectMeeting
+ #corporateAuthors = foreign key from 'p4l.CorporateAuthor' #iiep:corporateAuthor # Organisation ?
#urls foreign Key from Url #iiep:url
recordType = models.URLField(max_length=2048) #dct:type
isDocumentPart = models.BooleanField() #iiep:isDocumentPart