rbutil: Rework server info data handling.

Allow constructing release candidate URL from configuration the same way
we construct the URL for releases.

Note that the server path used does not exist, taken from old release
candidate builds not available anymore.

Change-Id: I7332f08df05ed39724b4900556aaa1f5e0ba463b

1 files changed, 6 insertions, 7 deletions

diff --git a/rbutil/rbutilqt/base/serverinfo.cpp b/rbutil/rbutilqt/base/serverinfo.cpp
index 94c369af72..84aa89039d 100644
--- a/rbutil/rbutilqt/base/serverinfo.cpp
+++ b/rbutil/rbutilqt/base/serverinfo.cpp
@@ -85,22 +85,21 @@ QVariant ServerInfo::platformValue(enum ServerInfos info, QString platform)
         value = value.toStringList().at(0);
         break;
     case CurReleaseUrl:
+    case RelCandidateUrl:
         {
             QString version = value.toStringList().at(0);
             if(value.toStringList().size() > 1)
                 value = value.toStringList().at(1);
-            else if(!version.isEmpty()) // if value is empty, return empty url.
+            else if(!version.isEmpty() && info == CurReleaseUrl)
                 value = SystemInfo::value(SystemInfo::ReleaseUrl).toString()
                     .replace("%MODEL%", platform)
                     .replace("%RELVERSION%", version);
+            else if(!version.isEmpty() && info == RelCandidateUrl)
+                value = SystemInfo::value(SystemInfo::CandidateUrl).toString()
+                    .replace("%MODEL%", platform)
+                    .replace("%RELVERSION%", version);
         }
         break;
-    case RelCandidateUrl:
-        if(value.toStringList().size() > 1)
-            value = value.toStringList().at(1);
-        else
-            value.clear();
-        break;
     case CurDevelUrl:
         value = SystemInfo::value(SystemInfo::BleedingUrl).toString()
                 .replace("%MODEL%", platform);