prep for download sights on build machine
diff --git a/downloadsites/webtools/commonPages/latestBuilds.php b/downloadsites/webtools/commonPages/latestBuilds.php
index d5deaa8..9c5c739 100755
--- a/downloadsites/webtools/commonPages/latestBuilds.php
+++ b/downloadsites/webtools/commonPages/latestBuilds.php
@@ -41,10 +41,10 @@
echo "<td width=\"25%\">$value</td>";
$buildName=computeBuildName($fileName);
-
+ $streamName=computeStreamName($bValue);
if (sizeof($buildName) > 0) {
echo "<td width=\"25%\"><a href=\"$fileName/\">$buildName</a></td>";
- echo "<td width=\"15%\">$bValue</td>";
+ echo "<td width=\"15%\">$streamName</td>";
echo "<td width=\"40%\">$timeStamps[$fileName]</td>";
echo "</tr>";
}
diff --git a/downloadsites/webtools/commonPages/recentHistory.php b/downloadsites/webtools/commonPages/recentHistory.php
index 64614e5..7f0b145 100755
--- a/downloadsites/webtools/commonPages/recentHistory.php
+++ b/downloadsites/webtools/commonPages/recentHistory.php
@@ -4,7 +4,7 @@
$debugRecentHistory=false;
-if (!isset($buckets)) {
+if (!isset($buckets) || !function_exists("computeMainData")) {
include 'computeMainData.php';
computeMainData($buildBranches, $debugRecentHistory);
}
@@ -92,9 +92,11 @@
// echo "Debug recentHistory: innerValue: $innerValue <br />";
//}
$buildName = computeBuildName($innerValue);
+ $streamName = computeStreamName($bValue);
+
echo "<tr>";
echo "<td width=\"13%\"><a href=\"$innerValue/\">$buildName</a></td>";
- echo "<td width=\"8%\">$bValue</td>";
+ echo "<td width=\"8%\">$streamName</td>";
echo "<td width=\"20%\">$timeStamps[$innerValue]</td>";
echo "<td> </td>";
// our recent summary results handling requires php 5 (for simple xml file loading)
diff --git a/downloadsites/webtools/commonPages/topAndInit.php b/downloadsites/webtools/commonPages/topAndInit.php
index b872f17..010f742 100755
--- a/downloadsites/webtools/commonPages/topAndInit.php
+++ b/downloadsites/webtools/commonPages/topAndInit.php
@@ -75,5 +75,19 @@
}
return $innerValueParts[1];
}
-
+function computeStreamName($longname) {
+ $majorParts = explode("/", $longname);
+ $nParts = sizeof($majorParts);
+ if ($nParts > 1) {
+ // a format such as "drops/R3.0"
+ $name = $majorParts[1];
+
+ }
+ else {
+ // a format such as "wtp-R3.0-I"
+ $majorParts = explode("-", $longname);
+ $name = $majorParts[1];
+ }
+ return $name;
+}
?>