Changeset 2945

Timestamp:

07/23/08 17:23:10 (1 month ago)

Author:

alexandrej

Message:

Mise à jour Heading

Files:

• trunk/project/modules/devel/cms3/heading/classes/headingelementinformationservices.class.php (modified) (3 diffs)
• trunk/project/modules/devel/cms3/heading/classes/headingservices.class.php (modified) (2 diffs)
• trunk/project/modules/devel/cms3/heading/install/scripts/install.pdo_mysql.sql (modified) (1 diff)
• trunk/project/modules/devel/cms3/heading/tests/heading_headingtest.class.php (modified) (2 diffs)

trunk/project/modules/devel/cms3/heading/classes/headingelementinformationservices.class.php

@@ -146 +146 @@
-     */
-    public function getNextVersion ($pPublicId) {
+        return $this->getMaxVersion ($pPublicId) + 1;
+    }
+    
+    /**
+     * Donne le numéro de version maximum pour un identifiant donné 
+     *
+     * @param int $pPublicId    l'identifiant publique de l'élément dont on souhaite connaitre le numéro de version
+     * @return int  le numéro de version a venir 
+     */
+    public function getMaxVersion ($pPublicId){
-        $parameters = _daoSp ()->addCondition ('public_id_hei', '=', $pPublicId)
-                               ->orderby (array('version_hei', 'DESC'))
-                               ->setLimit (0, 1);
-$results = _dao('headingelementinformation')->findBy ($parameters);
-                                           
-return $results[0]->version_hei+1;
-   
+if (count ($results = _dao('headingelementinformation')->findBy ($parameters)) <= 1){
+throw new CopixException ('Element inexistant '.$pPublicId);
+}
+return $results[0]->version_hei;
-    }
-    
@@ -159 +169 @@
-     */
-    public function getHeadingPathFromId ($pId){
-        CopixClassesFactory::fileInclude('heading|headingelementinformation');
-        $parameters = _daoSp ()->addCondition ('id_helt', '=', $pId);
-        if (_dao('headingelementinformation')->findBy ($parameters) !== false) {
-HeadingServices::getPathFromId ($pId); 
+_class ('heading|headingelementinformation')->getPathFromId($pId);
-        }
-    }   
@@ -170 +179 @@
-     */
-    public function getHeadingPathFromPublicId ($pId){
-        CopixClassesFactory::fileInclude('heading|headingelementinformation');
-        $parameters = _daoSp ()->addCondition ('public_id_hei', '=', $pId);
-        if (_dao('headingelementinformation')->findBy ($parameters) !== false) {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }   
-}

trunk/project/modules/devel/cms3/heading/classes/headingservices.class.php

@@ -20 +20 @@
-        CopixDB::begin ();
-        try {
-            //récupération de la rubrique parente
-            $parentPublicId = 0;
-
-            //création de l'enregistrement
-            $record = _record ('heading')->initFromDbObject (_ppo ($pHeadingDescription));
@@ -29 +26 @@
-            $record->id_helt = $record->id_head;
-            $record->type_hei = 'heading';
-arentPublicId
+HeadingDescription->parent_heading_public_id_hei
-            $record->caption_hei = $pHeadingDescription->caption_hei;
-

trunk/project/modules/devel/cms3/heading/install/scripts/install.pdo_mysql.sql

@@ -37 +37 @@
-) AUTO_INCREMENT=0 ;
-
-
+,
-(0, 0, NULL);

trunk/project/modules/devel/cms3/heading/tests/heading_headingtest.class.php

@@ -26 +26 @@
-    }
-    
-c
+testC
-        $r1 = _ppo (array ('parent_heading_public_id_hei'=>0,
-2
+1
-                    ));
-        _class ('heading|headingservices')->insert ($r1);
@@ -46 +46 @@
-                    ));
-        _class ('heading|headingservices')->insert ($r11);      
+
+        $r12 = _ppo (array ('parent_heading_public_id_hei'=>$r1->public_id_hei,
+                            'caption_hei'=>'R12'
+                    ));
+        _class ('heading|headingservices')->insert ($r12);      
+        
+        $r121 = _ppo (array ('parent_heading_public_id_hei'=>$r12->public_id_hei,
+                            'caption_hei'=>'R121'
+                    ));
+        _class ('heading|headingservices')->insert ($r121);
+
+        $r122 = _ppo (array ('parent_heading_public_id_hei'=>$r12->public_id_hei,
+                            'caption_hei'=>'R122',
+                            'description_head'=>'Description de la rubrique 122'
+                    ));
+        _class ('heading|headingservices')->insert ($r122);
+
+        return compact ('r1', 'r2', 'r3', 'r11', 'r12', 'r121');
+    }
+    
+    public function testGetPath (){
+        $headingCreated = $this->testCreationArbo ();
-    }
-