new version 1.2.1

prrvchr · Mar 14, 2024 · 2452cbd · 2452cbd
1 parent 16f83f6
commit 2452cbd
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@
 
 **The use of this software subjects you to our [Terms Of Use][4] and [Data Protection Policy][5].**
 
-# version [1.2.0][6]
+# version [1.2.1][6]
 
 ## Introduction:
 
@@ -405,7 +405,11 @@ ___
   `pip install requirements.txt`
 - Modification of the [Requirement][90] section.
 
-### What remains to be done for version 1.2.0:
+### What has been done for version 1.2.1:
+
+- Integration of a fix to workaround the [issue #159988][91].
+
+### What remains to be done for version 1.2.1:
 
 - Add new languages for internationalization...
 
@@ -449,7 +453,7 @@ ___
 [37]: <https://img.shields.io/github/v/tag/prrvchr/mContactOOo?label=latest#right>
 [38]: <https://prrvchr.github.io/eMailerOOo/img/eMailerOOo.svg#middle>
 [39]: <https://github.com/prrvchr/eMailerOOo/releases/latest/download/eMailerOOo.oxt>
-[40]: <https://img.shields.io/github/downloads/prrvchr/eMailerOOo/latest/total?label=v1.2.0#right>
+[40]: <https://img.shields.io/github/downloads/prrvchr/eMailerOOo/latest/total?label=v1.2.1#right>
 [41]: <https://prrvchr.github.io/eMailerOOo/#merge-emails-with-mailing-lists>
 [42]: <https://prrvchr.github.io/eMailerOOo/#configure-connection>
 [43]: <https://prrvchr.github.io/eMailerOOo/#outgoing-emails>
@@ -500,3 +504,4 @@ ___
 [88]: <https://github.com/prrvchr/eMailerOOo/releases/latest/download/requirements.txt>
 [89]: <https://peps.python.org/pep-0508/>
 [90]: <https://prrvchr.github.io/eMailerOOo/#requirement>
+[91]: <https://bugs.documentfoundation.org/show_bug.cgi?id=159988>
diff --git a/README_fr.md b/README_fr.md
@@ -29,7 +29,7 @@
 
 **L'utilisation de ce logiciel vous soumet à nos [Conditions d'utilisation][4] et à notre [Politique de protection des données][5].**
 
-# version [1.2.0][6]
+# version [1.2.1][6]
 
 ## Introduction:
 
@@ -405,7 +405,11 @@ ___
   `pip install requirements.txt`
 - Modification de la section [Prérequis][90].
 
-### Que reste-t-il à faire pour la version 1.2.0:
+### Ce qui a été fait pour la version 1.2.1:
+
+- Intégration d'un correctif pour contourner le [dysfonctionnement #159988][91].
+
+### Que reste-t-il à faire pour la version 1.2.1:
 
 - Ajouter de nouvelles langues pour l’internationalisation...
 
@@ -449,7 +453,7 @@ ___
 [37]: <https://img.shields.io/github/v/tag/prrvchr/mContactOOo?label=latest#right>
 [38]: <https://prrvchr.github.io/eMailerOOo/img/eMailerOOo.svg#middle>
 [39]: <https://github.com/prrvchr/eMailerOOo/releases/latest/download/eMailerOOo.oxt>
-[40]: <https://img.shields.io/github/downloads/prrvchr/eMailerOOo/latest/total?label=v1.2.0#right>
+[40]: <https://img.shields.io/github/downloads/prrvchr/eMailerOOo/latest/total?label=v1.2.1#right>
 [41]: <https://prrvchr.github.io/eMailerOOo/README_fr#publipostage-de-courriels-avec-des-listes-de-diffusion>
 [42]: <https://prrvchr.github.io/eMailerOOo/README_fr#configuration-de-la-connexion>
 [43]: <https://prrvchr.github.io/eMailerOOo/README_fr#courriels-sortants>
@@ -500,3 +504,4 @@ ___
 [88]: <https://github.com/prrvchr/eMailerOOo/releases/latest/download/requirements.txt>
 [89]: <https://peps.python.org/pep-0508/>
 [90]: <https://prrvchr.github.io/eMailerOOo/README_fr#pr%C3%A9requis>
+[91]: <https://bugs.documentfoundation.org/show_bug.cgi?id=159988>
diff --git a/eMailerOOo.update.xml b/eMailerOOo.update.xml
@@ -28,18 +28,19 @@
   xmlns="http://openoffice.org/extensions/update/2006"
   xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="io.github.prrvchr.eMailerOOo"/>
-    <version value="1.2.0" />
+    <version value="1.2.1"/>
     <update-download>
         <src xlink:href="https://github.com/prrvchr/eMailerOOo/releases/latest/download/eMailerOOo.oxt"/>
     </update-download>
     <dependencies xmlns:dep="http://openoffice.org/extensions/description/2006">
-        <dep:OpenOffice.org-minimal-version value="4.0" dep:name="OpenOffice.org 4.0"/>
+        <dep:OpenOffice.org-minimal-version value="4.1" dep:name="OpenOffice.org 4.1"/>
     </dependencies>
     <publisher>
-        <name xlink:href="https://github.com/prrvchr/eMailerOOo" lang="en">eMailerOOo</name>
+        <name xlink:href="https://prrvchr.github.io/eMailerOOo/" lang="en">eMailerOOo</name>
+        <name xlink:href="https://prrvchr.github.io/eMailerOOo/README_fr" lang="fr">eMailerOOo</name>
     </publisher>
     <release-notes>
-        <src xlink:href="https://prrvchr.github.io/eMailerOOo/#historical" lang="en" />
-        <src xlink:href="https://prrvchr.github.io/eMailerOOo/README_fr#historique" lang="fr" />
+        <src xlink:href="https://prrvchr.github.io/eMailerOOo/#what-has-been-done-for-version-121" lang="en"/>
+        <src xlink:href="https://prrvchr.github.io/eMailerOOo/README_fr#ce-qui-a-%C3%A9t%C3%A9-fait-pour-la-version-121" lang="fr"/>
     </release-notes>
 </description>
diff --git a/source/eMailerOOo/description.xml b/source/eMailerOOo/description.xml
@@ -25,14 +25,14 @@
 ╚════════════════════════════════════════════════════════════════════════════════════╝
 -->
 <description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <version value="1.2.0"/>
+  <version value="1.2.1"/>
   <identifier value="io.github.prrvchr.eMailerOOo"/>
   <platform value="all"/>
   <dependencies>
     <OpenOffice.org-minimal-version value="4.1" d:name="OpenOffice.org 4.1"/>
   </dependencies>
   <update-information>
-    <src xlink:href="https://prrvchr.github.io/eMailerOOo/eMailerOOo.update.xml"/>
+    <src xlink:href="https://github.com/prrvchr/eMailerOOo/releases/latest/download/eMailerOOo.update.xml"/>
   </update-information>
   <publisher>
     <name xlink:href="https://prrvchr.github.io/eMailerOOo/" lang="en">Send email in LibreOffice</name>

diff --git a/source/eMailerOOo/service/pythonpath/emailer/merger/mergermodel.py b/source/eMailerOOo/service/pythonpath/emailer/merger/mergermodel.py
@@ -101,7 +101,7 @@ def __init__(self, ctx, datasource):
         self._name = None
         self._labeler = None
         self._nominator = None
-        self._quoted = False
+        self._quoted = True
         self._quote = ''
         self._rows = ()
         self._tables = {}
@@ -117,18 +117,18 @@ def __init__(self, ctx, datasource):
         self._lock = Condition()
         self._service = 'com.sun.star.sdb.SingleSelectQueryComposer'
         self._url = getResourceLocation(ctx, g_identifier, g_extension)
-        self._resources = {'Step': 'MergerPage%s.Step',
-                           'Title': 'MergerPage%s.Title',
-                           'TabTitle': 'MergerTab%s.Title',
-                           'Progress': 'MergerPage1.Label6.Label.%s',
-                           'Error': 'MergerPage1.Label8.Label.%s',
-                           'Index': 'MergerPage1.Label14.Label.%s',
-                           'Query': 'MergerTab2.Label1.Label',
-                           'Recipient': 'MailWindow.Label4.Label',
-                           'PickerTitle': 'Mail.FilePicker.Title',
-                           'Property': 'Mail.Document.Property.%s',
-                           'Document': 'MailWindow.Label8.Label.1',
-                           'DialogTitle': 'MessageBox.Title',
+        self._resources = {'Step':          'MergerPage%s.Step',
+                           'Title':         'MergerPage%s.Title',
+                           'TabTitle':      'MergerTab%s.Title',
+                           'Progress':      'MergerPage1.Label6.Label.%s',
+                           'Error':         'MergerPage1.Label8.Label.%s',
+                           'Index':         'MergerPage1.Label14.Label.%s',
+                           'Query':         'MergerTab2.Label1.Label',
+                           'Recipient':     'MailWindow.Label4.Label',
+                           'PickerTitle':   'Mail.FilePicker.Title',
+                           'Property':      'Mail.Document.Property.%s',
+                           'Document':      'MailWindow.Label8.Label.1',
+                           'DialogTitle':   'MessageBox.Title',
                            'DialogMessage': 'MessageBox.Message'}
 
     @property
@@ -254,7 +254,8 @@ def _setAddressBook(self, book, progress, setAddressBook):
             self._recipient.ActiveConnection = connection
             progress(80)
             self._queries = datasource.getQueryDefinitions()
-            self._quoted = connection.getMetaData().supportsMixedCaseQuotedIdentifiers()
+            # FIXME: SQLite need quoted identifier but don't supports mixed case quoted identifiers.
+            #self._quoted = connection.getMetaData().supportsMixedCaseQuotedIdentifiers()
             self._quote = connection.getMetaData().getIdentifierQuoteString()
             self._labeler = connection.getObjectNames()
             self._nominator = connection.createTableName()