fix: search engine reset

This commit is contained in:
2013-10-29 21:44:17 +01:00
parent 2661e933da
commit 46aa984c2a
3 changed files with 11 additions and 26 deletions

View File

@@ -375,7 +375,7 @@ class Databap extends PhpObject
$this->oMySql->insertRow(MySqlManager::CHAN_TABLE, array('safe_name'=>self::getChanSafeName(self::DEFAULT_CHAN), MySqlManager::getText(MySqlManager::CHAN_TABLE)=>self::DEFAULT_CHAN));
//Install default users : admin and test
$iAdminId = $this->addUser('francois', 'lutran', 'cgi', 'francois@lutran.fr', self::CLEARANCE_ADMIN);
$iAdminId = $this->addUser('françois', 'lutran', 'cgi', 'francois@lutran.fr', self::CLEARANCE_ADMIN);
$this->addUser('test', 'test', 'test', 'test@test.com');
//Write the SAP blog parser bash script to main folder
@@ -693,7 +693,7 @@ class Databap extends PhpObject
self::ART_TYPE=>MySqlManager::ART_TABLE,
self::DOC_TYPE=>MySqlManager::DOC_TABLE);
$this->oMySql->getArrayQuery("TRUNCATE ".MySqlManager::SEARCH_TABLE);
$this->oMySql->emptyTable(MySqlManager::SEARCH_TABLE);
foreach($asSearchTypes as $sSearchType=>$sSearchTable)
{
$asItemIds = $this->oMySql->selectRows(array('select'=>MySqlManager::getId($sSearchTable), 'from'=>$sSearchTable));
@@ -4168,6 +4168,12 @@ class MySqlManager extends PhpObject
$this->setQuery("DELETE FROM ".$sTable." WHERE ".$this->getId($sTableName)." = ".$iTableId);
}
}
public function emptyTable($sTableName)
{
$this->cleanSql($sTableName);
$this->setQuery("TRUNCATE ".$sTableName);
}
public function selectRows($asInfo, $bStringOnly=true, $sGroupBy='')
{
@@ -4523,12 +4529,12 @@ class ToolBox
return (preg_match('/^.{1}/us', $sText, $ar) == 1);
}
function mb_ucwords($sText)
public static function mb_ucwords($sText)
{
return mb_convert_case($sText, MB_CASE_TITLE, "UTF-8");
}
function file_get_contents_utf8($oFile)
public static function file_get_contents_utf8($oFile)
{
$sContent = file_get_contents($oFile);
return mb_convert_encoding($sContent, 'UTF-8', mb_detect_encoding($sContent, 'UTF-8, ISO-8859-1', true));