faubackup2/src/filesystem settingsFileParser.cpp,1.2,1.3

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

Modified Files:
	settingsFileParser.cpp 
Log Message:
aliases are resolved in global config too


Index: settingsFileParser.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/filesystem/settingsFileParser.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** settingsFileParser.cpp	8 Jun 2005 19:29:04 -0000	1.2
--- settingsFileParser.cpp	9 Jun 2005 16:01:50 -0000	1.3
***************
*** 27,31 ****
  			else
  				throw -1;
! 		} catch(int i) {
  			if(i== -1)
  				output.warning("I do not understand rule: \n" + line +
--- 27,32 ----
  			else
  				throw -1;
! 		}
! 		catch(int i) {
  			if(i== -1)
  				output.warning("I do not understand rule: \n" + line +
***************
*** 79,82 ****
--- 80,87 ----
  
  	time_string = getTimeStampString(line);
+ 	if(time_string[0] =='@') {
+ 		time_string.erase(0,1);
+ 		time_string = resolv_backuptime(time_string);
+ 	}
  
  	list<struct TimeStamp2> list = 	getTimeStamp_list(time_string);
***************
*** 91,94 ****
--- 96,104 ----
  
  		temp_string = getDurationTimeString(line);
+ 		if(temp_string[0]
+ 		        =='@') {
+ 			temp_string.erase(0,1);
+ 			temp_string = resolv_deletetime(temp_string);
+ 		}
  		keepTime = getKeepTime(temp_string, filterItem.globalRule);
  		filterItem.TimeToKeep=keepTime;



-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20