# HG changeset patch # User cavaliet # Date 1379510833 -7200 # Node ID 12bbec897e482b3191400a347d46a7c1094dbb99 # Parent d2c4dbdf3548d7c519d012c9f1839abf753fba46 model change (again) diff -r d2c4dbdf3548 -r 12bbec897e48 src/p4l/management/commands/import_record.py --- a/src/p4l/management/commands/import_record.py Tue Sep 17 16:58:08 2013 +0200 +++ b/src/p4l/management/commands/import_record.py Wed Sep 18 15:27:13 2013 +0200 @@ -284,8 +284,8 @@ self.add_to_related_collection( record.urls, graph, - ['address', 'display', 'accessLevel'], - "SELECT ?a ?d ?al WHERE { [ iiep:url ?bnode ]. OPTIONAL { ?bnode iiep:address ?a }. OPTIONAL { ?bnode iiep:display ?d }. OPTIONAL { ?bnode iiep:accessLevel ?al }.}", + ['address', 'display'], + "SELECT ?a ?d WHERE { [ iiep:url ?bnode ]. OPTIONAL { ?bnode iiep:address ?a }. OPTIONAL { ?bnode iiep:display ?d }. OPTIONAL { ?bnode iiep:accessLevel ?al }.}", ) return record diff -r d2c4dbdf3548 -r 12bbec897e48 src/p4l/migrations/0001_initial.py --- a/src/p4l/migrations/0001_initial.py Tue Sep 17 16:58:08 2013 +0200 +++ b/src/p4l/migrations/0001_initial.py Wed Sep 18 15:27:13 2013 +0200 @@ -49,7 +49,6 @@ ('record', self.gf('django.db.models.fields.related.ForeignKey')(related_name='urls', to=orm['p4l.Record'])), ('address', self.gf('django.db.models.fields.CharField')(max_length=2048, db_index=True)), ('display', self.gf('django.db.models.fields.CharField')(db_index=True, max_length=2048, null=True, blank=True)), - ('accessLevel', self.gf('django.db.models.fields.CharField')(db_index=True, max_length=512, null=True, blank=True)), )) db.send_create_signal('p4l', ['Url']) @@ -74,6 +73,13 @@ )) db.send_create_signal('p4l', ['Country']) + # Adding model 'Audience' + db.create_table(u'p4l_audience', ( + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('uri', self.gf('django.db.models.fields.URLField')(unique=True, max_length=2048, db_index=True)), + )) + db.send_create_signal('p4l', ['Audience']) + # Adding model 'Isbn' db.create_table(u'p4l_isbn', ( (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), @@ -221,9 +227,11 @@ ('notes', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), ('language', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['p4l.Language'], null=True, blank=True)), ('editionStatement', self.gf('django.db.models.fields.CharField')(max_length=1024, null=True, blank=True)), + ('corporateAuthorLabel', self.gf('django.db.models.fields.CharField')(db_index=True, max_length=2048, null=True, blank=True)), ('recordType', self.gf('django.db.models.fields.URLField')(max_length=2048, null=True, blank=True)), ('isDocumentPart', self.gf('django.db.models.fields.BooleanField')(default=False)), - ('isMultilingual', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('isHidden', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('isRestricted', self.gf('django.db.models.fields.BooleanField')(default=False)), )) db.send_create_signal('p4l', ['Record']) @@ -283,6 +291,14 @@ )) db.create_unique(u'p4l_record_corporateAuthors', ['record_id', 'corporateauthor_id']) + # Adding M2M table for field audiences on 'Record' + db.create_table(u'p4l_record_audiences', ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('record', models.ForeignKey(orm['p4l.record'], null=False)), + ('audience', models.ForeignKey(orm['p4l.audience'], null=False)) + )) + db.create_unique(u'p4l_record_audiences', ['record_id', 'audience_id']) + # Adding model 'User' db.create_table(u'p4l_user', ( (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), @@ -342,6 +358,9 @@ # Deleting model 'Country' db.delete_table(u'p4l_country') + # Deleting model 'Audience' + db.delete_table(u'p4l_audience') + # Deleting model 'Isbn' db.delete_table(u'p4l_isbn') @@ -411,6 +430,9 @@ # Removing M2M table for field corporateAuthors on 'Record' db.delete_table('p4l_record_corporateAuthors') + # Removing M2M table for field audiences on 'Record' + db.delete_table('p4l_record_audiences') + # Deleting model 'User' db.delete_table(u'p4l_user') @@ -456,6 +478,11 @@ 'record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addedTitles'", 'to': "orm['p4l.Record']"}), 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'db_index': 'True'}) }, + 'p4l.audience': { + 'Meta': {'object_name': 'Audience'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'}) + }, 'p4l.author': { 'Meta': {'object_name': 'Author'}, u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), @@ -539,13 +566,16 @@ }, 'p4l.record': { 'Meta': {'object_name': 'Record'}, + 'audiences': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['p4l.Audience']", 'symmetrical': 'False'}), + 'corporateAuthorLabel': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), 'corporateAuthors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'recordsCorporateAuthor'", 'symmetrical': 'False', 'to': "orm['p4l.CorporateAuthor']"}), 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['p4l.Country']", 'symmetrical': 'False'}), 'editionStatement': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'identifier': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'}), 'isDocumentPart': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'isMultilingual': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'isHidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'isRestricted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'language': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['p4l.Language']", 'null': 'True', 'blank': 'True'}), 'notes': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), 'otherLanguages': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'otherLanguage_record'", 'symmetrical': 'False', 'to': "orm['p4l.Language']"}), @@ -606,7 +636,6 @@ }, 'p4l.url': { 'Meta': {'object_name': 'Url'}, - 'accessLevel': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '512', 'null': 'True', 'blank': 'True'}), 'address': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'db_index': 'True'}), 'display': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}), u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 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])) diff -r d2c4dbdf3548 -r 12bbec897e48 src/p4l/templates/p4l/p4l_record_view.html --- a/src/p4l/templates/p4l/p4l_record_view.html Tue Sep 17 16:58:08 2013 +0200 +++ b/src/p4l/templates/p4l/p4l_record_view.html Wed Sep 18 15:27:13 2013 +0200 @@ -200,7 +200,6 @@
  • {% trans 'Address' %} : {% if i.address %}{{ i.address }}{% endif %}
  • {% trans 'Display' %} : {{ i.display|default:'' }}
    • -
  • {% trans 'Access level' %} : {{ i.accessLevel|default:'' }}
{% endfor %}