Changeset 910

Timestamp:

Feb 1, 2014, 5:02:56 PM (11 years ago)

Author:

s10k

Message:

some more fixes

Location:

XmlTools2/trunk

Files:

• multidimvar.cpp (modified) (1 diff)
• xmlpatch.cpp (modified) (8 diffs)
• xmltools.cpp (modified) (3 diffs)

XmlTools2/trunk/multidimvar.cpp

@@ -57 +57 @@
     }
 
-    result += QString::number(this->multiDimValue.size()-1,'G',9); // last one does not have a space at the end
+    result += QString::number(this->multiDimValue[this->multiDimValue.size()-1],'G',9); // last one does not have a space at the end
 
     return result;

XmlTools2/trunk/xmlpatch.cpp

@@ -8 +8 @@
 
     if(forceTargetFilesWildcard!=""){
-        std::cout << "User forced patch in the target file(s): " << this->forceTargetFilesWildcard.toLatin1().constData() << std::endl;
-    }
-
-    if(this->patchFilesToProcess.size()==0){
+        std::cout << "User forced patch in the target file(s): " << forceTargetFilesWildcard.toLatin1().constData() << std::endl;
+    }
+
+    if(this->patchFilesToProcess.isEmpty()){
         UtilXmlTools::displayErrorMessage("Loading patch files","No .patch or .oni-patch files were found for the wildcard: "+patchFilesWildcard);
     }
@@ -47 +47 @@
 
     QStringList filesToProcess;
-
-    filesToProcess=UtilXmlTools::getAllXmlFilesByWildcard(filesWildcard);
-
     pugi::xml_node nodeToInsertion;
     pugi::xml_document newNode;
     pugi::xml_parse_result result;
 
+    filesToProcess=UtilXmlTools::getAllXmlFilesByWildcard(filesWildcard);
+
+    if(filesToProcess.isEmpty()){
+        UtilXmlTools::displayErrorMessage("@ADD_INSIDE_NODE","No XML files were found for the wildcard: "+filesWildcard);
+    }
+
     result=newNode.load(xmlString.toLatin1().constData()); // load xml to insert
 
@@ -95 +98 @@
     QStringList filesToProcess;
 
+    pugi::xml_node nodeToDeletion;
+
     filesToProcess=UtilXmlTools::getAllXmlFilesByWildcard(filesWildcard);
 
-    pugi::xml_node nodeToDeletion;
-    pugi::xml_parse_result result;
+    if(filesToProcess.isEmpty()){
+        UtilXmlTools::displayErrorMessage("@REMOVE_NODE","No XML files were found for the wildcard: "+filesWildcard);
+    }
 
     // Process all XmlFiles
@@ -184 +190 @@
     filesToProcess=UtilXmlTools::getAllXmlFilesByWildcard(filesWildcard);
 
+    if(filesToProcess.isEmpty()){
+        UtilXmlTools::displayErrorMessage("@CUSTOM_CODE","No XML files were found for the wildcard: "+filesWildcard);
+    }
+
     rexmlfile.open(QFile::ReadOnly | QFile::Text);
     jsxmlfile.open(QFile::ReadOnly | QFile::Text);
@@ -277 +287 @@
 void XmlPatch::checkAndProcessValidCommands(QTextStream &fileStream){
 
-    QString line;
-    QString filesWildcard;
+    QString line, filesWildcard;
     QString xmlToInsert, command, jsCode;
     XmlFilter filters;
@@ -294 +303 @@
             filters.setAttributeName(getPatchParameterValue(line,"AttributeName"));
             filters.setAttributeValue(getPatchParameterValue(line,"AttributeValue"));
-            if(this->forceTargetFilesWildcard==""){
+
+            if(this->forceTargetFilesWildcard!=""){
+                filesWildcard=this->forceTargetFilesWildcard;
+            }
+            else{
                 filesWildcard=getPatchParameterValue(line,"Files");
-            }
-            else{
-                filesWildcard=this->forceTargetFilesWildcard;
             }
 
@@ -327 +337 @@
             filters.setAttributeName(getPatchParameterValue(line,"AttributeName"));
             filters.setAttributeValue(getPatchParameterValue(line,"AttributeValue"));
-            if(this->forceTargetFilesWildcard==""){
+
+            if(this->forceTargetFilesWildcard!=""){
+                filesWildcard=this->forceTargetFilesWildcard;
+            }
+            else{
                 filesWildcard=getPatchParameterValue(line,"Files");
-            }
-            else{
-                filesWildcard=this->forceTargetFilesWildcard;
             }
 
@@ -354 +365 @@
         else if(line.startsWith("@CUSTOM_CODE")){
 
-            if(this->forceTargetFilesWildcard==""){
+            if(this->forceTargetFilesWildcard!=""){
+                filesWildcard=this->forceTargetFilesWildcard;
+            }
+            else{
                 filesWildcard=getPatchParameterValue(line,"Files");
-            }
-            else{
-                filesWildcard=this->forceTargetFilesWildcard;
             }
 

XmlTools2/trunk/xmltools.cpp

@@ -7 +7 @@
     this->backupsEnabled=!noBackups;
 
-    if(this->filesToProcess.size()==0){
+    if(this->filesToProcess.isEmpty()){
         UtilXmlTools::displayErrorMessage("Loading xml files","No XML files were found for the wildcard: "+filesWildcard);
     }
@@ -67 +67 @@
                 for(int m=0; m<valuesToRemoveList.size(); m++){
                     if(currValuesList[k]==valuesToRemoveList[m]){
-                        currValuesList[k]=""; // remove it
+                        currValuesList[k]=""; // flag to deletion
                         elementChanged=true;
                     }
@@ -74 +74 @@
 
             if(elementChanged){ // If curr element changed update the XML
+                currValuesList.removeAll(""); // remove all files flagged to deletion
                 elements[j].text()=currValuesList.join(' ').toLatin1().constData();
                 elementChanged=false;