11/* *************************************************************************
22 * This file is part of QXmlEdit *
3- * Copyright (C) 2011-2018 by Luca Bellonda and individual contributors *
3+ * Copyright (C) 2011-2020 by Luca Bellonda and individual contributors *
44 * as indicated in the AUTHORS file *
55 * lbellonda _at_ gmail.com *
66 * *
@@ -142,11 +142,14 @@ bool ExtractionOperation::isXMLFilterExport() const
142142 return OperationExportAndGroupXML == _operationType ;
143143}
144144
145+ /* ****
146+ * Some notes: InFragment: true if inside the split path/depth, can be collected or not (filter) registerDocument=true)
147+ * outside a fragment should be collected if filter and not group.
148+ * ****/
145149void ExtractionOperation::execute (QFile *file)
146150{
147151 bool debugIO = _debug ;
148152 int operationCount = 0 ;
149- // bool inDocument = false; TODO
150153 bool insideAFragment = false ;
151154 bool isWriting = false ;
152155 QXmlStreamReader xmlReader;
@@ -188,7 +191,7 @@ void ExtractionOperation::execute(QFile *file)
188191 xmlReader.clear ();
189192 xmlReader.setDevice (file);
190193 _size = Utils::infoSizeAboutLocalDevice (NULL , file->fileName ());
191- bool isAFilteredExtraction = _isExtractDocuments && ! isExtractAllDocuments () && (OperationFilter == _operationType);
194+ bool isAFilteredExtraction = _isExtractDocuments && (OperationFilter == _operationType);
192195 bool isAnExportExtraction = _isExtractDocuments && ((OperationExportAndGroupCSV == _operationType) || (OperationExportAndGroupXML == _operationType));
193196 qint64 previousPos = 0 ;
194197 while (!xmlReader.atEnd ()) {
@@ -249,9 +252,12 @@ void ExtractionOperation::execute(QFile *file)
249252 dontWrite = true ;
250253 }
251254 }
252- if (isScripting && insideAFragment) {
253- if (!manageText (info, level, path, xmlReader, dontWrite)) {
254- return ;
255+ if (isScripting && insideAFragment && !dontWrite) {
256+ const bool canExecute = evaluateScriptingConditions (isAFilteredExtraction, insideAFragment, isStillInFragment, isWriting, dontWrite);
257+ if (canExecute) {
258+ if (!manageText (info, level, path, xmlReader, dontWrite)) {
259+ return ;
260+ }
255261 }
256262 }
257263 break ;
@@ -318,9 +324,6 @@ void ExtractionOperation::execute(QFile *file)
318324 }
319325 insideAFragment = true ;
320326 if (registerDocument) {
321- if (!manageElement (info, level, path, xmlReader, dontWrite)) {
322- return ;
323- }
324327 if (isAnExportExtraction) {
325328 if (!handleExportedElement (info, xmlReader)) {
326329 isError = true ;
@@ -335,9 +338,13 @@ void ExtractionOperation::execute(QFile *file)
335338 }
336339 }
337340 }
338- } else {
339- if (!manageElement (info, level, path, xmlReader, dontWrite)) {
340- return ;
341+ }
342+ if (isScripting) {
343+ const bool canExecute = evaluateScriptingConditions (isAFilteredExtraction, insideAFragment, isStillInFragment, isWriting, dontWrite);
344+ if (canExecute) {
345+ if (!manageElement (info, level, path, xmlReader, dontWrite)) {
346+ return ;
347+ }
341348 }
342349 }
343350 if (isError) {
@@ -461,6 +468,25 @@ void ExtractionOperation::execute(QFile *file)
461468 _isEnded = true ;
462469}
463470
471+ bool ExtractionOperation::evaluateScriptingConditions (const bool isAFilteredExtraction, const bool insideAFragment,
472+ const bool isStillInFragment, const bool isWriting, const bool dontWrite)
473+ {
474+ Utils::TODO_THIS_RELEASE (" prova con testo in e out dagli elementi"
475+ bool canExecute = false ;
476+ if (isAFilteredExtraction) {
477+ if ((!insideAFragment && !isStillInFragment) || (insideAFragment && isWriting)) {
478+ if (!dontWrite) {
479+ canExecute = true ;
480+ }
481+ }
482+ } else {
483+ if (isWriting && !dontWrite) {
484+ canExecute = true ;
485+ }
486+ } // check for write
487+ return canExecute;
488+ }
489+
464490bool ExtractionOperation::writeAToken (const bool isAFilteredExtraction, const bool insideAFragment, ExtractInfo &info, QXmlStreamReader &reader)
465491{
466492 if ((insideAFragment && _isExtractDocuments) || isAFilteredExtraction) {
0 commit comments