version 1.22, 2006/12/20 22:23:50
|
version 1.24, 2007/07/02 21:15:29
|
Line 43 use vars qw($match_domain $match_not_d
|
Line 43 use vars qw($match_domain $match_not_d
|
$match_username $match_not_username |
$match_username $match_not_username |
$match_courseid $match_not_courseid |
$match_courseid $match_not_courseid |
$match_name |
$match_name |
|
$match_lonid |
$match_handle $match_not_handle); |
$match_handle $match_not_handle); |
|
|
require Exporter; |
require Exporter; |
Line 54 our @EXPORT_OK = qw($match_domain $mat
|
Line 55 our @EXPORT_OK = qw($match_domain $mat
|
$match_username $match_not_username |
$match_username $match_not_username |
$match_courseid $match_not_courseid |
$match_courseid $match_not_courseid |
$match_name |
$match_name |
|
$match_lonid |
$match_handle $match_not_handle); |
$match_handle $match_not_handle); |
our %EXPORT_TAGS = ( 'match' =>[qw($match_domain $match_not_domain |
our %EXPORT_TAGS = ( 'match' =>[qw($match_domain $match_not_domain |
$match_username $match_not_username |
$match_username $match_not_username |
$match_courseid $match_not_courseid |
$match_courseid $match_not_courseid |
$match_name |
$match_name |
|
$match_lonid |
$match_handle $match_not_handle)],); |
$match_handle $match_not_handle)],); |
my %perlvar; |
my %perlvar; |
|
|
Line 110 sub clean_domain {
|
Line 113 sub clean_domain {
|
return $domain; |
return $domain; |
} |
} |
|
|
$match_username = $LONCAPA::username_re = qr{\w[\w\-.]+}; |
$match_username = $LONCAPA::username_re = qr{\w[\w\-.@]+}; |
$match_not_username = $LONCAPA::not_username_re = qr{[^\w\-.]+}; |
$match_not_username = $LONCAPA::not_username_re = qr{[^\w\-.@]+}; |
sub clean_username { |
sub clean_username { |
my ($username) = @_; |
my ($username) = @_; |
$username =~ s/^\W+//; |
$username =~ s/^\W+//; |
Line 136 sub clean_name {
|
Line 139 sub clean_name {
|
return $name; |
return $name; |
} |
} |
|
|
|
$match_lonid = $LONCAPA::lonid_re = qr{[\w\-.]+}; |
|
|
sub split_courseid { |
sub split_courseid { |
my ($courseid) = @_; |
my ($courseid) = @_; |
my ($domain,$coursenum) = |
my ($domain,$coursenum) = |
Line 143 sub split_courseid {
|
Line 148 sub split_courseid {
|
return ($domain,$coursenum); |
return ($domain,$coursenum); |
} |
} |
|
|
$match_handle = $LONCAPA::handle_re = qr{[\w\-.]+}; |
$match_handle = $LONCAPA::handle_re = qr{[\w\-.@]+}; |
$match_not_handle = $LONCAPA::not_handle_re = qr{[^\w\-.]+}; |
$match_not_handle = $LONCAPA::not_handle_re = qr{[^\w\-.@]+}; |
sub clean_handle { |
sub clean_handle { |
my ($handle) = @_; |
my ($handle) = @_; |
$handle =~ s/$match_not_handle//g; |
$handle =~ s/$match_not_handle//g; |