# HG changeset patch
# User cavaliet
# Date 1379583576 -7200
# Node ID 5b076700ac05b181d1ab50d7082b703a05494c0c
# Parent  0d54489e8b266112e63db271ee3a029c4db0fcf4
Debug and coherent field names

diff -r 0d54489e8b26 -r 5b076700ac05 src/p4l/management/commands/import_record.py
--- a/src/p4l/management/commands/import_record.py	Wed Sep 18 16:49:58 2013 +0200
+++ b/src/p4l/management/commands/import_record.py	Thu Sep 19 11:39:36 2013 +0200
@@ -139,8 +139,14 @@
         record.notes = self.extract_single_value_form_graph(graph,"SELECT DISTINCT ?o WHERE { ?s iiep:notes ?o .}", bindings={'s':URIRef(record.uri)})
         record.recordType = self.extract_single_value_form_graph(graph,"SELECT DISTINCT ?o WHERE { ?s dct:type ?o .}", bindings={'s':URIRef(record.uri)})
         record.isDocumentPart = self.extract_single_value_form_graph(graph,"SELECT DISTINCT ?o WHERE { ?s iiep:isDocumentPart ?o .}", bindings={'s':URIRef(record.uri)}, convert=self.convert_bool)
-        record.isMultilingual = self.extract_single_value_form_graph(graph,"SELECT DISTINCT ?o WHERE { ?s iiep:isMultilingual ?o .}", bindings={'s':URIRef(record.uri)}, convert=self.convert_bool)        
+        record.hidden = self.extract_single_value_form_graph(graph,"SELECT DISTINCT ?o WHERE { ?s iiep:hidden ?o .}", bindings={'s':URIRef(record.uri)}, convert=self.convert_bool)
+        if record.hidden is None:
+            record.hidden = False
+        record.restricted = self.extract_single_value_form_graph(graph,"SELECT DISTINCT ?o WHERE { ?s iiep:restricted ?o .}", bindings={'s':URIRef(record.uri)}, convert=self.convert_bool)
+        if record.restricted is None:
+            record.restricted = False
         record.editionStatement = self.extract_single_value_form_graph(graph,"SELECT DISTINCT ?o WHERE { ?s iiep:editionStatement ?o .}", bindings={'s':URIRef(record.uri)})
+        record.corporateAuthorLabel = self.extract_single_value_form_graph(graph,"SELECT DISTINCT ?o WHERE { ?s iiep:corporateAuthorLabel ?o .}", bindings={'s':URIRef(record.uri)})
 
         language = self.extract_single_value_form_graph(graph,"SELECT DISTINCT ?o WHERE { ?s dct:language ?o .}", bindings={'s':URIRef(record.uri)})
         if language:
@@ -155,6 +161,7 @@
         self.add_to_related_collection(record.authors, graph, ['name'], "SELECT ?o WHERE { ?s iiep:author ?o .}", bindings={'s':URIRef(record.uri)})
         self.add_to_related_collection(record.subjectPersons, graph, ['name'], "SELECT ?o WHERE { ?s iiep:subjectPerson ?o .}", bindings={'s':URIRef(record.uri)})
         self.add_to_related_collection(record.projectNames, graph, ['uri'], "SELECT ?o WHERE { ?s iiep:projectName ?o . }")
+        self.add_to_related_collection(record.audiences, graph,  ['uri'], "SELECT ?o WHERE { ?s dct:audience ?o .}", bindings={'s':URIRef(record.uri)})
 
         self.add_to_related_collection(
             record.periodicals,
@@ -285,7 +292,7 @@
             record.urls,
             graph,
             ['address', 'display'],
-            "SELECT ?a ?d WHERE { [ iiep:url ?bnode ]. OPTIONAL { ?bnode iiep:address ?a }. OPTIONAL { ?bnode iiep:display ?d }. OPTIONAL { ?bnode iiep:accessLevel ?al }.}",
+            "SELECT ?a ?d WHERE { [ iiep:url ?bnode ]. OPTIONAL { ?bnode iiep:address ?a }. OPTIONAL { ?bnode iiep:display ?d }.}",
         )
 
         return record
diff -r 0d54489e8b26 -r 5b076700ac05 src/p4l/migrations/0001_initial.py
--- a/src/p4l/migrations/0001_initial.py	Wed Sep 18 16:49:58 2013 +0200
+++ b/src/p4l/migrations/0001_initial.py	Thu Sep 19 11:39:36 2013 +0200
@@ -230,8 +230,8 @@
             ('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)),
-            ('isHidden', self.gf('django.db.models.fields.BooleanField')(default=False)),
-            ('isRestricted', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('hidden', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('restricted', self.gf('django.db.models.fields.BooleanField')(default=False)),
         ))
         db.send_create_signal('p4l', ['Record'])
 
@@ -571,16 +571,16 @@
             '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'}),
+            'hidden': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             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'}),
-            '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']"}),
             'projectNames': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['p4l.ProjectName']", 'symmetrical': 'False'}),
             'recordType': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+            'restricted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'subjectCorporateBodies': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'recordsSubjectCorporateBody'", 'symmetrical': 'False', 'to': "orm['p4l.CorporateAuthor']"}),
             'subjects': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['p4l.Subject']", 'symmetrical': 'False'}),
             'themes': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['p4l.Theme']", 'symmetrical': 'False'}),
diff -r 0d54489e8b26 -r 5b076700ac05 src/p4l/models/data.py
--- a/src/p4l/models/data.py	Wed Sep 18 16:49:58 2013 +0200
+++ b/src/p4l/models/data.py	Thu Sep 19 11:39:36 2013 +0200
@@ -166,12 +166,12 @@
     corporateAuthors = models.ManyToManyField('p4l.CorporateAuthor', related_name='recordsCorporateAuthor') #iiep:subjectCorporateBody # <Organizations>
     corporateAuthorLabel = models.CharField(max_length=2048, blank=True, null=True, db_index=True) #iiep:corporateAuthorLabel
     #urls foreign Key from Url #iiep:url
-    audiences = models.ManyToManyField('p4l.Audience') #dct:audience                                                      # Unknow thesaurus
+    audiences = models.ManyToManyField('p4l.Audience') #dct:audience                                                      # Unknown thesaurus
     recordType = models.URLField(max_length=2048, blank=True, null=True) #dct:type                                        # <DocumentType>
     
     isDocumentPart = models.BooleanField() #iiep:isDocumentPart
-    isHidden = models.BooleanField() #iiep:hidden
-    isRestricted = models.BooleanField() #iiep:restricted
+    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]))
diff -r 0d54489e8b26 -r 5b076700ac05 src/p4l/templates/p4l/p4l_record_view.html
--- a/src/p4l/templates/p4l/p4l_record_view.html	Wed Sep 18 16:49:58 2013 +0200
+++ b/src/p4l/templates/p4l/p4l_record_view.html	Thu Sep 19 11:39:36 2013 +0200
@@ -193,7 +193,7 @@
     </tr>
     <tr>
       <td>{% trans 'corporate author label' %}</td>
-      <td>{{ record.corporateAuthorLabel }}</td>
+      <td>{{ record.corporateAuthorLabel|default:'' }}</td>
     </tr>
     <tr>
       <td>{% trans 'Urls' %}</td>
diff -r 0d54489e8b26 -r 5b076700ac05 src/p4l/templates/p4l/record_update_form.html
--- a/src/p4l/templates/p4l/record_update_form.html	Wed Sep 18 16:49:58 2013 +0200
+++ b/src/p4l/templates/p4l/record_update_form.html	Thu Sep 19 11:39:36 2013 +0200
@@ -189,7 +189,7 @@
       <td><add-sem-uri list="record.corporateAuthors" listname="organizations" placeholder="{{'Add a new organization' | translate}}"></add-sem-uri></td>
     </tr>
     <tr>
-      <td>{{ 'corporate authors label' | translate }}</td>
+      <td>{{ 'corporate author label' | translate }}</td>
       <td><input type="text" class="form-control" ng-model="record.corporateAuthorLabel" /></td>
     </tr>
     <tr>