Commit 86bbf1bf authored by Stuart Sides's avatar Stuart Sides Committed by Jesse Mapel
Browse files

Removed requirement of having to start a path with a slash, and added the... 

Removed requirement of having to start a path with a slash, and added the dollar sign to the regex to allow the ignorepath feature to ignore file paths that start with an environment or isis variable
parent e9433336

isis/src/base/apps/pvldiff/main.cpp

+2 −2
Original line number Diff line number Diff line
@@ -134,8 +134,8 @@ void compareKeywords(PvlKeyword &pvl1, PvlKeyword &pvl2) { 
    if ( ignoreFilePaths.hasKeyword(pvl1.name()) &&

         (((ignoreFilePaths[pvl1.name()].size() > 1 && ignoreFilePaths[pvl1.name()][i] == "true") ||

         (ignoreFilePaths[pvl1.name()].size() == 1 && ignoreFilePaths[pvl1.name()][0] == "true"))) ) {

      val1 =  val1.replace(QRegularExpression("(\\/[\\w\\-\\. ]*)+\\/"), "");

      val2 =  val2.replace(QRegularExpression("(\\/[\\w\\-\\. ]*)+\\/"), "");

      val1 =  val1.replace(QRegularExpression("(\[\\w\\-\\$\\. ]*)+\\/"), "");

      val2 =  val2.replace(QRegularExpression("(\[\\w\\-\\$\\. ]*)+\\/"), "");

    }