Adjusting add location operation

Author: arnebratt

classes/lib.php

@@ -95,11 +95,10 @@ function importAttribute( $data, &$contentObjectAttribute )
 function addNodeAssignment( $content_object, $parent_node_id, $set_as_main_node = false )
 {
     $main_node_id = $content_object->attribute( 'main_node_id' );
-    $insertedNode =& $content_object->addLocation( $parent_node_id, true );
+    $insertedNode = $content_object->addLocation( $parent_node_id, true );
     // Now set it as published and fix main_node_id
     $insertedNode->setAttribute( 'contentobject_is_published', 1 );
-    $contentObject = eZContentObject::fetch( $objectID );
-    $parentContentObject = eZContentObject::fetchByNodeID( $parentMainNodeID );
+    $parentContentObject = eZContentObject::fetchByNodeID( $parent_node_id );
     if ( $set_as_main_node )
     {
         $main_node_id = $insertedNode->attribute( 'node_id' );

operations/nodeassignlocations.php

@@ -7,8 +7,9 @@ function getHelpText()
     {
         return '
 --operation="nodeassignlocations;locations=<node_id,node_id...>"
- 
-locations - a colon separated list of new parent nodes to assign to this node
+
+Add new locations under the specified parent node id\'s
+locations - a colon separated list of new parent node id\'s to assign to this node
 ';
     }
 
@@ -35,19 +36,24 @@ function setParameters( $parm_array )
 
     // Assign locations to the given node
     // locations - an array of node IDs for new parent nodes
-    function runOperation( &$object )
+    function runOperation( &$node )
     {
-        $result = true;
-
-        require_once( 'kernel/classes/ezcontentobject.php' );
+        $db = eZDB::instance();
+        $db->begin();
 
         foreach ($this->locations as $location)
         {
-            $contentobject = $object->object();
-            $result = $result && $contentobject->AddLocation( $location, true );
+            $contentobject = $node->object();
+            $id = $contentobject->addLocation( $location, true );
+            if ( empty( $id ) )
+            {
+                $db->rollback();
+                return false;
+            }
         }
 
-        return $result;
+        $db->commit();
+        return true;
     }
 
     var $locations = array();