Merge pull request #96 from jacquetc/develop

- add separator handling in Plume importer
jacquetc · Nov 15, 2020 · 01951c9 · 01951c9
2 parents 0018d43 + 34aa4bb
commit 01951c9
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/src/libskribisto-data/src/tasks/sql/plmimporter.cpp b/src/libskribisto-data/src/tasks/sql/plmimporter.cpp
@@ -433,14 +433,19 @@ SKRResult PLMImporter::importPlumeCreatorProject(const QUrl& plumeFileName, cons
 
             }
         }
+        while (xml.readNext() != QXmlStreamReader::EndDocument){
+
+        }
+
+
     }
 
     IFKO(result) {
         result = SKRResult(SKRResult::Critical, this, "error_while_exploiting_tree");
         return result;
     }
 
-    if (xml.hasError()) {
+    if (xml.hasError() && xml.error() != QXmlStreamReader::PrematureEndOfDocumentError) {
         result = SKRResult(SKRResult::Critical, this, "error_in_tree_xml");
 
         result.addData("xmlError", QString("%1\nLine %2, column %3")
@@ -508,16 +513,27 @@ SKRResult PLMImporter::readXMLRecursivelyAndCreatePaper(int
         return result;
     }
     else {
-        IFOKDO(result, this->createPapersAndAssociations(projectId, indent, *xml, tempDirPath));
-        IFOKDO(result, readXMLRecursivelyAndCreatePaper(projectId, indent + 1, xml, tempDirPath));
+        if(xml->name() == "separator"){
+            xml->skipCurrentElement();
+        }
+        else {
+            IFOKDO(result, this->createPapersAndAssociations(projectId, indent, *xml, tempDirPath));
+            IFOKDO(result, readXMLRecursivelyAndCreatePaper(projectId, indent + 1, xml, tempDirPath));
+        }
     }
 
     while (xml->readNextStartElement()) {
 
+        if(xml->name() == "separator"){
+            xml->skipCurrentElement();
+            continue;
+        }
         IFOKDO(result, this->createPapersAndAssociations(projectId, indent, *xml, tempDirPath));
         IFOKDO(result, readXMLRecursivelyAndCreatePaper(projectId, indent + 1, xml, tempDirPath));
 
     }
+
+    return result;
 }