--- loncom/lonnet/perl/lonnet.pm 2005/06/11 13:38:47 1.637 +++ loncom/lonnet/perl/lonnet.pm 2005/06/13 20:23:54 1.638 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.637 2005/06/11 13:38:47 raeburn Exp $ +# $Id: lonnet.pm,v 1.638 2005/06/13 20:23:54 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1132,7 +1132,7 @@ sub allowuploaded { } # --------- File operations in /home/httpd/html/userfiles/$domain/1/2/3/$course -# input: action, courseID, current domain, home server for course, intended +# input: action, courseID, current domain, intended # path to file, source of file, instruction to parse file for objects, # ref to hash for embedded objects, # ref to hash for codebase of java objects. @@ -1162,11 +1162,12 @@ sub allowuploaded { # sub process_coursefile { - my ($action,$docuname,$docudom,$docuhome,$file,$source,$parser,$allfiles,$codebase)=@_; + my ($action,$docuname,$docudom,$file,$source,$parser,$allfiles,$codebase)=@_; my $fetchresult; + my $home=&homeserver($docuname,$docudom); if ($action eq 'propagate') { - $fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$file - ,$docuhome); + $fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$file, + $home); } else { my $fetchresult = ''; my $fpath = ''; @@ -1182,7 +1183,7 @@ sub process_coursefile { my $destination = $filepath.'/'.$fname; rename($source,$destination); $fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$file, - $docuhome); + $home); } } elsif ($action eq 'uploaddoc') { open(my $fh,'>'.$filepath.'/'.$fname); @@ -1195,19 +1196,19 @@ sub process_coursefile { } } $fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$file, - $docuhome); + $home); if ($fetchresult eq 'ok') { return '/uploaded/'.$fpath.'/'.$fname; } else { &logthis('Failed to transfer '.$docudom.'/'.$docuname.'/'.$file. - ' to host '.$docuhome.': '.$fetchresult); + ' to host '.$home.': '.$fetchresult); return '/adm/notfound.html'; } } } unless ( $fetchresult eq 'ok') { &logthis('Failed to transfer '.$docudom.'/'.$docuname.'/'.$file. - ' to host '.$docuhome.': '.$fetchresult); + ' to host '.$home.': '.$fetchresult); } return $fetchresult; } @@ -1228,7 +1229,7 @@ sub build_filepath { } sub store_edited_file { - my ($primary_url,$content,$docudom,$docuname,$docuhome,$fetchresult) = @_; + my ($primary_url,$content,$docudom,$docuname,$fetchresult) = @_; my $file = $primary_url; $file =~ s#^/uploaded/$docudom/$docuname/##; my $fpath = ''; @@ -1239,12 +1240,14 @@ sub store_edited_file { open(my $fh,'>'.$filepath.'/'.$fname); print $fh $content; close($fh); + my $home=&homeserver($docuname,$docudom); $$fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$file, - $docuhome); + $home); if ($$fetchresult eq 'ok') { return '/uploaded/'.$fpath.'/'.$fname; } else { - &logthis('Failed to transfer '.$docudom.'/'.$docuname.'/'.$file. ' to host '.$docuhome.': '.$$fetchresult); + &logthis('Failed to transfer '.$docudom.'/'.$docuname.'/'.$file. + ' to host '.$home.': '.$$fetchresult); return '/adm/notfound.html'; } } @@ -1295,30 +1298,30 @@ sub userfileupload { return $fullpath.'/'.$fname; } # Create the directory if not present - my $docuname=''; - my $docudom=''; - my $docuhome=''; $fname="$subdir/$fname"; if ($coursedoc) { - $docuname=$env{'course.'.$env{'request.course.id'}.'.num'}; - $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'}; - $docuhome=$env{'course.'.$env{'request.course.id'}.'.home'}; + my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'}; + my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'}; if ($env{'form.folder'} =~ m/^default/) { - return &finishuserfileupload($docuname,$docudom,$docuhome,$formname,$fname,$parser,$allfiles,$codebase); + return &finishuserfileupload($docuname,$docudom, + $formname,$fname,$parser,$allfiles, + $codebase); } else { $fname=$env{'form.folder'}.'/'.$fname; - return &process_coursefile('uploaddoc',$docuname,$docudom,$docuhome,$fname,$formname,$parser,$allfiles,$codebase); + return &process_coursefile('uploaddoc',$docuname,$docudom, + $fname,$formname,$parser, + $allfiles,$codebase); } } else { - $docuname=$env{'user.name'}; - $docudom=$env{'user.domain'}; - $docuhome=$env{'user.home'}; - return &finishuserfileupload($docuname,$docudom,$docuhome,$formname,$fname,$parser,$allfiles,$codebase); + my $docuname=$env{'user.name'}; + my $docudom=$env{'user.domain'}; + return &finishuserfileupload($docuname,$docudom,$formname, + $fname,$parser,$allfiles,$codebase); } } sub finishuserfileupload { - my ($docuname,$docudom,$docuhome,$formname,$fname,$parser,$allfiles,$codebase) = @_; + my ($docuname,$docudom,$formname,$fname,$parser,$allfiles,$codebase) = @_; my $path=$docudom.'/'.$docuname.'/'; my $filepath=$perlvar{'lonDocRoot'}; my ($fnamepath,$file); @@ -1342,13 +1345,16 @@ sub finishuserfileupload { close(FH); } if ($parser eq 'parse') { - my $parse_result = &extract_embedded_items($filepath,$file,$allfiles,$codebase); + my $parse_result = &extract_embedded_items($filepath,$file,$allfiles, + $codebase); unless ($parse_result eq 'ok') { - &logthis('Failed to parse '.$filepath.$file.' for embedded media: '.$parse_result); + &logthis('Failed to parse '.$filepath.$file. + ' for embedded media: '.$parse_result); } } # Notify homeserver to grep it # + my $docuhome=&homeserver($docuname,$docudom); my $fetchresult= &reply('fetchuserfile:'.$path.$file,$docuhome); if ($fetchresult eq 'ok') { # @@ -1471,17 +1477,17 @@ sub extract_embedded_items { sub extract_java_items { my ($javafiles,$allfiles,$codebase) = @_; - foreach my $item (keys (%{$javafiles})) { - unless ($item eq 'codebase') { + foreach my $item (keys(%{$javafiles})) { + if ($item ne 'codebase') { if ($$javafiles{$item} ne '') { - if (exists($$allfiles{$$javafiles{'codebase'}.$$javafiles{$item}})) { - unless (grep/^$item$/,@{$$allfiles{$$javafiles{'codebase'}.$$javafiles{$item}}}) { - push(@{$$allfiles{$$javafiles{'codebase'}.$$javafiles{$item}}},&escape($item)); - } - } else { - @{$$allfiles{$$javafiles{'codebase'}.$$javafiles{$item}}} = (&escape($item)); - $$codebase{$$javafiles{'codebase'}.$$javafiles{$item}} = $$javafiles{'codebase'}; - + my $file=$javafiles->{'codebase'}.$javafiles->{$item}; + if (exists($allfiles->{$file})) { + unless (scalar(grep(/^$item$/, @{$allfiles->{$file}}))) { + push(@{$allfiles->{$file}}, &escape($item)); + } + } else { + @{$allfiles->{$file}} = (&escape($item)); + $codebase->{$file} = $javafiles->{'codebase'}; } } } @@ -3875,7 +3881,7 @@ sub createcourse { ENDINITMAP $topurl=&declutter( - &finishuserfileupload($uname,$udom,$uhome,'initmap','default.sequence') + &finishuserfileupload($uname,$udom,'initmap','default.sequence') ); } # ----------------------------------------------------------- Write preferences @@ -6798,7 +6804,6 @@ userspace, probably shouldn't be called docuname: username or courseid of destination for the file docudom: domain of user/course of destination for the file - docuhome: loncapa id of the library server that is getting the file formname: same as for userfileupload() fname: filename (inculding subdirectories) for the file