Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minor changes

Browse source
This commit is contained in:
tomash 2006-04-04 23:14:22 +00:00
parent 85d66b8c3a
commit 42b4bae413
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
livesupport/src/modules/storageServer/var/Backup.php
View file

@ -317,7 +317,7 @@ class Backup {
*/ */
function setEnviroment($createDir=false) { function setEnviroment($createDir=false) {
if ($this->loglevel=='debug') { if ($this->loglevel=='debug') {
$this->addLogItem("-I- ".date("Ymd-H:i:s")." setEnviroment - createDirs:$createDirs\n"); $this->addLogItem("-I- ".date("Ymd-H:i:s")." setEnviroment - createDirs:$createDir\n");
} }
# create a temporary directories # create a temporary directories
if (is_null($this->token) && $createDir) { if (is_null($this->token) && $createDir) {

9
livesupport/src/modules/storageServer/var/DataEngine.php
View file

@ -281,16 +281,19 @@ class DataEngine{
function _localGenSearch($criteria, $limit=0, $offset=0, function _localGenSearch($criteria, $limit=0, $offset=0,
$brFldNs=NULL, $brFld=NULL) $brFldNs=NULL, $brFld=NULL)
{ {
$filetype = strtolower($criteria['filetype']); $filetype = (isset($criteria['filetype']) ? $criteria['filetype'] : 'all');
$filetype = strtolower($filetype);
if(!array_key_exists($filetype, $this->filetypes)){ if(!array_key_exists($filetype, $this->filetypes)){
return PEAR::raiseError( return PEAR::raiseError(
'DataEngine::_localGenSearch: unknown filetype in search criteria' 'DataEngine::_localGenSearch: unknown filetype in search criteria'
); );
} }
$filetype = $this->filetypes[$filetype]; $filetype = $this->filetypes[$filetype];
$operator = strtolower($criteria['operator']); $operator = (isset($criteria['operator']) ? $criteria['operator'] : 'and');
$operator = strtolower($operator);
$desc = (isset($criteria['desc']) ? $criteria['desc'] : NULL); $desc = (isset($criteria['desc']) ? $criteria['desc'] : NULL);
$whereArr = $this->_makeWhereArr($criteria['conditions']); $conditions = (isset($criteria['conditions']) ? $criteria['conditions'] : array());
$whereArr = $this->_makeWhereArr($conditions);
$orderbyQn = $orderbyQn =
(isset($criteria['orderby']) ? $criteria['orderby'] : NULL); (isset($criteria['orderby']) ? $criteria['orderby'] : NULL);
$obSplitQn = XML_Util::splitQualifiedName($orderbyQn); $obSplitQn = XML_Util::splitQualifiedName($orderbyQn);