faubackup2/src/filesystem dir_parser.cpp,1.9,1.10 dir_parser.hpp,1.4,1.5

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

Modified Files:
	dir_parser.cpp dir_parser.hpp 
Log Message:
one constructor ought to be enough for anybody


Index: dir_parser.hpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/filesystem/dir_parser.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dir_parser.hpp	20 Sep 2005 13:59:13 -0000	1.4
--- dir_parser.hpp	6 Oct 2005 22:06:40 -0000	1.5
***************
*** 48,56 ****
  	string prefix;
  public:
- 	DirectoryParser(string startdir);
  	DirectoryParser(string startdir, SettingsFileParser *globalConf, Sender *sender);
! 	DirectoryParser(SettingsFileParser *globalConf, Sender *sender);
! 	DirectoryParser(string startdir, SettingsFileParser *globalConf);
! 	DirectoryParser();
  	void run();
  };
--- 48,53 ----
  	string prefix;
  public:
  	DirectoryParser(string startdir, SettingsFileParser *globalConf, Sender *sender);
! 	~DirectoryParser(){}
  	void run();
  };

Index: dir_parser.cpp
===================================================================
RCS file: /cvsroot/faubackup/faubackup2/src/filesystem/dir_parser.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** dir_parser.cpp	22 Sep 2005 15:44:52 -0000	1.9
--- dir_parser.cpp	6 Oct 2005 22:06:40 -0000	1.10
***************
*** 207,244 ****
  }
  
- DirectoryParser::DirectoryParser(string startdir)
- {
- 	this->_sender = NULL;
- 	this->globalConfig = NULL;
- 	if (startdir != "")
- 		if (startdir[startdir.length() - 1] != '/')
- 			startdir.append("/");
- 
- 	std::list<Filter> emptylist;
- 	output.information("begin parse in " + startdir, DEBUG_OUTPUT);
- 	parseDir( startdir, emptylist, emptylist);
- 	output.information("parse complete!", DEBUG_OUTPUT);
- }
- 
- DirectoryParser::DirectoryParser(SettingsFileParser *globalConf, Sender *sender)
- {
- 	this->_sender = sender;
- 	std::list<Filter> emptylist;
- 	this->globalConfig = globalConf;
- 	if (!globalConfig) {
- 		Filter filter;
- 		filter.rule = ".*";
- 		filter.mode = Filter::include;
- 		globallist.push_back(filter);
- 	} else
- 		globallist = globalConfig->getdefaultRules();
- 	prefix = "";
- 	parseDir("", emptylist, globallist);
- 
- 	output.information("parse complete!", DEBUG_OUTPUT);
- 	if (_sender)
- 		_sender->sendfinish();
- }
- 
  DirectoryParser::DirectoryParser(string startdir, SettingsFileParser *globalConf, Sender *sender)
  {
--- 207,210 ----
***************
*** 258,287 ****
  
  	prefix = startdir;
- 	parseDir( "", emptylist, globallist);
- 
- 	output.information("parse complete!", DEBUG_OUTPUT);
- 	if (_sender)
- 		_sender->sendfinish();
- }
- 
- DirectoryParser::DirectoryParser(string startdir, SettingsFileParser *globalConf)
- {
- 	this->_sender = NULL;
- 	std::list<Filter> emptylist;
- 	this->globalConfig = globalConf;
- 	if (!globalConfig) {
- 		Filter filter;
- 		filter.rule = ".*";
- 		filter.mode = Filter::include;
- 		globallist.push_back(filter);
- 	} else
- 		globallist = globalConfig->getdefaultRules();
- 	if (startdir != "")
- 		if (startdir[startdir.length() - 1] != '/')
- 			startdir.append("/");
- 	prefix = startdir;
- 	output.information("begin parse in " + startdir, DEBUG_OUTPUT);
- 	parseDir("", emptylist, globallist);
- 	output.information("parse complete!", DEBUG_OUTPUT);
  }
  
--- 224,227 ----
***************
*** 293,309 ****
  	if (_sender)
  		_sender->sendfinish();
- 
- }
- DirectoryParser::DirectoryParser()
- {
- 	this->globalConfig = NULL;
- 	this->_sender = NULL;
- 	std::list<Filter> emptylist;
- 	Filter filter;
- 	filter.rule = ".*";
- 	filter.mode = Filter::include;
- 	globallist.push_back(filter);
- 	parseDir("", emptylist, globallist);
- 	output.information("parse complete!", DEBUG_OUTPUT);
  }
  
--- 233,236 ----



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