2009-07-04 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

Removed calls to Request::resetUrl() in AbstractCommand.cc.
	Removed hidden option PREF_RESET_URI.
	* src/AbstractCommand.cc
	* src/OptionHandlerFactory.cc
	* src/prefs.cc
	* src/prefs.h
pull/1/head
Tatsuhiro Tsujikawa 2009-07-03 15:38:29 +00:00
parent b46cf94601
commit e45a0e7e5f
5 changed files with 9 additions and 22 deletions

View File

@ -1,3 +1,12 @@
2009-07-04 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed calls to Request::resetUrl() in AbstractCommand.cc.
Removed hidden option PREF_RESET_URI.
* src/AbstractCommand.cc
* src/OptionHandlerFactory.cc
* src/prefs.cc
* src/prefs.h
2009-07-03 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed unused variable/function.

View File

@ -193,8 +193,6 @@ bool AbstractCommand::execute() {
_requestGroup->setLastUriResult(req->getUrl(), err.getCode());
}
onAbort();
// TODO Do we need this?
//req->resetUrl();
tryReserved();
return true;
} catch(DlRetryEx& err) {
@ -209,13 +207,6 @@ bool AbstractCommand::execute() {
bool isAbort = maxTries != 0 && req->getTryCount() >= maxTries;
if(isAbort) {
onAbort();
req->resetUrl();
} else {
if(getOption()->getAsBool(PREF_RESET_URI)) {
req->resetUrl();
}
}
if(isAbort) {
logger->info(MSG_MAX_TRY, cuid, req->getTryCount());
logger->error(MSG_DOWNLOAD_ABORTED, err, cuid, req->getUrl().c_str());
_fileEntry->addURIResult(req->getUrl(), err.getCode());

View File

@ -512,15 +512,6 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
op->addTag(TAG_HTTP);
handlers.push_back(op);
}
{
SharedHandle<OptionHandler> op(new BooleanOptionHandler
(PREF_RESET_URI,
NO_DESCRIPTION,
V_FALSE,
OptionHandler::OPT_ARG));
op->hide();
handlers.push_back(op);
}
{
SharedHandle<OptionHandler> op(new NumberOptionHandler
(PREF_RETRY_WAIT,

View File

@ -158,8 +158,6 @@ const std::string PREF_XML_RPC_LISTEN_PORT("xml-rpc-listen-port");
// value: true | false
const std::string PREF_ENABLE_XML_RPC("enable-xml-rpc");
// value: true | false
const std::string PREF_RESET_URI("reset-uri");
// value: true | false
const std::string PREF_DRY_RUN("dry-run");
// value: true | false
const std::string PREF_REUSE_URI("reuse-uri");

View File

@ -162,8 +162,6 @@ extern const std::string PREF_XML_RPC_LISTEN_PORT;
// value: true | false
extern const std::string PREF_ENABLE_XML_RPC;
// value: true | false
extern const std::string PREF_RESET_URI;
// value: true | false
extern const std::string PREF_DRY_RUN;
// value: true | false
extern const std::string PREF_REUSE_URI;