[LON-CAPA-cvs] cvs: loncom /imspackages imsimport.pm

albertel lon-capa-cvs@mail.lon-capa.org
Mon, 27 Nov 2006 16:37:36 -0000


albertel		Mon Nov 27 11:37:36 2006 EDT

  Modified files:              
    /loncom/imspackages	imsimport.pm 
  Log:
  - switch to helper re
  
  
Index: loncom/imspackages/imsimport.pm
diff -u loncom/imspackages/imsimport.pm:1.20 loncom/imspackages/imsimport.pm:1.21
--- loncom/imspackages/imsimport.pm:1.20	Mon Apr 10 18:30:20 2006
+++ loncom/imspackages/imsimport.pm	Mon Nov 27 11:37:36 2006
@@ -34,7 +34,8 @@
 use Apache::lonlocal;
 use Apache::lonupload;
 use File::Basename();
-                                                                                            
+use LONCAPA;
+
 # ----------------------------------------------------------------  Jscript One
 sub jscript_one {
     my ($fullpath,$jsref) = @_;
@@ -757,7 +758,7 @@
     my @crslist = ();
     my %descrip =();
     foreach my $key (keys %roles ) {
-        if ($key =~ m/^\/(\w+)\/(\w+)_cc$/) {
+        if ($key =~ m{^/($LONCAPA::domain_re)/($LONCAPA::username_re)_cc$}) {
             my $cdom = $1;
             my $crs = $2;
             my $role_end = 0;