From bc40961abdcdfb7cca8cfd7020d9ca32a3105735 Mon Sep 17 00:00:00 2001
From: aavit <qt-info@nokia.com>
Date: Mon, 22 Nov 2010 15:28:38 +0100
Subject: Separate reports from adhoc and pulse runs

---
 tests/arthur/baselineserver/src/htmlpage.cpp | 5 +++--
 tests/arthur/baselineserver/src/htmlpage.h   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/arthur/baselineserver/src/htmlpage.cpp b/tests/arthur/baselineserver/src/htmlpage.cpp
index fdbdfb8..a4e9e0c 100644
--- a/tests/arthur/baselineserver/src/htmlpage.cpp
+++ b/tests/arthur/baselineserver/src/htmlpage.cpp
@@ -69,7 +69,8 @@ void HTMLPage::start(const QString &storagepath, const QString &runId, const Pla
     ctx = context;
     root = storagepath + QLC('/');
     imageItems = itemList;
-    QString dir = root + QLS("reports/");
+    reportDir = pinfo.value(PI_PulseGitBranch).isEmpty() ? QLS("reports/adhoc/") : QLS("reports/pulse/");
+    QString dir = root + reportDir;
     QDir cwd;
     if (!cwd.exists(dir))
         cwd.mkpath(dir);
@@ -78,7 +79,7 @@ void HTMLPage::start(const QString &storagepath, const QString &runId, const Pla
 
 void HTMLPage::writeHeader(const ImageItem &item)
 {
-    path = QLS("reports/") + id + QLC('_') + item.engineAsString()
+    path = reportDir + id + QLC('_') + item.engineAsString()
             + QLC('_') + item.formatAsString() + QLS(".html");
 
     QString pageUrl = BaselineServer::baseUrl() + path;
diff --git a/tests/arthur/baselineserver/src/htmlpage.h b/tests/arthur/baselineserver/src/htmlpage.h
index fa4d1ed..f5e6e1c 100644
--- a/tests/arthur/baselineserver/src/htmlpage.h
+++ b/tests/arthur/baselineserver/src/htmlpage.h
@@ -65,6 +65,7 @@ private:
 
     QString root;
     QString path;
+    QString reportDir;
     QFile file;
     QTextStream out;
     QString id;
-- 
cgit v0.12