[rkward-cvs] rkward/rkward/rbackend rembed.cpp,1.20,1.21

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/rbackend
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29681/rkward/rbackend

Modified Files:
	rembed.cpp 
Log Message:
downloaded packages are now archived or deleted according to user setting. Ability to specify additional package repositories

Index: rembed.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rbackend/rembed.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** rembed.cpp	14 Sep 2005 16:32:25 -0000	1.20
--- rembed.cpp	18 Sep 2005 15:17:54 -0000	1.21
***************
*** 89,93 ****
  	runCommandInternal ("library (\"rkward\")\n", &error);
  	if (error) status |= LibLoadFail;
! 	runCommandInternal ("options (pager=\"" + RKSettingsModuleR::pagerApp () + "\")\n", &error);
  	if (error) status |= OtherFail;
  	runCommandInternal ("sink (\"" + RKSettingsModuleLogfiles::filesPath () + "/r_out\")\n", &error);
--- 89,101 ----
  	runCommandInternal ("library (\"rkward\")\n", &error);
  	if (error) status |= LibLoadFail;
! 	QStringList list = RKSettingsModuleR::getPackageRepositories ();
! 	QString command = "options (repos=c(";
! 	for (QStringList::const_iterator it = list.begin (); it != list.end (); ++it) {
! 		if (it != list.begin ()) {
! 			command.append (", ");
! 		}
! 		command.append ("\"" + *it + "\"");
! 	}
! 	runCommandInternal (command + "))\n", &error);
  	if (error) status |= OtherFail;
  	runCommandInternal ("sink (\"" + RKSettingsModuleLogfiles::filesPath () + "/r_out\")\n", &error);
***************
*** 96,99 ****
--- 104,108 ----
  	if (error) status |= SinkFail;
  	runCommandInternal ("options (htmlhelp=TRUE); options (browser=\"dcop " + kapp->dcopClient ()->appId () + " rkwardapp openHTMLHelp \")", &error);
+ 	if (error) status |= OtherFail;
  	// TODO: error-handling?