Changeset 20387 for lang/php/misc/Hermit/example/employee/hoge.php

Timestamp:

10/01/08 21:02:13 (3 months ago)

Author:

nowelium

Message:

 

Files:

• lang/php/misc/Hermit/example/employee/hoge.php (modified) (2 diffs)

lang/php/misc/Hermit/example/employee/hoge.php

@@ -9 +9 @@
     public function __construct(){
         //HermitDaoManager::set(__CLASS__, 'EmployeeDao');
-<<<<<<< .mine
-        $dao = new Hermit('EmployeeDao');
-        //$result = $dao->getAllEmployeeList();
-        //$result = $dao->getEmployeeByEmpNo(7698);
-        /*
-=======
         $this->dao = new Hermit('EmployeeDao');
     }
@@ -24 +18 @@
     }
     public function getEmp(){
->>>>>>> .r20319
         $emp = new Employee;
         $emp->empno = 7566;
         $emp->ename = 'JONES';
-<<<<<<< .mine
-        $result = $dao->getEmployee($emp);
-        */
-        $result = $dao->getEmployeeAndDepartment();
-        return $result;
-=======
         return $this->dao->getEmployee($emp);
->>>>>>> .r20319
     }
 }