Changeset 6514

Timestamp:

06/15/12 09:32:00 (11 years ago)

Author:

gustavo

Message:

Ticket #2766 - implementacao da dfd0065 e correcao de bugs da dfd0099

Location:

sandbox/2.4.1-3/prototype

Files:

• api/datalayer.js (modified) (6 diffs)
• services/PostgreSQL.php (modified) (5 diffs)

sandbox/2.4.1-3/prototype/api/datalayer.js

@@ -195 +195 @@
     
     send: function( url, type, data, callback, sync, extraOptions ){
-      
+
           var result = false, fired = false;
       
@@ -243 +243 @@
 
           $.ajax( envelope );
-      
           return( result );
     },
@@ -260 +259 @@
         //http://expressodev.prognus.com.br/cristiano/expresso-api/rest/maillast
         //return this.send( ('rest' + uri), [ 'get', accept || 'json' ], data, callback, !!!callback, 
+console.log(this.dispatchPath+'../rest'+uri);
         return this.send( (this.dispatchPath + '../rest' + uri), [ 'get', accept || 'json' ], data, callback, !!!callback, 
         {'beforeSend' : function (xhr){ 
@@ -277 +277 @@
     
     create: function( uri, data, callback, accept ){
-                //return this.send( 'rest' + uri, [ 'post', accept || 'json' ], data, callback, !!!callback, 
-                return this.send( (this.dispatchPath + '../rest' + uri), [ 'post', accept || 'json' ], data, callback, !!!callback, 
-                {'beforeSend' : function (xhr){ 
-                        xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)} 
-                });      
+        //return this.send( 'rest' + uri, [ 'post', accept || 'json' ], data, callback, !!!callback, 
+        return this.send( (this.dispatchPath + '../rest' + uri), [ 'post', accept || 'json' ], data, callback, !!!callback, 
+        {'beforeSend' : function (xhr){ 
+                //xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)} 
+                xhr.setRequestHeader('Authorization', "OAUTH Bearer " + (DataLayer.me ? DataLayer.me.token : DataLayer.dispatch("../prototype/me").token))} 
+        });      
     },
 
@@ -298 +299 @@
         return this.send( (this.dispatchPath + '../rest' + uri), [ 'put', accept || 'json' ], data, callback, !!!callback, 
         {'beforeSend' : function (xhr){ 
-            xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)} 
+            //xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)} 
+                xhr.setRequestHeader('Authorization', "OAUTH Bearer " + (DataLayer.me ? DataLayer.me.token : DataLayer.dispatch("../prototype/me").token))} 
         });
       
@@ -312 +314 @@
     */
 
-    "delete": function( uri, callback, accept ){
-      
+    delete: function( uri, callback, accept ){
         //return this.send( 'rest' + uri, [ 'delete', accept || 'json' ], false, callback, !!!callback, 
         return this.send( (this.dispatchPath + '../rest' + uri), [ 'delete', accept || 'json' ], false, callback, !!!callback, 
         {'beforeSend' : function (xhr){ 
-            xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)} 
+            //xhr.setRequestHeader('Authorization', "OAUTH Bearer " + DataLayer.me.token)} 
+                xhr.setRequestHeader('Authorization', "OAUTH Bearer " + (DataLayer.me ? DataLayer.me.token : DataLayer.dispatch("../prototype/me").token))} 
         });
       

sandbox/2.4.1-3/prototype/services/PostgreSQL.php

@@ -89 +89 @@
             $map = Config::get($uri['concept'], 'PostgreSQL.mapping');
             $criteria = ($criteria !== false) ? $this->parseCriteria ( $criteria , $map , ' WHERE '.$map['id'].' = \''.addslashes( $uri['id'] ).'\'') : ' WHERE '.$map['id'].' = \''.addslashes( $uri['id'] ).'\'';
+
             return $this->execSql('UPDATE '.(Config::get($uri['concept'],'PostgreSQL.concept')).' '. self::parseUpdateData( $data ,$map).$criteria);
     }
@@ -199 +200 @@
                     $val[] = '\''.addslashes($v).'\'';
             }
-
-//          return '('.implode(',', $ind).') VALUES ('.implode(',', $val).') RETURNING '.$map['id'].' as id';       
-            return '('.implode(',', $ind).') VALUES ('.implode(',', $val).') RETURNING id';         
+            return '('.implode(',', $ind).') VALUES ('.implode(',', $val).') RETURNING '.$map['id'].' as id';       
     }
         
@@ -247 +246 @@
                     $query .= ' GROUP BY '.( is_array($criteria["group"]) ? implode(', ', $criteria["group"]) : $criteria["group"] ).' ';
             }
-            
+   
             if( isset($criteria["order"]) )
             {
-                    $query .= ' ORDER BY '.self::parseOrder( $criteria["order"], $map ).' ';
-            }
+                    //Verificar se os atributos para o ORDER BY serao ordenados em ordem decrescente [DESC]
+                    $orderDesc = ( isset($criteria["orderDesc"]) && count($criteria["order"]) == count($criteria["orderDesc"]) ) ? $criteria["orderDesc"] : false;
+                
+                    $query .= ' ORDER BY '.self::parseOrder( $criteria["order"], $map, $orderDesc ).' ';
+            
+            }
+
             if( isset($criteria["limit"]) )
             {
@@ -342 +346 @@
     }
 
-   private static function parseOrder($order , &$map)
+    private static function parseOrder($order , &$map, $orderDesc=false)
     {
-                  
+
         if($notArray = !is_array($order)) //Caso seja um full select pegar todas as keys
             $order = array( $order );
+
+        //Caso seja feita ordenacao em ordem descrescente
+        //concatenar DESC em cada atributo
+        if($orderDesc !== false){
+                if(!is_array($orderDesc)){
+                        $orderDesc = array( $orderDesc );
+                }
+
+                for($i=0; $i<count($order); $i++){
+                        $order[$i] .= ($orderDesc[$i] === true) ? ' DESC' : '';
+                }
+        }
 
         $return = array();
@@ -359 +375 @@
         return ( $notArray ?  $order[0] : implode(', ', $order) );
     }
+
 }