--- loncom/interface/lonsearchcat.pm 2005/02/02 21:08:23 1.236 +++ loncom/interface/lonsearchcat.pm 2005/04/01 20:01:32 1.237.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Search Catalog # -# $Id: lonsearchcat.pm,v 1.236 2005/02/02 21:08:23 albertel Exp $ +# $Id: lonsearchcat.pm,v 1.237.2.1 2005/04/01 20:01:32 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -625,8 +625,8 @@ sub checkonthis { # Check also the dependencies of this one my $dependencies= &Apache::lonnet::metadata($url,'dependencies'); - foreach (split(/\,/,$dependencies) && (!$alreadyseen{$id})) { - if (($_=~/^\/res\//)) { + foreach (split(/\,/,$dependencies)) { + if (($_=~/^\/res\//) && (!$alreadyseen{$id})) { &checkonthis($r,$id,$_,$level+1,'',$fulltext,undef,@allwords); } } @@ -2469,8 +2469,8 @@ END delete ($Server_status{$server}); next; } - $status=~/^([\.\w]+)$/; - my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$1; + $status=~s|/||g; + my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$status; if (-e $datafile && ! -e "$datafile.end") { &update_status($r,&mt('Receiving results from [_1]',$server)); next;