automatyczny id leksemów

--HG-- branch : beta

automatyczny id leksemów
--HG-- branch : beta
janek@kublik
1 parent e863450e
Showing 5 changed files with 34 additions and 42 deletions
dictionary/ajax_lexeme_view.py
dictionary/auto_derivatives.py
dictionary/management/commands/import_skr.py
dictionary/management/commands/import_witek.py
dictionary/migrations/0021_auto_20160115_1328.py
 # -*- coding: utf-8 -*-
 from django.core.cache import cache
-from django.db.models import Max
 from django.shortcuts import get_object_or_404
 from django.utils import timezone
 from django.utils.encoding import force_unicode
@@ -529,7 +528,8 @@ def update_back_references(request, deleted_cr, created_cr):
  
 def update_lexeme_qualifiers(lexeme, user, form_dict, form_data):
     owner = lexeme.owner_vocabulary
-    editable_vocabs = Vocabulary.editable_vocabularies(user).exclude(pk=owner.pk)
+    editable_vocabs = Vocabulary.editable_vocabularies(user)\
+        .exclude(pk=owner.pk)
     # l_editable_vocabs = lexeme.editable_vocabularies(user)
     l_editable_vocabs = Vocabulary.editable_vocabularies(user)
     qualifiers = Qualifier.objects.filter(vocabulary__in=l_editable_vocabs)
@@ -585,22 +585,15 @@ def check_pos(request, pos_id, had_gender):
         return {'answer': 'no'}
  
  
-START_ID = 1000000
-
-
 @ajax(method='post')
 def create_lexeme(request):
     owner = request.user.usersettings.get_default_owner()
     pos_id = request.user.usersettings.default_pos_id or 'subst'
     if not owner:
         raise AjaxError(_(u'Empty owner dictionary'))
-    next_id = Lexeme.all_objects.filter(
-        pk__gte=START_ID).aggregate(Max('id'))['id__max']
-    next_id = next_id + 1 if next_id else START_ID
     l = Lexeme.objects.create(
-        id=next_id, part_of_speech_id=pos_id,
-        owner_vocabulary=owner, status=Lexeme.STATUS_CANDIDATE,
-        responsible=request.user, deleted=True)
+        part_of_speech_id=pos_id, owner_vocabulary=owner,
+        status=Lexeme.STATUS_CANDIDATE, responsible=request.user, deleted=True)
     owner.add_lexeme(l)
     return {'id': l.id}
  
@@ -614,17 +607,14 @@ def clone_lexeme(request, lexeme_id):
     owner = request.user.usersettings.get_default_owner()
     if not owner:
         raise AjaxError(_(u'Empty owner dictionary'))
-    next_id = Lexeme.all_objects.filter(
-        pk__gte=START_ID).aggregate(Max('id'))['id__max']
-    next_id = next_id + 1 if next_id else START_ID
-    comment = u'Leksem sklonowany %s – z %s' % (format_date(timezone.now()), lexeme.entry)
+    comment = u'Leksem sklonowany %s – z %s' % (
+        format_date(timezone.now()), lexeme.entry)
     new_lexeme = Lexeme.objects.create(
-        id=next_id, part_of_speech_id=lexeme.part_of_speech_id,
-        entry=lexeme.entry, pronunciation=lexeme.pronunciation,
-        valence=lexeme.valence, source=lexeme.source,
-        borrowing_source_id=lexeme.borrowing_source_id, note=lexeme.note,
-        extended_note=lexeme.extended_note, specialist=lexeme.specialist,
-        status=lexeme.status, comment=comment,
+        part_of_speech_id=lexeme.part_of_speech_id, entry=lexeme.entry,
+        pronunciation=lexeme.pronunciation, valence=lexeme.valence,
+        source=lexeme.source, borrowing_source_id=lexeme.borrowing_source_id,
+        note=lexeme.note, extended_note=lexeme.extended_note,
+        specialist=lexeme.specialist, status=lexeme.status, comment=comment,
         owner_vocabulary_id=owner, responsible=request.user)
     owner.add_lexeme(new_lexeme)
     new_lexeme.fix_homonym_number()  # nie zadziałał :/
 # -*- coding: utf-8 -*-
-from django.db.models import Max
 from dictionary.models import Lexeme, Inflection, Gender, LexemeAttribute, \
     LexemeAttributeValue, REVERSE_CR_TYPE
 from patterns.models import Pattern, Ending
@@ -153,10 +152,9 @@ def lexeme_derivatives(lexeme):
  
 def create_derivative(lexeme, part_of_speech, cr_type, entry, index, pl=None):
     negation = cr_type.endswith('nie')
-    next_id = Lexeme.all_objects.aggregate(Max('id'))['id__max'] + 1
     der = Lexeme.objects.create(
-        id=next_id, entry=entry, part_of_speech_id=part_of_speech,
-        status=lexeme.status, owner_vocabulary_id=lexeme.owner_vocabulary_id,
+        entry=entry, part_of_speech_id=part_of_speech, status=lexeme.status,
+        owner_vocabulary_id=lexeme.owner_vocabulary_id,
         specialist=lexeme.specialist,
         borrowing_source_id=lexeme.borrowing_source_id)
     der.fix_homonym_number()
@@ -2,7 +2,6 @@
  
 from django.db import connection
 from django.core.management.base import BaseCommand
-from django.db.models import Max
 from django.db.transaction import atomic
  
 from common.util import no_history, get_cursor
@@ -54,7 +53,6 @@ def import_skr(db_name):
             name=attr_name, closed=closed)
         la.parts_of_speech = ('skrl', 'skrw', 'skrf')
         attrs[attr_name] = la
-    next_id = Lexeme.objects.aggregate(Max('id'))['id__max'] + 1
  
     for row in sqlite_cursor.execute('SELECT * FROM skroty'):
         entry = row['leksem']
@@ -75,9 +73,8 @@ def import_skr(db_name):
                 comment = row['motywacja']
         l = Lexeme.objects.create(
             entry=entry, part_of_speech_id=pos, valence=valence, source=source,
-            comment=comment, owner_vocabulary=vocab, status=status, id=next_id,
+            comment=comment, owner_vocabulary=vocab, status=status,
             source_id=row['Identyfikator'])
-        next_id += 1
         vocab.add_lexeme(l)
         Inflection.objects.create(
             lexeme=l, pattern=pattern, index=1, root=entry)
 # -*- coding: utf-8 -*-
 import sys
 from django.core.management.base import BaseCommand
-from django.db.models import Max
 from django.db.transaction import atomic
  
 from common.util import uniopen, no_history
@@ -34,19 +33,10 @@ def import_lexemes(lines, comment):
             import_adj(elements, comment)
  
  
-next_id = None
-
-
 def new_lexeme(entry, pos, comment):
-    global next_id
-    if next_id:
-        next_id += 1
-    else:
-        next_id = Lexeme.all_objects.aggregate(Max('id'))['id__max'] + 1
     l = Lexeme(
-        id=next_id, entry=entry, part_of_speech_id=pos,
-        status=Lexeme.STATUS_DESCRIBED, owner_vocabulary_id=WSJP,
-        comment=comment)
+        entry=entry, part_of_speech_id=pos, status=Lexeme.STATUS_DESCRIBED,
+        owner_vocabulary_id=WSJP, comment=comment)
     l.save()
     WSJP.add_lexeme(l)
     return l
@@ -145,4 +135,4 @@ def import_adj(elements, comment):
     pattern = Pattern.objects.get(name=pattern_name)
     inflection = Inflection(lexeme=l, index=1, pattern=pattern)
     inflection.root = inflection.get_root()
-    inflection.save()
 \ No newline at end of file
+    inflection.save()
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dictionary', '0020_auto_20151223_1151'),
+    ]
+
+    operations = [
+        migrations.RunSQL(
+            "SELECT setval('leksemy_id_seq', "
+            "COALESCE((SELECT MAX(id)+1 FROM leksemy), 1), false);"),
+    ]