Sfoglia il codice sorgente

More changes cannot relate items (course, session, user) see BT#4875

Julio Montoya 12 anni fa
parent
commit
0ca0f609b9

+ 1 - 1
main/inc/lib/sessionmanager.lib.php

@@ -279,7 +279,7 @@ class SessionManager {
             $query .= " LIMIT ".$options['limit'];
         }
         
-        var_dump($query);
+        //var_dump($query);
         
 		$result = Database::query($query);
 		$formatted_sessions = array();

+ 4 - 5
main/inc/lib/usermanager.lib.php

@@ -50,17 +50,16 @@ class UserManager {
             }
         }
                         
-        if (isset($params['user_id'])) {
+        if (isset($params['user_id'])) {            
             unset($params['user_id']);
-        }
-        
-        if ((empty($params['username']))) {
+        }        
+        if (empty($params['username'])) {
             return api_set_failure('provide a username');
         }
         
         // First check wether the login already exists
 		if (!self::is_username_available($params['username'])) {
-            
+            //Already added it            
             if (isset($params['return_item_if_already_exists']) && $params['return_item_if_already_exists']) {
                 $user_info = self::get_user_info($params['username']);
                 return $user_info;

+ 15 - 9
tests/migrate/migration.class.php

@@ -247,24 +247,30 @@ class Migration {
         
         if (!empty($table['dest_func'])) {
             //error_log('Calling '.$table['dest_func'].' on data recovered: '.print_r($dest_row, 1));            
-            $dest_row['return_item_if_already_exists'] = true;
-            
-            $item_result = call_user_func_array($table['dest_func'], array($dest_row, $this->data_list));
+            $dest_row['return_item_if_already_exists'] = true;            
+            $item_result = call_user_func_array($table['dest_func'], array($dest_row));
             
             //error_log('Result of calling ' . $table['dest_func'] . ': ' . print_r($item_result, 1));
             
             switch ($table['dest_table']) {
                 case 'course':
                     $this->data_list['courses'][$dest_row['uidIdCurso']] = $item_result;
-                    /*error_log('lols');
-                    error_log(print_r($dest_row, 1));                    
-                    error_log(print_r($this->data_list['courses'][$dest_row['uidIdCurso']],1));*/
-                    
                     $handler_id = $item_result['code'];                  
                     break;
                 case 'user':
-                    $handler_id = $item_result['user_id']; 
-                    $this->data_list['users_persona'][$dest_row['uidIdPersona']] = $item_result;                    
+                    if (!empty($item_result)) {                        
+                        $handler_id = $item_result['user_id'];
+                        $this->data_list['users_persona'][$dest_row['uidIdPersona']] = $item_result;
+                        error_log(print_r($this->data_list['users_persona'][$dest_row['uidIdPersona']],1));
+                    }
+                    
+                    //error_log('lols');
+                    //error_log(print_r($dest_row, 1));                    
+                    //error_log(print_r($this->data_list['users_persona'][$dest_row['uidIdPersona']],1));
+                    //error_log(print_r($item_result, 1));
+                    if (!empty($dest_row) && $table['orig_table'] == 'Persona' && !empty($dest_row['username'])) {
+                        //exit;
+                    }
                     break;
                 case 'session':
                     $handler_id = $item_result['session_id'];

+ 15 - 15
tests/migrate/migration.custom.class.php

@@ -42,13 +42,13 @@ class MigrationCustom {
     }
     
     public function log_original_persona_unique_id($data, &$omigrate, $row_data) {        
-        $omigrate['users_persona'][$row_data['uidIdPersona']] = $row_data;
+        $omigrate['users_persona'][$data] = $row_data;
     }
     
     public function log_original_teacher_unique_id($data, &$omigrate, $row_data) {        
-        //$omigrate['users_persona'][$row_data['uidIdPersona']] = $row_data;
-        
-        $omigrate['users_empleado'][$row_data['uidIdPersona']] = $row_data;
+        //$omigrate['users_persona'][$row_data['uidIdPersona']] = $row_data;        
+        $omigrate['users_empleado'][$data] = $row_data;
+        error_log(print_r($omigrate['users_empleado'][$data],1));      
         //error_log(print_r($omigrate, 1));
         //$omigrate['users']['extra'] = $row_data
     }
@@ -82,13 +82,13 @@ class MigrationCustom {
         
         //error_log(print_r($omigrate['users_empleado'], 1));
         //error_log($data);
-        
-        if (empty($omigrate['users_empleado'][$data]['uidIdPersona'])) {
-            return api_get_user_id();
+        error_log('get_real_teacher_id');
+        if (empty($omigrate['users_empleado'][$data]['uidIdPersona'])) {            
+            return 1;
         } else {
-            error_log('get_real_teacher_id'.$omigrate['users_empleado'][$data]['uidIdPersona']['user_id']);
-            error_log(print_r($omigrate['users_empleado'][$data]['uidIdPersona'], 1));
-            return $omigrate['users_empleado'][$data]['uidIdPersona']['user_id'];
+            $persona_id = $omigrate['users_empleado'][$data]['uidIdPersona'];  
+            error_log(print_r($omigrate['users_persona'][$persona_id],1));            
+            return $omigrate['users_persona'][$persona_id]['user_id'];
         }
         return $omigrate['users_empleado'][$data]['user_id'];
     }
@@ -97,17 +97,17 @@ class MigrationCustom {
         
     }
     
-    public function create_user($data, $data_list = array()) {       
+    public function create_user($data) {       
         //error_log(print_r($data, 1));
         //error_log(print_r($data_list['user'], 1));        
-        $user_id = UserManager::add($data);        
-        return $user_id;
+        $user_info = UserManager::add($data);        
+        return $user_info;
     }
     
-     public function add_course_to_session($data, $data_list = array()) {       
+     public function add_course_to_session($data, &$data_list) {       
         //error_log(print_r($data, 1));
         //error_log(print_r($data_list['user'], 1));        
-        $user_id = UserManager::add($data);        
+        //$user_id = UserManager::add($data);        
         return $user_id;
     }
 

+ 1 - 1
tests/migrate/migration.mssql.class.php

@@ -31,7 +31,7 @@ class MigrationMSSQL extends Migration {
             $fields_sql = substr($fields_sql, 0, -2);
         }
         //In order to process X item of each table add TOP X
-        $sql = "SELECT $fields_sql FROM $table";
+        $sql = "SELECT TOP 10000 $fields_sql FROM $table";
         //remove
         error_log($sql);
         $this->rows_iterator = mssql_query($sql, $this->c);