Fix synchronization of added elements and crash on broken XML on split.

Author: wanthalf

CHANGELOG

@@ -1,3 +1,13 @@
+1.6
+
+Improvements:
+- update to Qt 5.9
+
+Fixes:
+- synchronization broke if new elements were added behind some element (by editing), but the original text element not changed itself
+- crash if splitting text with broken XML
+
+
 1.5
 
 Improvements:

src/ItAlignment.cpp

@@ -1,5 +1,5 @@
-/*  Copyright (c) 2010-2016 Pavel Vondřička (Pavel.Vondricka@korpus.cz)
- *  Copyright (c) 2010-2016 Charles University in Prague, Faculty of Arts,
+/*  Copyright (c) 2010-2017 Pavel Vondřička (Pavel.Vondricka@korpus.cz)
+ *  Copyright (c) 2010-2017 Charles University in Prague, Faculty of Arts,
  *                          Institute of the Czech National Corpus
  *
  *  This file is part of InterText Editor.
@@ -646,13 +646,13 @@ bool ItAlignment::canSplitParent(aligned_doc doc, int pos, int el) {
     return true;
 }
 
-bool ItAlignment::updateContents(aligned_doc doc, int pos, int el, QString string)
+bool ItAlignment::updateContents(aligned_doc doc, int pos, int el, QString string, bool forceupdate)
 {
     if (!ignorePermissions && ((doc==0 && !info.ver[0].perm_chtext) || (doc==1 && !info.ver[1].perm_chtext))) {
         //qDebug() << "Permission denied.";
         return false;
     }
-    if (string==getContents(doc,pos,false).toStringList().at(el)) {
+    if (!forceupdate && string==getContents(doc,pos,false).toStringList().at(el)) {
         //qDebug() << "No change, no update.";
         return true;
     }
@@ -755,7 +755,7 @@ bool ItAlignment::split(aligned_doc doc, int pos, int el, QStringList newstrings
         newstrings[i] = newstrings[i].trimmed();
         fixBrokenTags(newstrings[i], &inherittags);
     }
-    if (!updateContents(doc, pos, el, newstrings.takeFirst()))
+    if (!updateContents(doc, pos, el, newstrings.takeFirst(),true))
         return false;
     while (!newstrings.isEmpty())
         if (!duplicate(doc, pos, el++, newstrings.takeFirst()))

src/ItAlignment.h

@@ -1,5 +1,5 @@
-/*  Copyright (c) 2010-2016 Pavel Vondřička (Pavel.Vondricka@korpus.cz)
- *  Copyright (c) 2010-2016 Charles University in Prague, Faculty of Arts,
+/*  Copyright (c) 2010-2017 Pavel Vondřička (Pavel.Vondricka@korpus.cz)
+ *  Copyright (c) 2010-2017 Charles University in Prague, Faculty of Arts,
  *                          Institute of the Czech National Corpus
  *
  *  This file is part of InterText Editor.
@@ -160,7 +160,7 @@ class ItAlignment
     QVariant getContents(aligned_doc doc, int pos, bool prepend = true, bool ignoreMarkup=false, const QList<Replacement> *transformations=0);
     QStringList getIDs(aligned_doc doc, int pos);
     int getSize(aligned_doc doc, int pos);
-    bool updateContents(aligned_doc doc, int pos, int el, QString string);
+    bool updateContents(aligned_doc doc, int pos, int el, QString string, bool forceupdate=false);
     ushort getStat(int pos);
     QString getStatName(int pos);
     ushort getMark(int pos);

src/ItAlignmentModel.cpp

@@ -1,5 +1,5 @@
-/*  Copyright (c) 2010-2016 Pavel Vondřička (Pavel.Vondricka@korpus.cz)
- *  Copyright (c) 2010-2016 Charles University in Prague, Faculty of Arts,
+/*  Copyright (c) 2010-2017 Pavel Vondřička (Pavel.Vondricka@korpus.cz)
+ *  Copyright (c) 2010-2017 Charles University in Prague, Faculty of Arts,
  *                          Institute of the Czech National Corpus
  *
  *  This file is part of InterText Editor.
@@ -649,6 +649,8 @@ bool ItAlignmentModel::isFirstParEl(QModelIndex index) {
 }
 
 bool ItAlignmentModel::remove(QModelIndex index, int count) {
+    if (!index.isValid() || !index.parent().isValid())
+        return false;
     if (!alignment->removeAfter(index.parent().column()-1, index.parent().row(), index.row()-1, count))
         return false;
     emit dataChanged(index.parent(), index.parent());

src/ItWindow.cpp

@@ -1,5 +1,5 @@
-/*  Copyright (c) 2010-2016 Pavel Vondřička (Pavel.Vondricka@korpus.cz)
- *  Copyright (c) 2010-2016 Charles University in Prague, Faculty of Arts,
+/*  Copyright (c) 2010-2017 Pavel Vondřička (Pavel.Vondricka@korpus.cz)
+ *  Copyright (c) 2010-2017 Charles University in Prague, Faculty of Arts,
  *                          Institute of the Czech National Corpus
  *
  *  This file is part of InterText Editor.
@@ -909,9 +909,9 @@ void ItWindow::about()
     QMessageBox m;
     m.setWindowTitle(tr("About InterText"));
     m.setIconPixmap(QPixmap(":/images/32/InterText.ico"));
-    m.setText(tr("<h1>InterText editor 1.5</h1>"));
+    m.setText(tr("<h1>InterText editor 1.6</h1>"));
     m.setInformativeText(tr("<p><b>Alignment editor for parallel texts.</b></p>"
-                            "<p>Copyright &copy; 2010-2016 Pavel Vondřička,<br/>"
+                            "<p>Copyright &copy; 2010-2017 Pavel Vondřička,<br/>"
                             "Institute of the Czech National Corpus,<br/>"
                             "Charles University in Prague, Faculty of Arts</p>"
                             "<p>This software is licensed under the GNU General Public License (Version 3).</p>"));

src/ServerDialog.cpp

@@ -1,5 +1,5 @@
-/*  Copyright (c) 2010-2016 Pavel Vondřička (Pavel.Vondricka@korpus.cz)
- *  Copyright (c) 2010-2016 Charles University in Prague, Faculty of Arts,
+/*  Copyright (c) 2010-2017 Pavel Vondřička (Pavel.Vondricka@korpus.cz)
+ *  Copyright (c) 2010-2017 Charles University in Prague, Faculty of Arts,
  *                          Institute of the Czech National Corpus
  *
  *  This file is part of InterText Editor.
@@ -1702,8 +1702,7 @@ bool ServerDialog::serverRequestUpdate(int aid, ItAlignment * a, aligned_doc d,
     postData.addQueryItem("ver", a->info.ver[d].name);
     postData.addQueryItem("l", QString::number(n));
     postData.addQueryItem("newtext", text);
-    postData.addQueryItem("lastsync", a->info.ver[d].synced.toUTC().toString(Qt::ISODate));//qDebug()<<query.encodedQuery();
-    //query.setQuery(postData);
+    postData.addQueryItem("lastsync", a->info.ver[d].synced.toUTC().toString(Qt::ISODate));
     QEventLoop * loop = new QEventLoop();
     QNetworkReply * reply = net->post(request, postData.query(QUrl::EncodeUnicode).toLatin1());
     connect(reply, SIGNAL(finished()), loop, SLOT(quit()));