Eksport atrybutu 'rok'; uzupełnienie parametrów eksportu możliwych do ustawienia…

… w interfejsie administratora (o 'homonym numbers' oraz 'form qualifiers'; poprawienie zachowania checkboxów przy odczytywaniu danych konfiguracji eksportu; wprowadzenie dodatkowych parametrów przy wywołaniu eksportu (--nocopyright oraz --exportyear)

Eksport atrybutu 'rok'; uzupełnienie parametrów eksportu możliwych do ustawienia…
… w interfejsie administratora (o 'homonym numbers' oraz 'form qualifiers'; poprawienie zachowania checkboxów przy odczytywaniu danych konfiguracji eksportu; wprowadzenie dodatkowych parametrów przy wywołaniu eksportu (--nocopyright oraz --exportyear)
Dorota Komosińska
1 parent d641183a
Showing 6 changed files with 79 additions and 15 deletions
dictionary/models.py
export/forms.py
export/lexeme_export.py
export/locale/pl/LC_MESSAGES/django.po
export/management/commands/export_lexemes.py
export/static/js/export.js
@@ -1129,8 +1129,8 @@ class SavedExportData(Model):
             'variant': temp_dict['variant'],
             'refl': bool(temp_dict.get('refl', False)),
             'commonness': bool(temp_dict.get('commonness', False)),
-            'form_qualifiers': True,
-            'homonym_numbers': True,
+            'form_qualifiers': bool(temp_dict.get('form_qualifiers', False)),
+            'homonym_numbers': bool(temp_dict.get('homonym_numbers', False)),
             'copyright': temp_dict['copyright'],
         }
         magic_ids = set()
@@ -19,6 +19,8 @@ class ExportForm(Form):
         label=_(u'variant'))
     refl = BooleanField(label=_(u'tags with "refl"'), required=False)
     commonness = BooleanField(label=_(u'commonness labels'), required=False)
+    homonym_numbers = BooleanField(label=_(u'homonym numbers'), required=False)
+    form_qualifiers = BooleanField(label=_(u'form qualifiers'), required=False)
     copyright = CharField(widget=Textarea(attrs={'cols': 80, 'rows': 40}))
     # excluding_qualifiers = QualifiersField(
     #     required=False, label=_(u'excluding qualifiers'))
@@ -68,9 +68,10 @@ class LexemeExport(object):
         'appas': 'v',
     }
  
-    def __init__(self, export_data_name=None, data=None, output_file=None):
+    def __init__(self, export_data_name=None, nocopy_flag = None, expyear_flag = None, data=None, output_file=None):
         self.homonym_entries = None
         self.homonyms_with_numbers = None
+        
         if export_data_name:
             export_data = SavedExportData.objects.get(name=export_data_name)
             self.data = export_data.get_data()
@@ -88,7 +89,15 @@ class LexemeExport(object):
                 'copyright': u'',
             }
         self.output_file = output_file or sys.stdout
-        self.copyright_file = open('copyright.txt', 'w')
+        if expyear_flag:
+            try:
+                self.YEAR_ATTR = LexemeAttribute.objects.get(name=u'rok')
+            except LexemeAttribute.DoesNotExist:
+                self.YEAR_ATTR = None
+        else:
+            self.YEAR_ATTR = None
+        self.nocopy = nocopy_flag
+#        self.copyright_file = open('copyright.txt', 'w')
         self.vocabs_placeholders = ', '.join('%s' for v in self.data['vocabs'])
  
         if self.data['antivocabs']:
@@ -149,6 +158,14 @@ class LexemeExport(object):
                 select qualifier_id from kwalifikatory_zakonczen
                 where ending_id = z.id)))
         '''
+        
+        self.year_select = ''',
+        (select string_agg(lavalue.value, '|')
+        from dictionary_lexemeattributevalue lavalue inner join dictionary_lexemeattribute la on lavalue.attribute_id = la.id
+        inner join dictionary_lexemeav lav on lavalue.id = lav.attribute_value_id
+        where la.name = 'rok' and lav.lexeme_id = l.id)
+        '''
+
         self.commonness_select = ''',
         (select string_agg(nazwa, '|')
         from wartosci_klasyfikacji
@@ -246,6 +263,17 @@ class LexemeExport(object):
             quals = row[i]
             if UNDERSCORES and quals:
                 quals = quals.replace(' ', '_')
+            try:
+                if row[i+1]:
+                    year_attr = row[i+1].strip()
+                else:
+                    year_attr = None
+                if quals and year_attr:
+                    quals = quals + u'|' + year_attr
+                elif year_attr:
+                    quals = year_attr
+            except IndexError:
+                pass
         if self.data['homonym_numbers'] and entry in self.homonym_entries:
             if (entry, main_pos) in self.homonyms_with_numbers:
                 assert hn
@@ -297,7 +325,7 @@ class LexemeExport(object):
         if not nested:
             params = self.params_part + flatten(self.data['magic_qualifiers'])
             query = """
-select distinct l.id, haslo, %(select)s %(clas_field)s %(qual_field)s
+select distinct l.id, haslo, %(select)s %(clas_field)s %(qual_field)s %(year_attr)s
     %(table_joins)s
     left join dictionary_lexemeav refl
         on (l.id = refl.lexeme_id and %(refl)s)
@@ -310,7 +338,7 @@ where ls.slownik in (%(vocabs)s) and %(antivocabs)s %(x_qual)s %(table_clause)s
         else:
             params = self.params_part
             query = """
-select distinct g.id, g.haslo as haslo, %(select)s %(clas_field)s %(qual_field)s
+select distinct g.id, g.haslo as haslo, %(select)s %(clas_field)s %(qual_field)s %(year_attr)s
     %(table_joins)s
     join odsylacze on l.id=l_id_od
     join leksemy g on (l_id_do=g.id and g.usuniety = false)
@@ -332,6 +360,8 @@ where ls.slownik in (%(vocabs)s) and %(antivocabs)s %(x_qual)s %(table_clause)s
                 self.commonness_select if self.data['commonness'] else '',
             'qual_field':
                 self.qualifier_select if self.data['form_qualifiers'] else '',
+            'year_attr':
+                self.year_select if self.data['form_qualifiers'] and self.YEAR_ATTR else '',
             'select': self.select,
             'table_joins': self.table_joins,
             'table_clause': self.table_clause,
@@ -363,6 +393,12 @@ where ls.slownik in (%(vocabs)s) and %(antivocabs)s %(x_qual)s %(table_clause)s
                 if self.data['form_qualifiers']:
                     quals = '|'.join(skr.qualifiers.values_list(
                         'label', flat=True))
+                    if self.YEAR_ATTR:
+                        year_attr = skr.attribute_value(self.YEAR_ATTR)
+                        if quals and year_attr:
+                            quals = quals + u'|' + year_attr.value
+                        elif year_attr:
+                            quals = year_attr.value
                     output_row += (quals,)
                 acc.append(output_row)
  
@@ -414,7 +450,8 @@ where ls.slownik in (%(vocabs)s) and %(antivocabs)s %(x_qual)s %(table_clause)s
             'month': today.month,
             'day': today.day,
         }
-        if copyright:
+        if copyright and not self.nocopy:
+            self.copyright_file = open('copyright.txt', 'w')
             uniprint(copyright, file=self.copyright_file)
         for r in export_data:
             uniprint(
@@ -7,7 +7,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-25 17:56+0100\n"
+"POT-Creation-Date: 2017-02-24 12:27+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,11 +38,19 @@ msgstr &quot;tagi z \&quot;refl\&quot;&quot;
 msgid "commonness labels"
 msgstr "etykiety pospolitości"
  
-#: forms.py:28
+#: forms.py:22
+msgid "homonym numbers"
+msgstr "rozpodabniacze"
+
+#: forms.py:23
+msgid "form qualifiers"
+msgstr "kwalifikatory"
+
+#: forms.py:30
 msgid "lexeme qual."
 msgstr "kwal. leksemu"
  
-#: forms.py:29
+#: forms.py:31
 msgid "tag pattern"
 msgstr "wzorzec tagu"
  
@@ -8,5 +8,19 @@ class Command(BaseCommand):
     help = 'Temporary export script'
     args = 'export_data'
  
+    def add_arguments(self, parser):
+        # Named (optional) arguments
+        parser.add_argument('--nocopyright',
+            action='store_true',
+            dest='nocopy',
+            default=False,
+            help='Do not create copyright.txt file.')
+        parser.add_argument('--exportyear',
+            action='store_true',
+            dest='expyear',
+            default=False,
+            help='Export "year" attribute with lexeme qualifiers.')
+
+
     def handle(self, export_data=None, **options):
-        LexemeExport(export_data_name=export_data).export()
+        LexemeExport(export_data_name=export_data, nocopy_flag=options['nocopy'], expyear_flag=options['expyear']).export()
@@ -82,8 +82,10 @@ function put_data(json) {
     "use strict";
     var data = $.parseJSON(json),
         qualifier_rows = {}, vocabs = [], antivocabs = [], parts;
-    $('#id_refl').attr('checked', false);
-    $('#id_commonness').attr('checked', false);
+    $('#id_refl').prop('checked', false);
+    $('#id_commonness').prop('checked', false);
+    $('#id_homonym_numbers').prop('checked', false);
+    $('#id_form_qualifiers').prop('checked', false);
     $('#magic-qualifiers').find('li').remove();
     $.each(data, function (i, item) {
         if (item.name === 'vocabs') {
@@ -95,8 +97,9 @@ function put_data(json) {
         if (item.name === 'variant') {
             $('#id_variant').val(item.value);
         }
-        if (item.name === 'refl' || item.name === 'commonness') {
-            $('#id_' + item.name).attr('checked', true);
+        if (item.name === 'refl' || item.name === 'commonness' || item.name === 'homonym_numbers' || item.name === 'form_qualifiers') {
+            $('#id_' + item.name).prop('checked', true);
+//            $('#id_' + item.name).attr('checked', true);
         }
         if (item.name.indexOf('magic') === 0) {
             parts = item.name.split('-');