Changeset 1111 for s10k/XmlTools

Timestamp:

Feb 16, 2019, 6:25:06 PM (6 years ago)

Author:

s10k

Message:

Added version 2.0e (bugfix in patch file for paths with apostrophes)

Location:

s10k/XmlTools

Files:

• README.txt (modified) (3 diffs)
• utilglobalvars.h (modified) (1 diff)
• xmlpatch.cpp (modified) (2 diffs)

s10k/XmlTools/README.txt

@@ -1 +1 @@
 Readme.txt
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-XmlTools v2.0d
+XmlTools v2.0e
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -50 +50 @@
 ----------------------------------
 
-Script10k, "faob2@hotmail.com"
+s10k, "faob2@hotmail.com"
 
 Oni Central Forum:
@@ -61 +61 @@
 ----------------------------------
 Change Log:
+----------------------------------
+2.0e, 16-02-2019
+-Fixed bug in the processing of patch files when the target XML contained an apostrophe (') in the path
 ----------------------------------
 2.0d, 05-10-2017

s10k/XmlTools/utilglobalvars.h

@@ -24 +24 @@
 
 static const QString AppName = "XmlTools";
-static const QString AppVersion = "2.0d";
+static const QString AppVersion = "2.0e";
 #ifdef Q_OS_WIN
 static const QString AppExecutable=AppName+".exe";

s10k/XmlTools/xmlpatch.cpp

@@ -374 +374 @@
             command=GlobalVars::AppExecutable;
 
-            // Append files if forced to
-            if(!this->forceTargetFilesWildcard.isEmpty()){
-                command+=" --files '"+this->forceTargetFilesWildcard+"' ";
-            }
-
             command+=" "+getPatchParameterValue(line,"Options");
 
@@ -392 +387 @@
             command.replace("'","\""); //replace apostrophe by quotes, to avoid problems
             command.replace("\"\"","'"); // this allow to use '' as ' ('' is transformed in "" and then in ')
+
+            // Append files if forced to
+
+            // This is added at the end so the apostrophe isn't done here (the path can contain it)
+            if(!this->forceTargetFilesWildcard.isEmpty()){
+                command+=" --files \""+this->forceTargetFilesWildcard+"\" ";
+            }
 
             executeCommandOperation(command);