faubackup2/src/filesystem controlFileParser.cpp,1.4,1.5 settingsFileParser.cpp,1.5,1.6

Update of /cvsroot/faubackup/faubackup2/src/filesystem
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10163/src/filesystem

Modified Files:
	controlFileParser.cpp settingsFileParser.cpp 
Log Message:
adding support for the old "Ignore filename" format from older faubackuprc versions


Index: controlFileParser.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/filesystem/controlFileParser.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** controlFileParser.cpp	22 Sep 2005 15:44:52 -0000	1.4
--- controlFileParser.cpp	6 Oct 2005 01:49:55 -0000	1.5
***************
*** 102,108 ****
  		}
  		catch(int i) {
! 			if(i== -1)
! 				output.warning("I do not understand Rule: \n" + line +
! 				               "\nin file " + fileName + ":" + int2string(getLineNo()) , 0);
  			continue;
  		}
--- 102,107 ----
  		}
  		catch(int i) {
! 			output.warning("I do not understand Rule: \n" + line +
! 				               "\nin file " + fileName + ":" + int2string(getLineNo()) + " error: " + int2string(i) , 0);
  			continue;
  		}

Index: settingsFileParser.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/filesystem/settingsFileParser.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** settingsFileParser.cpp	22 Sep 2005 15:44:52 -0000	1.5
--- settingsFileParser.cpp	6 Oct 2005 01:49:55 -0000	1.6
***************
*** 31,39 ****
  			else
  				throw -1;
! 		}
! 		catch(int i) {
! 			if(i== -1)
! 				output.warning("I do not understand rule: \n" + line +
! 				               "\nin file " + fileName + ":" + int2string(getLineNo()) , 0);
  			continue;
  		}
--- 31,37 ----
  			else
  				throw -1;
! 		} catch(int i) {
! 			output.warning("I do not understand Rule: \n" + line +
! 				       "\nin file " + fileName + ":" + int2string(getLineNo()) + " error: " + int2string(i) , 0);
  			continue;
  		}
***************
*** 101,111 ****
  		temp_string = getDurationTimeString(line);
  		if(temp_string[0]
! 		        =='@') {
  			temp_string.erase(0,1);
  			temp_string = resolv_deletetime(temp_string);
  		}
  		filterItem.timeValid = matchBetweenIntervals(lastbackup,
! 						   actualbackup,
! 						   filterItem.filterTime);
  		keepTime = getKeepTime(temp_string, filterItem.globalRule);
  		filterItem.TimeToKeep=keepTime;
--- 99,109 ----
  		temp_string = getDurationTimeString(line);
  		if(temp_string[0]
! 		    =='@') {
  			temp_string.erase(0,1);
  			temp_string = resolv_deletetime(temp_string);
  		}
  		filterItem.timeValid = matchBetweenIntervals(lastbackup,
! 				       actualbackup,
! 				       filterItem.filterTime);
  		keepTime = getKeepTime(temp_string, filterItem.globalRule);
  		filterItem.TimeToKeep=keepTime;



-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl