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

minor change

Browse source
This commit is contained in:
tomas 2005-07-28 11:43:49 +00:00
parent 88afcf426a
commit 91dfea7787
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
livesupport/modules/alib/var/m2tree.php
View file

@ -22,7 +22,7 @@ define('ALIBERR_MTREE', 10);
* ); * );
* </code></pre> * </code></pre>
* @author $Author: tomas $ * @author $Author: tomas $
* @version $Revision: 1.5 $ * @version $Revision: 1.6 $
* @see ObjClasses * @see ObjClasses
* Original author Tom Hlava * Original author Tom Hlava
*/ */
@ -397,6 +397,7 @@ class M2tree{
LEFT JOIN {$this->structTable} s ON id=objid AND parid=$rootId LEFT JOIN {$this->structTable} s ON id=objid AND parid=$rootId
WHERE id=$oid WHERE id=$oid
"); ");
if($this->dbc->isError($re)) return $re;
$re['level'] = intval($re['level']); $re['level'] = intval($re['level']);
return $re; return $re;
} }

8
livesupport/modules/alib/var/m2treeTest.php
View file

@ -2,7 +2,7 @@
require_once"m2tree.php"; require_once"m2tree.php";
class M2treeTest extends M2tree{ class M2treeTest extends M2tree{
function _test_addObj() function _test_init()
{ {
for($i=1; $i<=3; $i++){ for($i=1; $i<=3; $i++){
$r = $this->addObj("Publication$i", "Publication"); $r = $this->addObj("Publication$i", "Publication");
@ -27,7 +27,7 @@ class M2treeTest extends M2tree{
} }
function _test_check($title, $expected, $returned) function _test_check($title, $expected, $returned)
{ {
if($expected != $returned){ if($expected !== $returned){
return $this->dbc->raiseError( return $this->dbc->raiseError(
"m2tree::$title FAILED:\n". "m2tree::$title FAILED:\n".
" ###expected:\n$expected\n ---\n". " ###expected:\n$expected\n ---\n".
@ -41,7 +41,7 @@ class M2treeTest extends M2tree{
echo "# M2tree test:\n"; echo "# M2tree test:\n";
// addObj/dumpTree test: // addObj/dumpTree test:
$r = $this->_test_addObj(); $r = $this->_test_init();
if($this->dbc->isError($r)) return $r; if($this->dbc->isError($r)) return $r;
$expected = "RootNode $expected = "RootNode
Publication1 Publication1
@ -202,7 +202,7 @@ class M2treeTest extends M2tree{
$r = $this->_test_check('reset', $expected, $returned); $r = $this->_test_check('reset', $expected, $returned);
if($this->dbc->isError($r)) return $r; else echo $r; if($this->dbc->isError($r)) return $r; else echo $r;
echo "# OK\n"; echo "# M2tree OK\n";
return TRUE; return TRUE;
} }