Changeset 5441 for trunk/prototype/services/PostgreSQL.php

Timestamp:

01/27/12 19:21:30 (12 years ago)

Author:

cristiano

Message:

Ticket #2434 - Atualização modulo agenda e API - Correções de serviços

File:

• trunk/prototype/services/PostgreSQL.php (modified) (5 diffs)

trunk/prototype/services/PostgreSQL.php

@@ -8 +8 @@
     
     public function find ( $uri, $justthese = false, $criteria = false ){
-         
+                   
         $map =  Config::get($uri['concept'], 'PostgreSQL.mapping');
         
@@ -38 +38 @@
 
     public function replace ( $uri,  $data, $criteria = false ){
-            
-            return $this->execSql('UPDATE '.(Config::get($uri['concept'],'PostgreSQL.concept')).' '. self::parseUpdateData( $data ,$uri['concept']).' '.self::parseCriteria($criteria , $uri['concept']));
+            $map = Config::get($uri['concept'], 'PostgreSQL.mapping');
+            return $this->execSql('UPDATE '.(Config::get($uri['concept'],'PostgreSQL.concept')).' '. self::parseUpdateData( $data ,$map).' '.self::parseCriteria($criteria , $map));
     }
                 
     public function update ( $uri,  $data ){
-            return $this->execSql('UPDATE '.(Config::get($uri['concept'],'PostgreSQL.concept')).' '. self::parseUpdateData( $data ,$uri['concept']).' WHERE id = \''. addslashes( $uri['id']) .'\'');
+            $map = Config::get($uri['concept'], 'PostgreSQL.mapping');
+            return $this->execSql('UPDATE '.(Config::get($uri['concept'],'PostgreSQL.concept')).' '. self::parseUpdateData( $data ,$map).' WHERE id = \''. addslashes( $uri['id']) .'\'');
     }
 
@@ -145 +146 @@
     }
         
-    private static function parseUpdateData( $data , $concept){
-            
-            $map = Config::get($concept, 'PostgreSQL.mapping');
-                        
+    private static function parseUpdateData( $data , &$map){
+                                            
             $d = array();
             foreach ($data as $i => $v)
@@ -192 +191 @@
                 */
 
-                    $result .= 'WHERE '.self::parseFilter( $criteria['filter'] , $map);
+                    $result .= 'WHERE ('.self::parseFilter( $criteria['filter'] , $map).')';
             }
             /*
@@ -236 +235 @@
 
             foreach( $filter as $i => $f )
-                $nested[] = self::parseFilter( $f , $map);
-
-            return( '('.implode( ' '.$op.' ', $nested ).')' );
+                if( $n = self::parseFilter( $f , $map))
+                    $nested[] = $n; 
+
+                
+            return (count($nested) > 0 ) ? '('.implode( ' '.$op.' ', $nested ).')' : '';
         }
 
-        
-        if(isset($map[$filter[0]]))
-            $filter[0] = $map[$filter[0]];
+        if(!isset($map[$filter[0]])) return '';
+                  
+        $filter[0] = $map[$filter[0]];
         
         $igSuffix = $igPrefix = '';