franzz/databap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix table description (adding table's name)

Browse Source
This commit is contained in:
lutranf
2014-09-03 14:25:53 +02:00
parent 5fb3c8a32c
commit 48b112583a
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
inc/databap.php
View File

@@ -1150,7 +1150,7 @@ class Databap extends PhpObject
{ {
$asTable['system'] = self::getTableFormat($asTable['system']); $asTable['system'] = self::getTableFormat($asTable['system']);
$asTable['title'] = self::getTableFormat($asTable['title']); $asTable['title'] = self::getTableFormat($asTable['title']);
$asTable['description'] = self::getDescriptionFormat($asTable['description']); $asTable['description'] = $asTable['title'].' - '.self::getDescriptionFormat($asTable['description']);
$asTable['led'] = self::getDateFormat($asTable['led']); $asTable['led'] = self::getDateFormat($asTable['led']);
$asTable['formatted_keywords'] = str_replace("\n", '<br />', ToolBox::findReplaceLinks($asTable['keywords'])); $asTable['formatted_keywords'] = str_replace("\n", '<br />', ToolBox::findReplaceLinks($asTable['keywords']));
} }
@@ -2233,43 +2233,40 @@ class Databap extends PhpObject
public function getItemList() public function getItemList()
{ {
$sIdCodeCol = MySqlManager::getId(self::CODE_TABLE); $asUsers = $asItemList = array();
$sIdProcCol = MySqlManager::getId(self::PROC_TABLE);
$sIdArtCol = MySqlManager::getId(self::ART_TABLE);
$sIdDocCol = MySqlManager::getId(self::DOC_TABLE);
$sIdTableCol = MySqlManager::getId(self::TABL_TABLE);
$sIdCodeColFull = MySqlManager::getId(self::CODE_TABLE, true);
$sIdUserCol = MySqlManager::getId(self::USER_TABLE); $sIdUserCol = MySqlManager::getId(self::USER_TABLE);
$sIdUserColFull = MySqlManager::getId(self::USER_TABLE, true);
$sLedColFull = MySqlManager::getFullColumnName(self::CODE_TABLE, 'led') ;
//TODO phrases for all item types? //TODO phrases for all item types?
$asUsers = $asCode = $asItemList = array(); $asTypeTables = $this->getTypeInfo('table');
$asTypes = $this->getTypeInfo('table'); foreach($asTypeTables as $sType=>$sTable)
foreach($asTypes as $sType=>$sTable)
{ {
$sTableIdCol = MySqlManager::getId($sTable);
//selecting last version among codes having the same refer_id //selecting last version among codes having the same refer_id
$sTableIdCol = MySqlManager::getId($sTable);
$asInfo = array('select' => array("MAX({$sTableIdCol}) AS id_item"), $asInfo = array('select' => array("MAX({$sTableIdCol}) AS id_item"),
'from' => $sTable, 'from' => $sTable,
'groupBy' => array(($sType==self::ART_TYPE)?$sTableIdCol:'refer_id'), //except for articles 'groupBy' => array(($sType==self::ART_TYPE)?$sTableIdCol:'refer_id'), //no versioning for articles
'orderBy' => array('id_item'=>'desc')); 'orderBy' => array('id_item'=>'desc'));
//Build code info structure //Build code info structure
$asTypedItemIds = array_filter($this->oMySql->selectRows($asInfo)); //null value returned from query (MAX(...)) $asTypedItemIds = array_filter($this->oMySql->selectRows($asInfo)); //null value returned from query (MAX(...))
foreach($asTypedItemIds as $iItemId) foreach($asTypedItemIds as $iItemId)
{ {
//Getting item info
$asItem = call_user_func(array($this, 'get'.ucfirst($this->getPagesFromHash($sType)).'Info'), $iItemId); $asItem = call_user_func(array($this, 'get'.ucfirst($this->getPagesFromHash($sType)).'Info'), $iItemId);
$asItem['type'] = $sType; $asItem['type'] = $sType;
$asItem['id_item'] = $iItemId; $asItem['id_item'] = $iItemId;
if(array_key_exists($sIdUserCol, $asItem)) //replacing user's id with user's name & company (if not done already)
//Replacing user's id with user's name & company (if not done already)
if(array_key_exists($sIdUserCol, $asItem))
{ {
$iUserId = $asItem[$sIdUserCol]; $iUserId = $asItem[$sIdUserCol];
if(!array_key_exists($iUserId, $asUsers)) $asUsers[$iUserId] = $this->getUserInfo($iUserId); if(!array_key_exists($iUserId, $asUsers)) $asUsers[$iUserId] = $this->getUserInfo($iUserId);
$asItem['name'] = $asUsers[$iUserId]['name']; $asItem['name'] = $asUsers[$iUserId]['name'];
$asItem['company'] = $asUsers[$iUserId]['company']; $asItem['company'] = $asUsers[$iUserId]['company'];
} }
//Preparing key for reverse sorting
$asItemList[$asItem['timestamp'].$asItem['type'].$asItem['id_item']] = $asItem; $asItemList[$asItem['timestamp'].$asItem['type'].$asItem['id_item']] = $asItem;
} }
} }