[LON-CAPA-cvs] cvs: loncom /metadata_database/LONCAPA lonmetadata.pm

raeburn raeburn@source.lon-capa.org
Sun, 29 May 2011 18:11:45 -0000


raeburn		Sun May 29 18:11:45 2011 EDT

  Modified files:              
    /loncom/metadata_database/LONCAPA	lonmetadata.pm 
  Log:
  - username is only column for which charset is explicitly set for allusers 
    in MySQL table.
    - case sensitive searches for username
    - case insensitive for other fields  
  
  
Index: loncom/metadata_database/LONCAPA/lonmetadata.pm
diff -u loncom/metadata_database/LONCAPA/lonmetadata.pm:1.29 loncom/metadata_database/LONCAPA/lonmetadata.pm:1.30
--- loncom/metadata_database/LONCAPA/lonmetadata.pm:1.29	Mon Jan  3 04:47:45 2011
+++ loncom/metadata_database/LONCAPA/lonmetadata.pm	Sun May 29 18:11:45 2011
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonmetadata.pm,v 1.29 2011/01/03 04:47:45 raeburn Exp $
+# $Id: lonmetadata.pm,v 1.30 2011/05/29 18:11:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -356,6 +356,9 @@
                 $col_des.="(".$coldata->{'size'}.")";
             }
         }
+        if (($tablename =~ /allusers/) && ($column eq 'username')) {  
+            $request .= ' CHARACTER SET latin1 COLLATE latin1_general_cs';
+        }
         # Modifiers
         if (exists($coldata->{'restrictions'})){
             $col_des.=" ".$coldata->{'restrictions'};
@@ -382,9 +385,6 @@
         push (@Columns,$text);
     }
     $request .= "(".join(", ",@Columns).") TYPE=MyISAM";
-    if ($tablename =~ /allusers$/) {
-        $request .= ' CHARACTER SET latin1 COLLATE latin1_general_cs ';
-    }
     return $request;
 }