[BACK]Return to lonindexer.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonindexer.pm between versions 1.143 and 1.155

version 1.143, 2006/05/31 16:22:10 version 1.155, 2006/12/11 02:12:08
Line 54  use Apache::File; Line 54  use Apache::File;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonsource();  use Apache::lonsource();
 use GDBM_File;  use GDBM_File;
   use LONCAPA qw(:match);
   
 # ---------------------------------------- variables used throughout the module  # ---------------------------------------- variables used throughout the module
 my %hash; # global user-specific gdbm file  my %hash; # global user-specific gdbm file
Line 119  sub handler { Line 120  sub handler {
           
     $extrafield='';      $extrafield='';
     my $diropendb =       my $diropendb = 
  "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_indexer.db";   "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db";
     %hash = ();      %hash = ();
     {      {
  my %dbfile;   my %dbfile;
  if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_READER(),0640)) {   if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_WRITER(),0640)) {
       if ($env{'form.launch'} eq '1') {
    &start_fresh_session(\%dbfile);
       }
   
     while(my($key,$value)=each(%dbfile)) {      while(my($key,$value)=each(%dbfile)) {
  $hash{$key}=$value;   $hash{$key}=$value;
     }      }
Line 131  sub handler { Line 136  sub handler {
  }   }
     }      }
     {      {
  if ($env{'form.launch'} eq '1') {  
     &start_fresh_session();  
  }  
   #Hijack lonindexer to verify a title and be close down.    #Hijack lonindexer to verify a title and be close down.
    if ($env{'form.launch'} eq '2') {     if ($env{'form.launch'} eq '2') {
        &Apache::loncommon::content_type($r,'text/html');         &Apache::loncommon::content_type($r,'text/html');
Line 171  ENDSUBM Line 173  ENDSUBM
 # --------------------- define extra fields and buttons in case of special mode  # --------------------- define extra fields and buttons in case of special mode
  if ($env{'form.catalogmode'} eq 'interactive') {   if ($env{'form.catalogmode'} eq 'interactive') {
     $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.      $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
  '<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.   '<img alt="" src="'.$iconpath.'whitespace1.gif"'.
  ' border="0" /></td>';   ' border="0" /></td>';
     $colspan=" colspan='2' ";      $colspan=" colspan='2' ";
             my $cl=&mt('Close');              my $cl=&mt('Close');
Line 179  ENDSUBM Line 181  ENDSUBM
 <input type="button" name="close" value='$cl' onClick="self.close()" />  <input type="button" name="close" value='$cl' onClick="self.close()" />
 END  END
         }          }
  elsif ($env{'form.catalogmode'} eq 'groupimport') {   elsif ($env{'form.catalogmode'} eq 'import') {
     $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.      $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
  '<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.   '<img alt="" src="'.$iconpath.'whitespace1.gif"'.
  ' border="0" /></td>';   ' border="0" /></td>';
     $colspan=" colspan='2' ";      $colspan=" colspan='2' ";
     my $cl=&mt('Close');      my $cl=&mt('Close');
Line 229  END Line 231  END
 # ------ set catalogmodefunctions to have extra needed javascript functionality  # ------ set catalogmodefunctions to have extra needed javascript functionality
  my $catalogmodefunctions='';   my $catalogmodefunctions='';
  if ($env{'form.catalogmode'} eq 'interactive' or   if ($env{'form.catalogmode'} eq 'interactive' or
     $env{'form.catalogmode'} eq 'groupimport') {      $env{'form.catalogmode'} eq 'import') {
     # The if statement below sets us up to use the old version      # The if statement below sets us up to use the old version
     # by default (ie. if $mode is undefined).  This is the easy      # by default (ie. if $mode is undefined).  This is the easy
     # way out.  Hopefully in the future I'll find a way to get       # way out.  Hopefully in the future I'll find a way to get 
Line 240  END Line 242  END
 #  #
 #  #
     if (!defined($mode) || ($mode ne 'edit' && $mode ne 'parmset')) {      if (!defined($mode) || ($mode ne 'edit' && $mode ne 'parmset')) {
                 my $location = "/adm/groupsort?catalogmode=groupimport&";                  my $location = "/adm/groupsort?catalogmode=import&";
                 $location .= "mode=".$mode."&";                  $location .= "mode=".$mode."&";
                 $location .= "acts=";                  $location .= "acts=";
  $catalogmodefunctions=<<"END";   $catalogmodefunctions=<<"END";
Line 327  function rep_dirpath(suffix,val) { Line 329  function rep_dirpath(suffix,val) {
     eval("document.forms.dirpath"+suffix+".acts.value=val");      eval("document.forms.dirpath"+suffix+".acts.value=val");
 }  }
 END  END
  if ($env{'form.catalogmode'} eq 'groupimport') {   if ($env{'form.catalogmode'} eq 'import') {
             $catalogmodefunctions.=<<END;              $catalogmodefunctions.=<<END;
 function queue(val) {  function queue(val) {
     if (eval("document.forms."+val+".filelink.checked")) {      if (eval("document.forms."+val+".filelink.checked")) {
Line 365  function gothere(val) { Line 367  function gothere(val) {
 </script>  </script>
 ENDHEADER  ENDHEADER
   
         my ($headerdom)=($uri=~/^\/res\/(\w+)\//);          my ($headerdom)=($uri=~m{^/res/($match_domain)/});
  $r->print(&Apache::loncommon::start_page('Browse Resources',$js,   $r->print(&Apache::loncommon::start_page('Browse Resources',$js,
  {'domain' => $headerdom,}));   {'domain' => $headerdom,}));
 # - Evaluate actions from previous page (both cumulatively and chronologically)  # - Evaluate actions from previous page (both cumulatively and chronologically)
         if ($env{'form.catalogmode'} eq 'groupimport') {          if ($env{'form.catalogmode'} eq 'import') {
     my $acts=$env{'form.acts'};      my $acts=$env{'form.acts'};
     my @Acts=split(/b/,$acts);      my @Acts=split(/b/,$acts);
     my %ahash;      my %ahash;
Line 478  END Line 480  END
  $storeuri=~s/\/+/\//g;   $storeuri=~s/\/+/\//g;
 # ---------------------------------------------------------------- Bread crumbs  # ---------------------------------------------------------------- Bread crumbs
         $r->print(&Apache::lonhtmlcommon::crumbs($storeuri,'','',          $r->print(&Apache::lonhtmlcommon::crumbs($storeuri,'','',
  (($env{'form.catalogmode'} eq 'groupimport')?   (($env{'form.catalogmode'} eq 'import')?
  'document.forms.fileattr':'')).   'document.forms.fileattr':'')).
   &Apache::lonhtmlcommon::select_recent('residx','resrecent',    &Apache::lonhtmlcommon::select_recent('residx','resrecent',
 'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();'));  'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();'));
Line 486  END Line 488  END
  my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'};   my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'};
  if ($reshome) {   if ($reshome) {
     $r->print("<font size='+2'><a href='");      $r->print("<font size='+2'><a href='");
     if ($env{'form.catalogmode'} eq 'groupimport') {      if ($env{'form.catalogmode'} eq 'import') {
  $r->print('javascript:document.forms.fileattr.action="'.$reshome.'";document.forms.fileattr.submit();');   $r->print('javascript:document.forms.fileattr.action="'.$reshome.'";document.forms.fileattr.submit();');
     } else {      } else {
  $r->print($reshome);   $r->print($reshome);
Line 579  END Line 581  END
 # -------- recursively go through all the directories and output as appropriate  # -------- recursively go through all the directories and output as appropriate
  &scanDir ($r,$toplevel,$indent,\%hash);   &scanDir ($r,$toplevel,$indent,\%hash);
   
 # ---------------------------- embed hidden information useful for group import  
  $r->print("<form name='fnum'>");  
  $r->print("<input type='hidden' name='fnum' value='$fnum' /></form>");  
   
 # -------------------------------------------------------------- end the tables  # -------------------------------------------------------------- end the tables
  $r->print('</table>');   $r->print('</table>');
   # ---------------------------- embed hidden information useful for group import
    $r->print("<form name='fnum' action=''>");
    $r->print("<input type='hidden' name='fnum' value='$fnum' /></form>");
   # -------------------------------------------------------------- end the tables
  $r->print('</td></tr></table>');   $r->print('</td></tr></table>');
   
 # --------------------------------------------------- end the output and return  # --------------------------------------------------- end the output and return
Line 796  sub display_line { Line 799  sub display_line {
     my $i=0;      my $i=0;
     while ($i<=11) {      while ($i<=11) {
  $tabtag=join('',$tabtag,"<td>&nbsp;</td>")   $tabtag=join('',$tabtag,"<td>&nbsp;</td>")
     if $hash{'display_attrs_'.$i} == 1;      if ($i != 9 &&
    $hash{'display_attrs_'.$i} == 1);
  $i++;   $i++;
     }      }
     my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom');      my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom');
Line 841  sub display_line { Line 845  sub display_line {
  &begin_form ($r,$filecom[0]);   &begin_form ($r,$filecom[0]);
  my $anchor = $filecom[0];   my $anchor = $filecom[0];
  $anchor =~ s/\///g;   $anchor =~ s/\///g;
  $r->print ('<a name="'.$anchor.'">');   $r->print ('<a name="'.$anchor.'"></a>');
  $r->print ('<input type="hidden" name="acts" value="" />');   $r->print ('<input type="hidden" name="acts" value="" />');
  $r->print ('<input src="'.$iconpath.'folder_pointer_'.   $r->print ('<input src="'.$iconpath.'folder_pointer_'.
    $diropen.'.gif"');      $diropen.'.gif"'); 
Line 849  sub display_line { Line 853  sub display_line {
    "\n");     "\n");
  my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]);   my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]);
  $r->print ('<a href="javascript:gothere(\''.$quotable_filecom.   $r->print ('<a href="javascript:gothere(\''.$quotable_filecom.
    '\')"><img src="'.$iconpath.'server.gif"');     '\')"><img alt="" src="'.$iconpath.'server.gif"');
  $r->print (' border="0" /></a>'."\n");   $r->print (' border="0" /></a>'."\n");
  $r->print (&mt("Domain")." - $listname ");   $r->print (&mt("Domain")." - $listname ");
  if ($Apache::lonnet::domaindescription{$listname}) {   if ($Apache::lonnet::domaindescription{$listname}) {
Line 868  sub display_line { Line 872  sub display_line {
  my $anchor = $curdir;   my $anchor = $curdir;
  $anchor =~ s/\///g;   $anchor =~ s/\///g;
  &begin_form ($r,$curdir);   &begin_form ($r,$curdir);
  $r->print ('<a name="'.$anchor.'"><img src="'.$iconpath.   $r->print ('<a name="'.$anchor.'"></a><img alt="" src="'.$iconpath.
    'whitespace1.gif" border="0" />'."\n");     'whitespace1.gif" border="0" />'."\n");
  $r->print ('<input type="hidden" name="acts" value="" />');   $r->print ('<input type="hidden" name="acts" value="" />');
  $r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.   $r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.
Line 877  sub display_line { Line 881  sub display_line {
    "\n");     "\n");
  my $quotable_curdir = &Apache::loncommon::escape_single($curdir);   my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
  $r->print ('<a href="javascript:gothere(\''.$quotable_curdir   $r->print ('<a href="javascript:gothere(\''.$quotable_curdir
    .'\')"><img src='.     .'\')"><img alt="" src='.
    $iconpath.'quill.gif border="0" name="'.$msg.     $iconpath.'quill.gif border="0" name="'.$msg.
    '" height="22" /></a>');     '" height="22" /></a>');
  my $domain=(split(m|/|,$startdir))[2];   my $domain=(split(m|/|,$startdir))[2];
Line 909  sub display_line { Line 913  sub display_line {
     my $quotable_filelink = &Apache::loncommon::escape_single($filelink);      my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
             $r->print("<a href=\"javascript:select_data(\'",              $r->print("<a href=\"javascript:select_data(\'",
                       $quotable_filelink,"')\">");                        $quotable_filelink,"')\">");
     $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".      $r->print("<img alt=\"\" src='",$iconpath,"select.gif' border='0' /></a>".
       "\n");        "\n");
     $r->print("</td><td nowrap>");      $r->print("</td><td nowrap='nowrap' valign='top'>");
  } elsif ($env{'form.catalogmode'} eq 'groupimport') {   } elsif ($env{'form.catalogmode'} eq 'import') {
     $r->print("<form name='form$fnum'>\n");      $r->print("<form name='form$fnum' action=''>\n");
     $r->print("<input type='checkbox' name='filelink"."' ".      $r->print("<input type='checkbox' name='filelink"."' ".
       "value='$filelink' onClick='".        "value='$filelink' onClick='".
       "javascript:queue(\"form$fnum\")' ");        "javascript:queue(\"form$fnum\")' ");
Line 921  sub display_line { Line 925  sub display_line {
  $r->print("checked");   $r->print("checked");
     }      }
     $r->print(" />\n");      $r->print(" />\n");
     $r->print("</form></td><td nowrap>");      $r->print("</form></td><td nowrap='nowrap' valign='top'>");
     $hash{"pre_${fnum}_link"}=$filelink;      $hash{"pre_${fnum}_link"}=$filelink;
      $fnum++;       $fnum++;
  }   }
Line 935  sub display_line { Line 939  sub display_line {
  }   }
 # General indentation  # General indentation
  if ($indent > 0 and $indent < 11) {   if ($indent > 0 and $indent < 11) {
     $r->print("<img src=",$iconpath,"whitespace",$indent,      $r->print("<img alt=\"\" src=",$iconpath,"whitespace",$indent,
       ".gif border='0' />\n");        ".gif border='0' />\n");
  } elsif ($indent >0) {   } elsif ($indent >0) {
     my $ten = int($indent/10.);      my $ten = int($indent/10.);
     my $rem = $indent%10.0;      my $rem = $indent%10.0;
     my $count = 0;      my $count = 0;
     while ($count < $ten) {      while ($count < $ten) {
  $r->print("<img src=",$iconpath,   $r->print("<img alt=\"\" src=",$iconpath,
   "whitespace10.gif border='0' />\n");    "whitespace10.gif border='0' />\n");
     $count++;      $count++;
     }      }
     $r->print("<img src=",$iconpath,"whitespace",$rem,      $r->print("<img alt=\"\" src=",$iconpath,"whitespace",$rem,
       ".gif border='0' />\n") if $rem > 0;        ".gif border='0' />\n") if $rem > 0;
  }   }
 # Sequence open/close icon  # Sequence open/close icon
Line 955  sub display_line { Line 959  sub display_line {
     my $anchor = $curdir;      my $anchor = $curdir;
     $anchor =~ s/\///g;      $anchor =~ s/\///g;
     $r->print ('<input type="hidden" name="acts" value="" />');      $r->print ('<input type="hidden" name="acts" value="" />');
     $r->print ('<a name="'.$anchor.'"><input src="'.$iconpath.      $r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.
        'folder_pointer_'.$diropen.'.gif"');         'folder_pointer_'.$diropen.'.gif"');
     $r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.      $r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
        "\n");         "\n");
  }   }
 # Filetype icons  # Filetype icons
  $r->print("<img src='$iconname' border='0' />\n");   $r->print("<img alt=\"\" src='$iconname' border='0' />\n");
  my $quotable_filelink = &Apache::loncommon::escape_single($filelink);   my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
   
   
  $r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.   $r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.
    "', 'previewfile', '450', '500', 'no', 'yes','yes')\";".     "', 'previewfile', '450', '500', 'no', 'yes','yes');\"".
    " TARGET=_self>$listname</a> ");     " target=\"_self\">$listname</a> ");
   
  $r->print (" (<a href=\"javascript:openWindow('".$quotable_filelink.   $r->print (" (<a href=\"javascript:openWindow('".$quotable_filelink.
    ".meta', 'metadatafile', '500', '550', 'no', 'yes','no')\"; ".     ".meta', 'metadatafile', '500', '550', 'no', 'yes','no');\" ".
    "TARGET=_self>metadata</a>) ");     " target=\"_self\">metadata</a>) ");
 # Close form to open/close sequence  # Close form to open/close sequence
  if ($filelink=~/\.(page|sequence)$/) {   if ($filelink=~/\.(page|sequence)$/) {
     $r->print('</form>');      $r->print('</form>');
Line 1036  sub display_line { Line 1040  sub display_line {
  my $quotable_sourcelink = &Apache::loncommon::escape_single($sourcelink);   my $quotable_sourcelink = &Apache::loncommon::escape_single($sourcelink);
  $r->print('<td>'."<a href=\"javascript:openWindow('"   $r->print('<td>'."<a href=\"javascript:openWindow('"
   .$quotable_sourcelink.    .$quotable_sourcelink.
   "', 'previewsource', '700', '700', 'no', 'yes','yes')\";".    "', 'previewsource', '700', '700', 'no', 'yes','yes');\"".
   " TARGET=_self>Yes</a> "."</td>\n");    " target=\"_self\">Yes</a> "."</td>\n");
     } else { #A cuddled else. :P      } else { #A cuddled else. :P
  $r->print("<td>&nbsp;</td>\n");   $r->print("<td>&nbsp;</td>\n");
     }      }
Line 1046  sub display_line { Line 1050  sub display_line {
 # links  # links
    &dynmetaread($filelink);     &dynmetaread($filelink);
    $r->print('<td>');     $r->print('<td>');
      &coursecontext($r,$filelink);
    &dynmetaprint($r,$filelink,'goto_list');     &dynmetaprint($r,$filelink,'goto_list');
    &dynmetaprint($r,$filelink,'comefrom_list');     &dynmetaprint($r,$filelink,'comefrom_list');
    &dynmetaprint($r,$filelink,'sequsage_list');     &dynmetaprint($r,$filelink,'sequsage_list');
Line 1071  sub display_line { Line 1076  sub display_line {
  &begin_form ($r,$curdir);   &begin_form ($r,$curdir);
  my $indentm1 = $indent-1;   my $indentm1 = $indent-1;
  if ($indentm1 < 11 and $indentm1 > 0) {   if ($indentm1 < 11 and $indentm1 > 0) {
     $r->print("<img src=",$iconpath,"whitespace",$indentm1,      $r->print("<img alt=\"\" src=",$iconpath,"whitespace",$indentm1,
       ".gif border='0' />\n");        ".gif border='0' />\n");
  } else {   } else {
     my $ten = int($indentm1/10.);      my $ten = int($indentm1/10.);
     my $rem = $indentm1%10.0;      my $rem = $indentm1%10.0;
     my $count = 0;      my $count = 0;
     while ($count < $ten) {      while ($count < $ten) {
  $r->print ("<img src=",$iconpath   $r->print ("<img alt=\"\" src=",$iconpath
    ,"whitespace10.gif border='0' />\n");     ,"whitespace10.gif border='0' />\n");
  $count++;   $count++;
     }      }
     $r->print ("<img src=",$iconpath,"whitespace",$rem,      $r->print ("<img alt=\"\" src=",$iconpath,"whitespace",$rem,
        ".gif border='0' />\n") if $rem > 0;         ".gif border='0' />\n") if $rem > 0;
  }   }
  $r->print ('<input type="hidden" name="acts" value="" />');   $r->print ('<input type="hidden" name="acts" value="" />');
  $r->print ('<a name="'.$anchor.'"><input src="'.$iconpath.   $r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.
    'folder_pointer_'.$diropen.'.gif"');     'folder_pointer_'.$diropen.'.gif"');
  $r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.   $r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
    "\n");     "\n");
  my $quotable_curdir = &Apache::loncommon::escape_single($curdir);   my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
  $r->print ('<a href="javascript:gothere(\''   $r->print ('<a href="javascript:gothere(\''
    .$quotable_curdir.'\')"><img src="'.     .$quotable_curdir.'\')">'
      .'<img alt="'.&mt('Open Folder').'"src="'.
    $iconpath.'folder_'.$diropen.'.gif" border="0" /></a>'.     $iconpath.'folder_'.$diropen.'.gif" border="0" /></a>'.
    "\n");     "\n");
  $r->print ("$listname</td>\n");   $r->print ("$listname</form></td>\n");
 # Attributes  # Attributes
  my $filelink = $startdir.$filecom[0].'/default';   my $filelink = $startdir.$filecom[0].'/default';
   
Line 1143  sub display_line { Line 1149  sub display_line {
  if ($hash{'display_attrs_7'} == 1) {   if ($hash{'display_attrs_7'} == 1) {
    $r->print('<td>&nbsp;</td>');     $r->print('<td>&nbsp;</td>');
         }          }
  $r->print('</form></tr>');   $r->print('</tr>');
     }      }
   
 }  }
   
   sub coursecontext {
       my ($r,$filelink)=@_;
       my $filesymb=&Apache::lonnet::symbread($filelink);
       if ($filesymb) {
    my ($map,$index,$resource)=&Apache::lonnet::decode_symb($filesymb);
    $r->print(&mt('Already in this course:<br />[_1] in folder/map [_2].<br />',
         &Apache::lonnet::gettitle($resource),
         &Apache::lonnet::gettitle($map)));
       }
   }
   
 sub showpreview {  sub showpreview {
     my ($filelink)=@_;      my ($filelink)=@_;
       if ($filelink=~m-^(/ext/|http://)-) {
    return &mt('External Resource, preview not enabled');
       }
     my ($curfext)=($filelink=~/\.(\w+)$/);      my ($curfext)=($filelink=~/\.(\w+)$/);
     my $output='';      my $output='';
     my $embstyle=&Apache::loncommon::fileembstyle($curfext);      my $embstyle=&Apache::loncommon::fileembstyle($curfext);
Line 1162  sub showpreview { Line 1182  sub showpreview {
           $output=join("\n",<FH>);            $output=join("\n",<FH>);
           close(FH);            close(FH);
        } else {         } else {
   # In update display mode, remove old cache. This is done to retroactively
   # clean up course context renderings.
     if (-e $cache) {
          unlink($cache);
     }
           $output=&Apache::lonnet::ssi_body($filelink);            $output=&Apache::lonnet::ssi_body($filelink);
   # Is access denied? Don't render, don't store
           if ($output=~/LONCAPAACCESSCONTROLERRORSCREEN/s) {            if ($output=~/LONCAPAACCESSCONTROLERRORSCREEN/s) {
              $output='';               $output='';
           } else {  # Was this rendered in course content? Don't store
             } elsif (!&Apache::lonnet::symbread($filelink)) {
              open(FH,">$cache");               open(FH,">$cache");
              print FH $output;               print FH $output;
              close(FH);               close(FH);
Line 1173  sub showpreview { Line 1200  sub showpreview {
        }         }
        $output='<font size="-2">'.$output.'</font>';         $output='<font size="-2">'.$output.'</font>';
     } elsif ($embstyle eq 'img') {      } elsif ($embstyle eq 'img') {
        $output='<img src="'.$filelink.'" />';         $output='<img alt="'.&mt('Preview').'" src="'.$filelink.'" />';
     } elsif ($filelink=~/^\/res\/(\w+)\/(\w+)\//) {      } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {
        $output='<img src="http://'.         $output='<img  alt="'.&mt('Preview').'" src="http://'.
                  $Apache::lonnet::hostname{&Apache::lonnet::homeserver($2,$1)}.                   $Apache::lonnet::hostname{&Apache::lonnet::homeserver($2,$1)}.
                  '/cgi-bin/thumbnail.gif?url='.$filelink.'" />';                   '/cgi-bin/thumbnail.gif?url='.$filelink.'" />';
     }      }
Line 1188  sub dynmetaprint { Line 1215  sub dynmetaprint {
  $r->print("\n<br />".$fieldnames{$item}.': '.   $r->print("\n<br />".$fieldnames{$item}.': '.
   &Apache::lonmeta::prettyprint($item,    &Apache::lonmeta::prettyprint($item,
  $dynhash{$filelink}->{$item},   $dynhash{$filelink}->{$item},
   (($env{'form.catalogmode'} ne 'groupimport')?'preview':''),    (($env{'form.catalogmode'} ne 'import')?'preview':''),
   '',    '',
   (($env{'form.catalogmode'} eq 'groupimport')?'document.forms.fileattr':''),1));    (($env{'form.catalogmode'} eq 'import')?'document.forms.fileattr':''),1));
     }      }
 }  }
   
Line 1212  sub begin_form { Line 1239  sub begin_form {
   
 # --------- settings whenever the user causes the indexer window to be launched  # --------- settings whenever the user causes the indexer window to be launched
 sub start_fresh_session {  sub start_fresh_session {
     delete $hash{'form.catalogmode'};      my ($hash) = @_;
     delete $hash{'form.mode'};      delete $hash->{'form.catalogmode'};
     delete $hash{'form.form'};      delete $hash->{'form.mode'};
     delete $hash{'form.element'};      delete $hash->{'form.form'};
     delete $hash{'form.omit'};      delete $hash->{'form.element'};
     delete $hash{'form.only'};      delete $hash->{'form.omit'};
     foreach (keys %hash) {      delete $hash->{'form.only'};
         delete $hash{$_} if (/^(pre_|store)/);      foreach (keys %{$hash}) {
           delete $hash->{$_} if (/^(pre_|store)/);
     }      }
 }  }
   
Removed from v.1.143  
changed lines
  Added in v.1.155

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>