# HG changeset patch
# User cavaliet
# Date 1378132828 -7200
# Node ID 6b45fd23e4a0c0ed288631d8f96c152e05e99cce
# Parent  88d675d5e27e2e87fc4e55f9ecce9e4ca68f6cfa
update models without labels and acronyms

diff -r 88d675d5e27e -r 6b45fd23e4a0 src/p4l/migrations/0001_initial.py
--- a/src/p4l/migrations/0001_initial.py	Mon Sep 02 16:27:06 2013 +0200
+++ b/src/p4l/migrations/0001_initial.py	Mon Sep 02 16:40:28 2013 +0200
@@ -33,26 +33,16 @@
         db.create_table(u'p4l_projectname', (
             (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)),
-            ('label', self.gf('django.db.models.fields.CharField')(max_length=2048, db_index=True)),
-            ('acronym', self.gf('django.db.models.fields.CharField')(db_index=True, max_length=2048, null=True, blank=True)),
         ))
         db.send_create_signal('p4l', ['ProjectName'])
 
-        # Adding unique constraint on 'ProjectName', fields ['label', 'acronym']
-        db.create_unique(u'p4l_projectname', ['label', 'acronym'])
-
         # Adding model 'CorporateAuthor'
         db.create_table(u'p4l_corporateauthor', (
             (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)),
-            ('label', self.gf('django.db.models.fields.CharField')(db_index=True, max_length=2048, null=True, blank=True)),
-            ('acronym', self.gf('django.db.models.fields.CharField')(db_index=True, max_length=2048, null=True, blank=True)),
         ))
         db.send_create_signal('p4l', ['CorporateAuthor'])
 
-        # Adding unique constraint on 'CorporateAuthor', fields ['label', 'acronym']
-        db.create_unique(u'p4l_corporateauthor', ['label', 'acronym'])
-
         # Adding model 'Url'
         db.create_table(u'p4l_url', (
             (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
@@ -67,7 +57,6 @@
         db.create_table(u'p4l_subject', (
             (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)),
-            ('label', self.gf('django.db.models.fields.CharField')(db_index=True, max_length=2048, null=True, blank=True)),
         ))
         db.send_create_signal('p4l', ['Subject'])
 
@@ -75,7 +64,6 @@
         db.create_table(u'p4l_theme', (
             (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)),
-            ('label', self.gf('django.db.models.fields.CharField')(db_index=True, max_length=2048, null=True, blank=True)),
         ))
         db.send_create_signal('p4l', ['Theme'])
 
@@ -83,7 +71,6 @@
         db.create_table(u'p4l_country', (
             (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)),
-            ('label', self.gf('django.db.models.fields.CharField')(db_index=True, max_length=2048, null=True, blank=True)),
         ))
         db.send_create_signal('p4l', ['Country'])
 
@@ -118,7 +105,6 @@
         db.create_table(u'p4l_language', (
             (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)),
-            ('label', self.gf('django.db.models.fields.CharField')(db_index=True, max_length=2048, null=True, blank=True)),
         ))
         db.send_create_signal('p4l', ['Language'])
 
@@ -332,12 +318,6 @@
 
 
     def backwards(self, orm):
-        # Removing unique constraint on 'CorporateAuthor', fields ['label', 'acronym']
-        db.delete_unique(u'p4l_corporateauthor', ['label', 'acronym'])
-
-        # Removing unique constraint on 'ProjectName', fields ['label', 'acronym']
-        db.delete_unique(u'p4l_projectname', ['label', 'acronym'])
-
         # Deleting model 'Imprint'
         db.delete_table(u'p4l_imprint')
 
@@ -490,16 +470,13 @@
             'record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'collations'", 'to': "orm['p4l.Record']"})
         },
         'p4l.corporateauthor': {
-            'Meta': {'unique_together': "(['label', 'acronym'],)", 'object_name': 'CorporateAuthor'},
-            'acronym': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+            'Meta': {'object_name': 'CorporateAuthor'},
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'label': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
             'uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
         },
         'p4l.country': {
             'Meta': {'object_name': 'Country'},
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'label': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
             'uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
         },
         'p4l.documentcode': {
@@ -535,7 +512,6 @@
         'p4l.language': {
             'Meta': {'object_name': 'Language'},
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'label': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
             'uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
         },
         'p4l.meeting': {
@@ -557,10 +533,8 @@
             'record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'periodicals'", 'to': "orm['p4l.Record']"})
         },
         'p4l.projectname': {
-            'Meta': {'unique_together': "(['label', 'acronym'],)", 'object_name': 'ProjectName'},
-            'acronym': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+            'Meta': {'object_name': 'ProjectName'},
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'db_index': 'True'}),
             'uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
         },
         'p4l.record': {
@@ -593,7 +567,6 @@
         'p4l.subject': {
             'Meta': {'object_name': 'Subject'},
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'label': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
             'uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
         },
         'p4l.subjectmeeting': {
@@ -615,7 +588,6 @@
         'p4l.theme': {
             'Meta': {'object_name': 'Theme'},
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'label': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
             'uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
         },
         'p4l.title': {
diff -r 88d675d5e27e -r 6b45fd23e4a0 src/p4l/models/data.py
--- a/src/p4l/models/data.py	Mon Sep 02 16:27:06 2013 +0200
+++ b/src/p4l/models/data.py	Mon Sep 02 16:40:28 2013 +0200
@@ -19,18 +19,18 @@
 
 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        # 
-    class Meta(P4lModel.Meta):
-        unique_together = ['label', 'acronym']
+#    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 CorporateAuthor(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)
-    acronym = models.CharField(max_length=2048, blank=True, null=True, db_index=True) #iiep:acronym    
-    class Meta(P4lModel.Meta):
-        unique_together = ['label','acronym']
+#    label = models.CharField(max_length=2048, blank=True, null=True, 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", db_index=True)
@@ -41,16 +41,16 @@
 
 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
+    #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
+    #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
+    #label = models.CharField(max_length=2048, blank=True, null=True, db_index=True) # filled from sparql request after import
 
 
 class Isbn(P4lModelLang):
@@ -68,7 +68,7 @@
 
 class Language(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
+    #label = models.CharField(max_length=2048, blank=True, null=True, db_index=True) # filled from sparql request after import
 
 class BaseTitle(P4lModelLang):
     title = models.CharField(max_length=2048, blank=False, null=False, db_index=True)