Changeset 6526 for sandbox/2.4.1-3/prototype/api/controller.php

Timestamp:

06/15/12 16:30:56 (12 years ago)

Author:

gustavo

Message:

Ticket #2766 - Preparativos para fazer o merge com o trunk da comunidade

File:

• sandbox/2.4.1-3/prototype/api/controller.php (modified) (13 diffs)

sandbox/2.4.1-3/prototype/api/controller.php

@@ -45 +45 @@
 require_once(ROOTPATH.'/api/config.php');
 use prototype\api\Config as Config;
-
 /**
 TODO list:
@@ -181 +180 @@
         public static function rollback( $URI, $criteria = false )
         {
+            if( isset( $URI['service'] ) )
+                unset( self::$tx[ $URI['service'] ] );
+
+            self::$txID--;
+
             return self::call( 'rollback', $URI, false, $criteria );
         }
@@ -485 +489 @@
 
                     if( $return === false )
-                return( false );
+                        return( false );
 
                     if( isset($return) )
@@ -530 +534 @@
             return( $URI );
         }
+        
+        public static function finalizeCommit( $method, $params, $original, $TX = array() )
+        {
+            if( $TX !== false )
+            {
+                $TX['rollback'] = !!!$params['properties'];
+
+                if( $params['properties'] && is_array($params['properties']) && isset($params['properties']['id']) )
+                    $TX['id'] = $params['properties']['id'];
+
+                self::$tx[ $params['URI']['service'] ][] = array_merge( $TX, $original['URI'], array( 'service' => $params['URI']['service'], 'method' => $method ) );
+            }
+
+            return( empty($params['properties']) ? false : $params['properties'] );
+        }
 
         //TODO: Compatibilizar as configs relativas aos modulos, adicionando os mesmos nas options passadas
@@ -544 +563 @@
 
                 if( isset($params['URI']['concept'])  && !self::fire( 'before', $method, $params, $original ) )
-                    return( empty($params['properties']) ? false : $params['properties'] );
-
-                
+                   return( self::finalizeCommit( $method, $params, $original ) );
 
                 if( $params && !$params['service'] )
@@ -568 +585 @@
 
                     if( !self::fire( 'before', $method, $params, $original, true ) )
-                        return( empty($params['properties']) ? false : $params['properties'] );
+                        return( self::finalizeCommit( $method, $params, $original, isset($TX) ? $TX : false ) );
                 }
 
@@ -608 +625 @@
                 if( isset($params['URI']['service']) )
                     if( !self::fire( 'after', $method, $params, $original, true ) )
-                        return( empty($params['properties']) ? false : $params['properties'] );
+                        return( self::finalizeCommit( $method, $params, $original, isset($TX) ? $TX : false ) );
 
                 if( isset($URI['concept']) )
@@ -618 +635 @@
                 if( isset( $TX ) )
                 {
-                    $TX['rollback'] = !!!$params['properties'];
-
-                    if( $params['properties'] && is_array($params['properties']) && isset($params['properties']['id']) )
-                        $TX['id'] = $params['properties']['id'];
-
-                    self::$tx[ $params['URI']['service'] ][] = array_merge( $TX, $original['URI'], array( 'service' => $params['URI']['service'], 'method' => $method ) );
-
+                    //self::finalizeCommit( $params, $original, $method, $TX );
+                    self::finalizeCommit( $method, $params, $original, $TX );
                     if( isset($commit) && $commit )
                     {
@@ -636 +648 @@
             catch( Exception $e )
             {
-                if( !self::fallback( $e ) )
+                if( !self::fallback( $e, $URI ) )
                     self::closeAll();
 
@@ -645 +657 @@
         }
 
-        public static function fallback( $exception )
+        public static function fallback( $exception, $URI )
         {
             $code = $exception->getCode();
@@ -652 +664 @@
                 {
                         $fn = self::$fallbackHandlers[ $code ];
-                        return $fn( $exception );
+                        return $fn( $exception, $URI );
                 }
 
@@ -717 +729 @@
                       $URI['id'] = $result['id'];
 
-                self::$tx[ $URI['service'] ][ count(self::$tx[ $URI['service'] ]) - 1 ]['order'] = $order;
-                self::$tx[ $URI['service'] ][ count(self::$tx[ $URI['service'] ]) - 1 ]['id'] = $URI['id'];
+                $index =  count(self::$tx[ $URI['service'] ]) - 1;
+
+                self::$tx[ $URI['service'] ][ $index ]['order'] = $order;
+                self::$tx[ $URI['service'] ][ $index ]['id'] = $URI['id'];
+
+                if( !isset(self::$tx[ $URI['service'] ][ $index ]['concept']) )
+                    self::$tx[ $URI['service'] ][ $index ]['concept'] = $URI['concept'];
 
                 foreach( $postpone as $linkTarget => $dt )
@@ -763 +780 @@
             catch( Exception $e )
             {
-                if( !self::fallback( $e ) )
+                if( !self::fallback( $e, $URI ) )
                     self::closeAll();