--- loncom/interface/lonindexer.pm 2006/07/21 08:25:25 1.149 +++ loncom/interface/lonindexer.pm 2007/06/27 16:35:55 1.161 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.149 2006/07/21 08:25:25 albertel Exp $ +# $Id: lonindexer.pm,v 1.161 2007/06/27 16:35:55 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -54,6 +54,7 @@ use Apache::File; use Apache::lonlocal; use Apache::lonsource(); use GDBM_File; +use LONCAPA qw(:match); # ---------------------------------------- variables used throughout the module my %hash; # global user-specific gdbm file @@ -172,7 +173,7 @@ ENDSUBM # --------------------- define extra fields and buttons in case of special mode if ($env{'form.catalogmode'} eq 'interactive') { $extrafield=''. - ''; $colspan=" colspan='2' "; my $cl=&mt('Close'); @@ -182,7 +183,7 @@ END } elsif ($env{'form.catalogmode'} eq 'import') { $extrafield=''. - ''; $colspan=" colspan='2' "; my $cl=&mt('Close'); @@ -349,6 +350,25 @@ END my $js = <<"ENDHEADER"; ENDHEADER - my ($headerdom)=($uri=~/^\/res\/(\w+)\//); + my ($headerdom)=($uri=~m{^/res/($match_domain)/}); $r->print(&Apache::loncommon::start_page('Browse Resources',$js, {'domain' => $headerdom,})); # - Evaluate actions from previous page (both cumulatively and chronologically) @@ -580,12 +600,13 @@ END # -------- recursively go through all the directories and output as appropriate &scanDir ($r,$toplevel,$indent,\%hash); -# ---------------------------- embed hidden information useful for group import - $r->print("
"); - $r->print("
"); # -------------------------------------------------------------- end the tables $r->print(''); +# ---------------------------- embed hidden information useful for group import + $r->print("
"); + $r->print("
"); +# -------------------------------------------------------------- end the tables $r->print(''); # --------------------------------------------------- end the output and return @@ -678,7 +699,7 @@ sub get_list { $uri=~s/\/+/\//g; foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$uri))) { my @ratpart=split(/\:/,$_); - push @list,$ratpart[1]; + push(@list,&LONCAPA::map::qtescape($ratpart[1])); } $hash{'dirlist_files_'.$luri} = join("\n",@list); } else { @@ -687,7 +708,7 @@ sub get_list { $hash{'dirlist_files_'.$luri} = join("\n",@list); $hash{'dirlist_timestamp_files_'.$luri} = time; } - return @list=&match_ext($r,@list); + return @list=&match_ext($r,@list); } sub dynmetaread { @@ -797,7 +818,8 @@ sub display_line { my $i=0; while ($i<=11) { $tabtag=join('',$tabtag," ") - if $hash{'display_attrs_'.$i} == 1; + if ($i != 9 && + $hash{'display_attrs_'.$i} == 1); $i++; } my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom'); @@ -809,7 +831,7 @@ sub display_line { $updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1]; $updir=~s/\/+/\//g; - $r->print("$extrafield"); + $r->print("$extrafield"); $r->print("\n"); $r->print ('
print (''."\n") if ($env{'form.dirPointer'} eq "on"); - $r->print("$extrafield"); + $r->print("$extrafield"); $r->print(""); &begin_form ($r,$filecom[0]); my $anchor = $filecom[0]; $anchor =~ s/\///g; - $r->print (''); + $r->print (''); $r->print (''); $r->print ('print ('print (' border="0" />'."\n"); $r->print (&mt("Domain")." - $listname "); - if ($Apache::lonnet::domaindescription{$listname}) { - $r->print("(".$Apache::lonnet::domaindescription{$listname}. + if (&Apache::lonnet::domain($listname,'description')) { + $r->print("(".&Apache::lonnet::domain($listname,'description'). ")"); } $r->print ("
$tabtag\n"); @@ -863,13 +885,16 @@ sub display_line { # display user directory } if ($filecom[1] eq 'user') { - $r->print("$extrafield"); - $r->print("\n"); + # $r->print("$extrafield"); my $curdir = $startdir.$filecom[0].'/'; my $anchor = $curdir; $anchor =~ s/\///g; + $r->print(""); + $r->print("\n"); + $r->print("\n"); + $r->print("\n"); &begin_form ($r,$curdir); - $r->print (''."\n"); $r->print (''); $r->print ('print (''); my $domain=(split(m|/|,$startdir))[2]; @@ -904,17 +929,17 @@ sub display_line { } # Set the icon for the file my $iconname = &Apache::loncommon::icon($listname); - $r->print(""); + $r->print(""); if ($env{'form.catalogmode'} eq 'interactive') { my $quotable_filelink = &Apache::loncommon::escape_single($filelink); $r->print(""); - $r->print("". + $r->print("\"\"". "\n"); - $r->print(""); + $r->print(""); } elsif ($env{'form.catalogmode'} eq 'import') { - $r->print("
\n"); + $r->print("\n"); $r->print("print("checked"); } $r->print(" />\n"); - $r->print("
"); + $r->print(""); $hash{"pre_${fnum}_link"}=$filelink; $fnum++; } @@ -936,18 +961,18 @@ sub display_line { } # General indentation if ($indent > 0 and $indent < 11) { - $r->print("print("\"\"\n"); } elsif ($indent >0) { my $ten = int($indent/10.); my $rem = $indent%10.0; my $count = 0; while ($count < $ten) { - $r->print("\"\"\n"); $count++; } - $r->print("print("\"\"\n") if $rem > 0; } # Sequence open/close icon @@ -956,23 +981,23 @@ sub display_line { my $anchor = $curdir; $anchor =~ s/\///g; $r->print (''); - $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0" />'. "\n"); } # Filetype icons - $r->print("\n"); + $r->print("\"\"\n"); my $quotable_filelink = &Apache::loncommon::escape_single($filelink); $r->print (" $listname "); + "', 'previewfile', '450', '500', 'no', 'yes','yes');\"". + " target=\"_self\">$listname "); $r->print (" (metadata) "); + ".meta', 'metadatafile', '500', '550', 'no', 'yes','no');\" ". + " target=\"_self\">metadata) "); # Close form to open/close sequence if ($filelink=~/\.(page|sequence)$/) { $r->print(''); @@ -1037,8 +1062,8 @@ sub display_line { my $quotable_sourcelink = &Apache::loncommon::escape_single($sourcelink); $r->print(''."Yes "."\n"); + "', 'previewsource', '700', '700', 'no', 'yes','yes');\"". + " target=\"_self\">Yes "."\n"); } else { #A cuddled else. :P $r->print(" \n"); } @@ -1069,35 +1094,36 @@ sub display_line { my $curdir = $startdir.$filecom[0].'/'; my $anchor = $curdir; $anchor =~ s/\///g; - $r->print("$extrafield"); + $r->print("$extrafield"); &begin_form ($r,$curdir); my $indentm1 = $indent-1; if ($indentm1 < 11 and $indentm1 > 0) { - $r->print("print("\"\"\n"); } else { my $ten = int($indentm1/10.); my $rem = $indentm1%10.0; my $count = 0; while ($count < $ten) { - $r->print ("\"\"\n"); $count++; } - $r->print ("print ("\"\"\n") if $rem > 0; } $r->print (''); - $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0" />'. "\n"); my $quotable_curdir = &Apache::loncommon::escape_single($curdir); $r->print ('' + .''.&mt('Open Folder').''. "\n"); - $r->print ("$listname\n"); + $r->print ("$listname\n"); # Attributes my $filelink = $startdir.$filecom[0].'/default'; @@ -1145,7 +1171,7 @@ sub display_line { if ($hash{'display_attrs_7'} == 1) { $r->print(' '); } - $r->print(''); + $r->print(''); } } @@ -1163,6 +1189,9 @@ sub coursecontext { sub showpreview { my ($filelink)=@_; + if ($filelink=~m-^(/ext/|http://)-) { + return &mt('External Resource, preview not enabled'); + } my ($curfext)=($filelink=~/\.(\w+)$/); my $output=''; my $embstyle=&Apache::loncommon::fileembstyle($curfext); @@ -1193,10 +1222,10 @@ sub showpreview { } $output=''.$output.''; } elsif ($embstyle eq 'img') { - $output=''; - } elsif ($filelink=~/^\/res\/(\w+)\/(\w+)\//) { - $output=''; + } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) { + $output=''.&mt('Preview').''; } return $output;