[LON-CAPA-cvs] cvs: loncom /interface lonmysql.pm

matthew lon-capa-cvs@mail.lon-capa.org
Fri, 20 Aug 2004 01:27:06 -0000


matthew		Thu Aug 19 21:27:06 2004 EDT

  Modified files:              
    /loncom/interface	lonmysql.pm 
  Log:
  Removed redundant code in create_table which caused searching to fail.
  
  
Index: loncom/interface/lonmysql.pm
diff -u loncom/interface/lonmysql.pm:1.23 loncom/interface/lonmysql.pm:1.24
--- loncom/interface/lonmysql.pm:1.23	Mon Jul 26 15:36:21 2004
+++ loncom/interface/lonmysql.pm	Thu Aug 19 21:27:05 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # MySQL utility functions
 #
-# $Id: lonmysql.pm,v 1.23 2004/07/26 19:36:21 matthew Exp $
+# $Id: lonmysql.pm,v 1.24 2004/08/20 01:27:05 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -619,7 +619,7 @@
 sub create_table {
     return undef if (!defined(&connect_to_db($dbh)));
     my ($table_des)=@_;
-    my $request = &build_table_creation_request($table_des);
+    my ($request,$table_id) = &build_table_creation_request($table_des);
     #
     # Execute the request to create the table
     #############################################
@@ -629,15 +629,6 @@
             $dbh->errstr();
         return undef;
     }
-    #
-    # Set up the internal bookkeeping
-    #############################################
-    my $table_id;
-    if (exists($table_des->{'id'})) {
-        $table_id = $table_des->{'id'};
-    } else {
-        $table_id = &get_new_table_id();
-    }
     my $tablename = &translate_id($table_id);
     delete($Tables{$tablename}) if (exists($Tables{$tablename}));
     return undef if (! defined(&update_table_info($table_id)));
@@ -770,7 +761,7 @@
         $request.="COMMENT = 'temporary' ";
     } 
     $request .= "TYPE=MYISAM";
-    return $request;
+    return $request,$table_id;
 }
 
 ###############################