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

Move matching of categories in SQL statements to a separate functions

Browse Source
This commit is contained in:
Alexander Nicolaysen Sørnes
2009-08-09 15:38:38 +02:00
parent e40aec5d84
commit 0fe5512f08
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/application.php
View File

@@ -1022,14 +1022,7 @@ class Application {
if($aOptions['appCategory']) if($aOptions['appCategory'])
{ {
$oCategory = new Category($aOptions['appCategory']); $oCategory = new Category($aOptions['appCategory']);
$aSubCats = $oCategory->getSubCatList(); $sWhereFilter .= ' AND ' . $oCategory->getSqlQueryPart();
$sWhereFilter .= " AND ( catId = '{$aOptions['appCategory']}' ";
foreach($aSubCats as $oCat)
{
$iCatId = $oCat->objectGetId();
$sWhereFilter .= " OR catId = '$iCatId' ";
}
$sWhereFilter .= ") ";
} }
/* Should we add a limit clause to the query? */ /* Should we add a limit clause to the query? */
if($iRows || $iStart) if($iRows || $iStart)
@@ -1278,14 +1271,7 @@ class Application {
if($aOptions['appCategory']) if($aOptions['appCategory'])
{ {
$oCategory = new Category($aOptions['appCategory']); $oCategory = new Category($aOptions['appCategory']);
$aSubCats = $oCategory->getSubCatList(); $sWhereFilter .= ' AND ' . $oCategory->getSqlQueryPart();
$sWhereFilter .= " AND ( catId = '{$aOptions['appCategory']}' ";
foreach($aSubCats as $oCat)
{
$iCatId = $oCat->objectGetId();
$sWhereFilter .= " OR catId = '$iCatId' ";
}
$sWhereFilter .= ") ";
} }
if($sState != 'accepted' && !application::canEdit()) if($sState != 'accepted' && !application::canEdit())

17
include/category.php
View File

@@ -176,6 +176,23 @@ class Category {
return $aCats; return $aCats;
} }
/* Returns an SQL statement that will match items in the current category
and all sub-categories */
public function getSqlQueryPart()
{
$sRet = '';
$aSubCats = $this->getSubCatList();
$sRet .= " ( catId = '{$this->iCatId}' ";
foreach($aSubCats as $oCat)
{
$iCatId = $oCat->objectGetId();
$sRet .= " OR catId = '$iCatId' ";
}
$sRet .= ") ";
return $sRet;
}
function objectGetMail($sAction, $bMailSubmitter, $bParentAction) function objectGetMail($sAction, $bMailSubmitter, $bParentAction)
{ {
/* We don't send notification mails */ /* We don't send notification mails */