From a137dd03623969ff6346e8014fe253acc95db77e Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 17 Apr 2014 10:18:42 -0700 Subject: [PATCH] grab URL for script from payload if it exists --- assignment-client/src/Agent.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp index f48c4b9401..4163991a75 100644 --- a/assignment-client/src/Agent.cpp +++ b/assignment-client/src/Agent.cpp @@ -148,14 +148,19 @@ void Agent::run() { << NodeType::ParticleServer); // figure out the URL for the script for this agent assignment - QString scriptURLString("http://%1:8080/assignment/%2"); - scriptURLString = scriptURLString.arg(NodeList::getInstance()->getDomainHandler().getIP().toString(), - uuidStringWithoutCurlyBraces(_uuid)); - + QUrl scriptURL; + if (_payload.isEmpty()) { + scriptURL = QUrl(QString("http://%1:8080/assignment/%2") + .arg(NodeList::getInstance()->getDomainHandler().getIP().toString(), + uuidStringWithoutCurlyBraces(_uuid))); + } else { + scriptURL = QUrl(_payload); + } + QNetworkAccessManager *networkManager = new QNetworkAccessManager(this); - QNetworkReply *reply = networkManager->get(QNetworkRequest(QUrl(scriptURLString))); + QNetworkReply *reply = networkManager->get(QNetworkRequest(scriptURL)); - qDebug() << "Downloading script at" << scriptURLString; + qDebug() << "Downloading script at" << scriptURL.toString(); QEventLoop loop; QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));