--- loncom/lonnet/perl/lonnet.pm 2007/07/26 02:09:24 1.899 +++ loncom/lonnet/perl/lonnet.pm 2007/08/02 20:40:13 1.903 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.899 2007/07/26 02:09:24 raeburn Exp $ +# $Id: lonnet.pm,v 1.903 2007/08/02 20:40:13 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -866,8 +866,8 @@ sub inst_directory_query { &escape($srch->{'srchby'}).':'. &escape($srch->{'srchterm'}).':'. $srch->{'srchtype'},$homeserver); - unless ($response eq 'refused') { - my @matches = split/&/,$response; + if ($response ne 'refused') { + my @matches = split(/&/,$response); foreach my $match (@matches) { my ($key,$value) = split(/=/,$match); my %userhash = &str2hash(&unescape($value)); @@ -894,7 +894,7 @@ sub usersearch { &escape($srch->{'srchterm'}),$tryserver); if ($queryid !~/^\Q$host\E\_/) { &logthis('usersearch: invalid queryid: '.$queryid.' for host: '.$host.'in domain '.$dom.' and server: '.$tryserver); - return 'error: '.$queryid; + next; } my $reply = &get_query_reply($queryid); my $maxtries = 1; @@ -906,7 +906,7 @@ sub usersearch { if ( ($reply =~/^timeout/) || ($reply =~/^error/) ) { &logthis('usersrch error: '.$reply.' for '.$dom.' - searching for : '.$srch->{'srchterm'}.' by '.$srch->{'srchby'}.' ('.$srch->{'srchtype'}.') - maxtries: '.$maxtries.' tries: '.$tries); } else { - my @matches = split/&/,$reply; + my @matches = split(/&/,$reply); foreach my $match (@matches) { my @items = split(/:/,$match); my ($uname,$udom,%userhash); @@ -2081,7 +2081,7 @@ sub flushcourselogs { # my %domrolebuffer = (); foreach my $entry (keys %domainrolehash) { - my ($role,$uname,$udom,$runame,$rudom,$rsec)=split/:/,$entry; + my ($role,$uname,$udom,$runame,$rudom,$rsec)=split(/:/,$entry); if ($domrolebuffer{$rudom}) { $domrolebuffer{$rudom}.='&'.&escape($entry). '='.&escape($domainrolehash{$entry}); @@ -2203,7 +2203,6 @@ sub userrolelog { {$trole.':'.$username.':'.$domain.':'.$runame.':'.$rudom.':'.$rsec} = $tend.':'.$tstart; } - &flushcourselogs(); } sub get_course_adv_roles { @@ -4499,7 +4498,7 @@ sub fetch_enrollment_query { if ( ($reply =~/^timeout/) || ($reply =~/^error/) ) { &logthis('fetch_enrollment_query error: '.$reply.' for '.$dom.' '.$env{'user.name'}.' for '.$queryid.' context: '.$context.' '.$cnum.' maxtries: '.$maxtries.' tries: '.$tries); } else { - my @responses = split/:/,$reply; + my @responses = split(/:/,$reply); if ($homeserver eq $perlvar{'lonHostID'}) { foreach my $line (@responses) { my ($key,$value) = split(/=/,$line,2); @@ -4609,7 +4608,7 @@ sub auto_get_sections { my @secs = (); my $response=&unescape(&reply('autogetsections:'.$inst_coursecode.':'.$cdom,$homeserver)); unless ($response eq 'refused') { - @secs = split/:/,$response; + @secs = split(/:/,$response); } return @secs; } @@ -4648,7 +4647,7 @@ sub auto_create_password { if ($response eq 'refused') { $authchk = 'refused'; } else { - ($authparam,$create_passwd,$authchk) = split/:/,$response; + ($authparam,$create_passwd,$authchk) = split(/:/,$response); } } return ($authparam,$create_passwd,$authchk); @@ -4756,7 +4755,7 @@ sub auto_instcode_format { $response=&reply('autoinstcodeformat:'.$codedom.':'.$courses,$server); if ($response !~ /(con_lost|error|no_such_host|refused)/) { my ($codes_str,$codetitles_str,$cat_titles_str,$cat_order_str) = - split/:/,$response; + split(/:/,$response); %{$codes} = (%{$codes},&str2hash($codes_str)); push(@{$codetitles},&str2array($codetitles_str)); %{$cat_titles} = (%{$cat_titles},&str2hash($cat_titles_str));