claunia/qemudb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009/10/10 03:12:44 +0100 claunia: System is shown in category tree up the test selected, in list of versions, and in left column in selected version

Browse Source
This commit is contained in:
Natalia Portillo
2014-09-04 05:34:11 +01:00
parent db705b45a9
commit 13d232f192
2 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/category.php
View File

@@ -258,7 +258,7 @@ class Category {
/** /**
* create the Category: line at the top of appdb pages$ * create the Category: line at the top of appdb pages$
*/ */
function make_cat_path($aPath, $iAppId = '', $iVersionId = '') function make_cat_path($aPath, $iAppId = '', $iVersionId = '', $iqSysId = '')
{ {
$sStr = ""; $sStr = "";
$iCatCount = 0; $iCatCount = 0;
@@ -288,6 +288,14 @@ class Category {
} }
} }
// QEMU
if($iqSysId)
{
$oqSys = new qemuSystem($iqSysId);
$sStr .= " (".$oqSys->sDescription.")";
}
return $sStr; return $sStr;
} }
@@ -405,9 +413,9 @@ class Category {
/** /**
* display the full path of the Category we are looking at * display the full path of the Category we are looking at
*/ */
function displayPath($appId, $versionId = '') function displayPath($appId, $versionId = '', $qsysId = '')
{ {
$sCatFullPath = Category::make_cat_path($this->getCategoryPath(), $appId, $versionId); $sCatFullPath = Category::make_cat_path($this->getCategoryPath(), $appId, $versionId, $qsysId);
echo html_frame_start("",'98%','',2); echo html_frame_start("",'98%','',2);
echo "<p><b>Category: ". $sCatFullPath ."</b><br>\n"; echo "<p><b>Category: ". $sCatFullPath ."</b><br>\n";
echo html_frame_end(); echo html_frame_end();

24
include/version.php
View File

@@ -251,14 +251,18 @@ class version {
} }
} }
// QEMU
if($this->iqsysId && ($this->iqsysId!=$oVersion->iqsysId)) if($this->iqsysId && ($this->iqsysId!=$oVersion->iqsysId))
{ {
$oqSysBefore = new qemuSystem($oVersion->iqsysId);
$oqSysAfter = new qemuSystem($this->iqsysId);
if(!query_parameters("UPDATE appVersion SET qsysId = '?' WHERE versionId = '?'", if(!query_parameters("UPDATE appVersion SET qsysId = '?' WHERE versionId = '?'",
$this->iqsysId, $this->iVersionId)) $this->iqsysId, $this->iVersionId))
return FALSE; return FALSE;
$sWhatChanged .= "System was changed from $oVersion->iqsysId to ". $sWhatChanged .= "System was changed from $oqSysBefore->sDescription to ".
"$this->iqsysId.\n\n"; "$oqSysAfter->sDescription.\n\n";
} }
if($this->objectGetState() != $oVersion->objectGetState()) if($this->objectGetState() != $oVersion->objectGetState())
@@ -866,7 +870,7 @@ class version {
// cat // cat
$oCategory = new Category($oApp->iCatId); $oCategory = new Category($oApp->iCatId);
$oCategory->displayPath($oApp->iAppId, $this->iVersionId); $oCategory->displayPath($oApp->iAppId, $this->iVersionId, $this->iqsysId);
// set URL // set URL
$appLinkURL = ($oApp->sWebpage) ? trimmed_link($oApp->sWebpage,30) : "&nbsp;"; $appLinkURL = ($oApp->sWebpage) ? trimmed_link($oApp->sWebpage,30) : "&nbsp;";
@@ -929,6 +933,10 @@ class version {
echo "<tr class=\"$sRatingColor\" valign=\"top\"><td><b>Rating</b></td><td>".$sRating."</td></tr>\n"; echo "<tr class=\"$sRatingColor\" valign=\"top\"><td><b>Rating</b></td><td>".$sRating."</td></tr>\n";
echo "<tr class=\"$sRatingColor\" valign=\"top\"><td><b>QEMU Version</b></td><td>".$sRelease."</td></tr>\n"; echo "<tr class=\"$sRatingColor\" valign=\"top\"><td><b>QEMU Version</b></td><td>".$sRelease."</td></tr>\n";
// QEMU
$oqsysrating = new qemuSystem($this->iqsysId);
echo "<tr class=\"$sRatingColor\" valign=\"top\"><td><b>Emulated system</b></td><td>".$oqsysrating->sDescription."</td></tr>\n";
// Download URLs // Download URLs
if($sDownloadurls = downloadurl::display($this->iVersionId)) if($sDownloadurls = downloadurl::display($this->iVersionId))
echo $sDownloadurls; echo $sDownloadurls;
@@ -1277,6 +1285,10 @@ class version {
$oTableRow->AddCell($oTableCell); $oTableRow->AddCell($oTableCell);
$oTableCell = new TableCell("QEMU version"); $oTableCell = new TableCell("QEMU version");
$oTableCell->SetWidth("100");
$oTableRow->AddCell($oTableCell);
$oTableCell = new TableCell("Emulated system");
$oTableCell->SetWidth("80"); $oTableCell->SetWidth("80");
$oTableRow->AddCell($oTableCell); $oTableRow->AddCell($oTableCell);
@@ -1339,6 +1351,12 @@ class version {
$oTableCell->SetAlign("center"); $oTableCell->SetAlign("center");
$oTableRow->AddCell($oTableCell); $oTableRow->AddCell($oTableCell);
// QEMU
$oqsysrating = new qemuSystem($oVersion->iqsysId);
$oTableCell = new TableCell($oqsysrating->sDescription);
$oTableCell->SetAlign("left");
$oTableRow->AddCell($oTableCell);
$oTableCell = new TableCell(testData::get_testdata_count_for_versionid($oVersion->iVersionId)); $oTableCell = new TableCell(testData::get_testdata_count_for_versionid($oVersion->iVersionId));
$oTableCell->SetAlign("center"); $oTableCell->SetAlign("center");
$oTableRow->AddCell($oTableCell); $oTableRow->AddCell($oTableCell);