# HG changeset patch # User cavaliet # Date 1378131981 -7200 # Node ID b31a67614f761ed2df1d7f6a610c12e2da01fffa # Parent be595253ced5611fd9ec17f2cd9b57e6ae413602 fill labels with sparql request on the go diff -r be595253ced5 -r b31a67614f76 src/p4l/models/data.py --- a/src/p4l/models/data.py Mon Sep 02 11:45:01 2013 +0200 +++ b/src/p4l/models/data.py Mon Sep 02 16:26:21 2013 +0200 @@ -20,7 +20,7 @@ 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 + acronym = models.CharField(max_length=2048, blank=True, null=True, db_index=True) #iiep:acronym # class Meta(P4lModel.Meta): unique_together = ['label', 'acronym'] @@ -139,16 +139,16 @@ class Record(P4lModel): uri = models.URLField(max_length=2048, unique=True, db_index=True) #subject - subjects = models.ManyToManyField('p4l.Subject') #dct:subject # Thesaurus with no country - themes = models.ManyToManyField('p4l.Theme') #iiep:theme # Theme - countries = models.ManyToManyField('p4l.Country') #iiep:country # Thesaurus filtered with country only + subjects = models.ManyToManyField('p4l.Subject') #dct:subject # with no country + themes = models.ManyToManyField('p4l.Theme') #iiep:theme # + countries = models.ManyToManyField('p4l.Country') #iiep:country # filtered with country only identifier = models.CharField(max_length=128, unique=True, db_index=True) #dct:identifier notes = models.TextField(blank=True, null=True) #iiep:notes #issns foreign key from Isbn #iiep:issn #isbns foreign key from Isbn #iiep:isbn #documentCodes foreign key from Isbn #iiep:documentCode - language = models.ForeignKey('p4l.Language', blank=True, null=True) #dct:language # Language - otherLanguages = models.ManyToManyField('p4l.Language', related_name='otherLanguage_record') #iiep:otherLanguage # Language + language = models.ForeignKey('p4l.Language', blank=True, null=True) #dct:language # + otherLanguages = models.ManyToManyField('p4l.Language', related_name='otherLanguage_record') #iiep:otherLanguage # #titles foreign Key from Title #dct:title #abstracts foreign Key from Abstract #dct:abstract #addedTitles foreign Key from AddedTitle #iiep:addedTitle @@ -157,15 +157,15 @@ #imprints foreign Key from Imprint #iiep:imprint #collations = foreign Key from Collation #iiep:collation #volumeIssues = foreign Key from VolumeIssue #iiep:volumeIssue - projectNames = models.ManyToManyField('p4l.ProjectName') #iiep:projectName + projectNames = models.ManyToManyField('p4l.ProjectName') #iiep:projectName # #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.CorporateAuthor', related_name='recordsSubjectCorporateBody') #iiep:subjectCorporateBody + 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 + corporateAuthors = models.ManyToManyField('p4l.CorporateAuthor', related_name='recordsCorporateAuthor') #iiep:subjectCorporateBody # #urls foreign Key from Url #iiep:url recordType = models.URLField(max_length=2048) #dct:type diff -r be595253ced5 -r b31a67614f76 src/p4l/templates/p4l/p4l_home.html --- a/src/p4l/templates/p4l/p4l_home.html Mon Sep 02 11:45:01 2013 +0200 +++ b/src/p4l/templates/p4l/p4l_home.html Mon Sep 02 16:26:21 2013 +0200 @@ -42,7 +42,7 @@ {% for record in object_list %} {{ record.uri|reduce:"4,13" }} - {{ record.language.language|reduce:"0,3" }} + {{ record.language.uri|reduce:"0,3" }}
    {% for t in record.titles.all %}
  • {{ t.title }}
  • {% endfor %}
diff -r be595253ced5 -r b31a67614f76 src/p4l/templates/p4l/p4l_record_view.html --- a/src/p4l/templates/p4l/p4l_record_view.html Mon Sep 02 11:45:01 2013 +0200 +++ b/src/p4l/templates/p4l/p4l_record_view.html Mon Sep 02 16:26:21 2013 +0200 @@ -17,15 +17,15 @@ {% trans 'subjects' %} -
    {% for i in record.subjects.all %}
  • {{ i.label|default:'' }} ({{ i.subject|default:'' }})
  • {% endfor %}
+
    {% for k,v in subjects_labels.items %}
  • {{ v }} ({{ k }})
  • {% endfor %}
{% trans 'themes' %} -
    {% for i in record.themes.all %}
  • {{ i.label|default:'' }} ({{ i.theme|default:'' }})
  • {% endfor %}
+
    {% for k,v in themes_labels.items %}
  • {{ v }} ({{ k }})
  • {% endfor %}
{% trans 'countries' %} -
    {% for i in record.countries.all %}
  • {{ i.label|default:'' }} ({{ i.country|default:'' }})
  • {% endfor %}
+
    {% for k,v in countries_labels.items %}
  • {{ v }} ({{ k }})
  • {% endfor %}
{% trans 'identifier' %} @@ -49,11 +49,11 @@ {% trans 'language' %} - {{ record.language.label|default:'' }} ({{ record.language.language|default:'' }}) + {% if record.language %}{{ language_label }} ({{ record.language.uri|default:'' }}){% endif %} {% trans 'other languages' %} -
    {% for i in record.otherLanguages.all %}
  • {{ i.language|default:'' }}
  • {% endfor %}
+
    {% for k,v in otherLanguages_labels.items %}
  • {{ v }} ({{ k }})
  • {% endfor %}
{% trans 'titles' %} @@ -108,7 +108,7 @@ {% trans 'project names' %} -
    {% for i in record.projectNames.all %}
  • {% if i.acronym %}{{ i.acronym }} : {% endif %}{{ i.label|default:'' }}
  • {% endfor %}
+
    {% for k,v in projects_labels.items %}
  • {{ v }} ({{ k }})
  • {% endfor %}
{% trans 'periodicals' %}{# ajouter langue #} @@ -157,7 +157,7 @@ {% trans 'subject corporate bodies' %} -
    {% for i in record.subjectCorporateBodies.all %}
  • {% if i.acronym %}{{ i.acronym }} : {% endif %}{{ i.label|default:'' }}
  • {% endfor %}
+
    {% for k,v in subjectCorporateBodies_labels.items %}
  • {{ v }} ({{ k }})
  • {% endfor %}
{% trans 'subject meetings' %}{# ajouter langue #} @@ -179,7 +179,7 @@ {% trans 'corporate authors' %} -
    {% for i in record.corporateAuthors.all %}
  • {% if i.acronym %}{{ i.acronym }} : {% endif %}{{ i.label|default:'' }}
  • {% endfor %}
+
    {% for k,v in corporateAuthors_labels.items %}
  • {{ v }} ({{ k }})
  • {% endfor %}
{% trans 'Urls' %}{# ajouter langue #} @@ -199,12 +199,16 @@ {% trans 'record type' %} - {{ record.recordType|default:'' }} + {{ recordType_label }} ({{ record.recordType|default:'' }}) {% trans 'is document part' %} + + {% trans 'is multilingual' %} + +