faubackup2/src/filesystem controlFileParser.cpp,1.3,1.4 dir_parser.cpp,1.8,1.9 settingsFileParser.cpp,1.4,1.5

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

Modified Files:
	controlFileParser.cpp dir_parser.cpp settingsFileParser.cpp 
Log Message:
calculate the filter-match-time while parsing the configuration files 
instead of calculate the time for every file in the backup

 


Index: controlFileParser.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/filesystem/controlFileParser.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** controlFileParser.cpp	14 Jun 2005 20:23:34 -0000	1.3
--- controlFileParser.cpp	22 Sep 2005 15:44:52 -0000	1.4
***************
*** 15,21 ****
  {
  
  
! 
! ControlFileParser::ControlFileParser(string name, string path_to, SettingsFileParser *globalConfig) : ConfigParser(name), globalConf(globalConfig), fileName(name), path(path_to)
  {
  	if(path!= "") {
--- 15,22 ----
  {
  
+ extern struct TimeStamp lastbackup;
+ extern struct TimeStamp actualbackup;
  
! ControlFileParser::ControlFileParser(string name, string path_to, SettingsFileParser *globalConfig ) : ConfigParser(name), globalConf(globalConfig), fileName(name), path(path_to)
  {
  	if(path!= "") {
***************
*** 75,78 ****
--- 76,82 ----
  				keepTime = getKeepTime(temp_string, filterItem.globalRule);
  				filterItem.TimeToKeep=keepTime;
+ 				filterItem.timeValid = matchBetweenIntervals(lastbackup,
+ 						   actualbackup,
+ 						   filterItem.filterTime);
  
  				if(neverBackup(keepTime))

Index: settingsFileParser.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/filesystem/settingsFileParser.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** settingsFileParser.cpp	14 Jun 2005 20:23:34 -0000	1.4
--- settingsFileParser.cpp	22 Sep 2005 15:44:52 -0000	1.5
***************
*** 105,108 ****
--- 105,111 ----
  			temp_string = resolv_deletetime(temp_string);
  		}
+ 		filterItem.timeValid = matchBetweenIntervals(lastbackup,
+ 						   actualbackup,
+ 						   filterItem.filterTime);
  		keepTime = getKeepTime(temp_string, filterItem.globalRule);
  		filterItem.TimeToKeep=keepTime;

Index: dir_parser.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/filesystem/dir_parser.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dir_parser.cpp	20 Sep 2005 13:59:13 -0000	1.8
--- dir_parser.cpp	22 Sep 2005 15:44:52 -0000	1.9
***************
*** 340,346 ****
  	i = filterList.begin();
  	while (i != filterList.end()) {
! 		bool valid = matchBetweenIntervals(lastbackup,
  						   actualbackup,
  						   i->filterTime);
  		enum ExpressionMatchType cmp_result = compare(*i, filename);
  		if (cmp_result == Include) { // backup it
--- 340,348 ----
  	i = filterList.begin();
  	while (i != filterList.end()) {
! 		/*bool valid = matchBetweenIntervals(lastbackup,
  						   actualbackup,
  						   i->filterTime);
+ 						   */
+ 		bool valid = i->timeValid;
  		enum ExpressionMatchType cmp_result = compare(*i, filename);
  		if (cmp_result == Include) { // backup it



-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. 
Download it for free - -and be entered to win a 42" plasma tv or your very
own Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php