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

Diff for /loncom/interface/lonindexer.pm between versions 1.126 and 1.146

version 1.126, 2004/10/20 10:54:08 version 1.146, 2006/06/23 06:39:09
Line 44  package Apache::lonindexer; Line 44  package Apache::lonindexer;
   
 # ------------------------------------------------- modules used by this module  # ------------------------------------------------- modules used by this module
 use strict;  use strict;
 use Apache::lonnet();  use Apache::lonnet;
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::lonsequence();  use Apache::lonsequence();
Line 116  sub handler { Line 116  sub handler {
     my $closebutton='';      my $closebutton='';
     my $groupimportbutton='';      my $groupimportbutton='';
     my $colspan='';       my $colspan=''; 
       
     $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;
Line 131  sub handler { Line 131  sub handler {
  }   }
     }      }
     {      {
  if ($ENV{'form.launch'} eq '1') {   if ($env{'form.launch'} eq '1') {
     &start_fresh_session();      &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') {
        $r->content_type('text/html');         &Apache::loncommon::content_type($r,'text/html');
        my $extra='';         my $extra='';
        if (defined($ENV{'form.titleelement'}) &&          if (defined($env{'form.titleelement'}) && 
    $ENV{'form.titleelement'} ne '') {     $env{'form.titleelement'} ne '') {
    my $verify_title = &Apache::lonnet::gettitle($ENV{'form.acts'});     my $verify_title = &Apache::lonnet::gettitle($env{'form.acts'});
 #   &Apache::lonnet::logthis("Hrrm $ENV{'form.acts'} -- $verify_title");  #   &Apache::lonnet::logthis("Hrrm $env{'form.acts'} -- $verify_title");
    $verify_title=~s/'/\\'/g;     $verify_title=~s/'/\\'/g;
    $extra='window.opener.document.forms["'.$ENV{'form.form'}.'"].elements["'.$ENV{'form.titleelement'}.'"].value=\''.$verify_title.'\';';     $extra='window.opener.document.forms["'.$env{'form.form'}.'"].elements["'.$env{'form.titleelement'}.'"].value=\''.$verify_title.'\';';
        }         }
        $r->print(<<ENDSUBM);         my $js = <<ENDSUBM;
  <html>         <script type="text/javascript">
  <script type="text/javascript">  
  function load() {   function load() {
  window.opener.document.forms["$ENV{'form.form'}"]   window.opener.document.forms["$env{'form.form'}"]
     .elements["$ENV{'form.element'}"]      .elements["$env{'form.element'}"]
     .value='$ENV{'form.acts'}';      .value='$env{'form.acts'}';
  $extra   $extra
  window.close();   window.close();
  }   }
     </script>            </script>
     <body onLoad=load();>  
       </body>  
     </html>  
 ENDSUBM  ENDSUBM
          $r->print(&Apache::loncommon::start_page(undef,$js,
    {'only_body'   =>1,
    'add_entries' =>
        {'onload' => "load();"},}
    ).
    &Apache::loncommon::end_page());
        return OK;         return OK;
    }     }
           
 # -------------------- refresh environment with user database values (in %hash)  # -------------------- refresh environment with user database values (in %hash)
  &setvalues(\%hash,'form.catalogmode',\%ENV,'form.catalogmode'   );   &setvalues(\%hash,'form.catalogmode',\%env,'form.catalogmode'   );
   
 # --------------------- 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"'.   '<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
  ' border="0" /></td>';   ' border="0" /></td>';
     $colspan=" colspan='2' ";      $colspan=" colspan='2' ";
             my $cl=&mt('Close');              my $cl=&mt('Close');
             $closebutton=<<END;              $closebutton=<<END;
 <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"'.   '<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
  ' border="0" /></td>';   ' border="0" /></td>';
Line 185  END Line 187  END
     my $cl=&mt('Close');      my $cl=&mt('Close');
             my $gi=&mt('Import');              my $gi=&mt('Import');
             $closebutton=<<END;              $closebutton=<<END;
 <input type="button" name="close" value='$cl' onClick="self.close()">  <input type="button" name="close" value='$cl' onClick="self.close()" />
 END  END
             $groupimportbutton=<<END;              $groupimportbutton=<<END;
 <input type="button" name="groupimport" value='$gi'  <input type="button" name="groupimport" value='$gi'
 onClick="javascript:select_group()">  onClick="javascript:select_group()" />
 END  END
         }          }
  # Additions made by Matthew to make the browser a little easier to deal   # Additions made by Matthew to make the browser a little easier to deal
Line 201  END Line 203  END
  # $element is the name of the element in $formname which receives   # $element is the name of the element in $formname which receives
  #       the URL.   #       the URL.
  #&Apache::lonxml::debug('Checking mode, form, element');   #&Apache::lonxml::debug('Checking mode, form, element');
  &setvalues(\%hash,'form.mode'        ,\%ENV,'form.mode'   );   &setvalues(\%hash,'form.mode'        ,\%env,'form.mode'   );
  &setvalues(\%hash,'form.form'        ,\%ENV,'form.form'   );   &setvalues(\%hash,'form.form'        ,\%env,'form.form'   );
  &setvalues(\%hash,'form.element'     ,\%ENV,'form.element');   &setvalues(\%hash,'form.element'     ,\%env,'form.element');
  &setvalues(\%hash,'form.titleelement',\%ENV,'form.titleelement');   &setvalues(\%hash,'form.titleelement',\%env,'form.titleelement');
  &setvalues(\%hash,'form.only'        ,\%ENV,'form.only'   );   &setvalues(\%hash,'form.only'        ,\%env,'form.only'   );
  &setvalues(\%hash,'form.omit'        ,\%ENV,'form.omit'   );   &setvalues(\%hash,'form.omit'        ,\%env,'form.omit'   );
   
         # Deal with 'omit' and 'only'           # Deal with 'omit' and 'only' 
         if (exists $ENV{'form.omit'}) {          if (exists $env{'form.omit'}) {
             @Omit = split(',',$ENV{'form.omit'});              @Omit = split(',',$env{'form.omit'});
         }          }
         if (exists $ENV{'form.only'}) {          if (exists $env{'form.only'}) {
             @Only = split(',',$ENV{'form.only'});              @Only = split(',',$env{'form.only'});
         }          }
                   
  my $mode = $ENV{'form.mode'};   my $mode = $env{'form.mode'};
  my ($form,$element,$titleelement);   my ($form,$element,$titleelement);
  if ($mode eq 'edit' || $mode eq 'parmset') {   if ($mode eq 'edit' || $mode eq 'parmset') {
     $form         = $ENV{'form.form'};      $form         = $env{'form.form'};
     $element      = $ENV{'form.element'};      $element      = $env{'form.element'};
     $titleelement = $ENV{'form.titleelement'};      $titleelement = $env{'form.titleelement'};
  }   }
  #&Apache::lonxml::debug("mode=$mode form=$form element=$element titleelement=$titleelement");   #&Apache::lonxml::debug("mode=$mode form=$form element=$element titleelement=$titleelement");
 # ------ 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 238  END Line 240  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 325  function rep_dirpath(suffix,val) { Line 327  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 343  END Line 345  END
  }   }
   
 # ---------------------------------------------------------------- Print Header  # ---------------------------------------------------------------- Print Header
  $r->print(<<ENDHEADER);   my $js = <<"ENDHEADER";
 <html>  
 <head>  
 <title>The LearningOnline Network With CAPA Directory Browser</title>  
   
 <script type="text/javascript">  <script type="text/javascript">
 $catalogmodefunctions  $catalogmodefunctions
 function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {  function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {
Line 365  function gothere(val) { Line 363  function gothere(val) {
     window.location=val+'?acts='+document.forms.fileattr.acts.value;      window.location=val+'?acts='+document.forms.fileattr.acts.value;
 }  }
 </script>  </script>
   
 </head>  
 ENDHEADER  ENDHEADER
 my ($headerdom)=($uri=~/^\/res\/(\w+)\//);  
 $r->print(&Apache::loncommon::bodytag('Browse Resources',undef,undef,undef,          my ($headerdom)=($uri=~/^\/res\/(\w+)\//);
       $headerdom));   $r->print(&Apache::loncommon::start_page('Browse Resources',$js,
    {'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;
     my %achash;      my %achash;
Line 414  $r->print(&Apache::loncommon::bodytag('B Line 411  $r->print(&Apache::loncommon::bodytag('B
  }   }
   
 # ---------------------------------- get state of file attributes to be showing  # ---------------------------------- get state of file attributes to be showing
  if ($ENV{'form.attrs'}) {   if ($env{'form.attrs'}) {
     for (my $i=0; $i<=11; $i++) {      for (my $i=0; $i<=11; $i++) {
  delete $hash{'display_attrs_'.$i};   delete $hash{'display_attrs_'.$i};
  if ($ENV{'form.attr'.$i} == 1) {   if ($env{'form.attr'.$i} == 1) {
     $attrchk[$i] = 'checked';      $attrchk[$i] = 'checked';
     $hash{'display_attrs_'.$i} = 1;      $hash{'display_attrs_'.$i} = 1;
  }   }
Line 481  END Line 478  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',
 '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();'));
 # -------------------------------------------------------- Resource Home Button  # -------------------------------------------------------- Resource Home Button
  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 502  END Line 499  END
  &Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);   &Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);
 # ----------------- output starting row to the indexed file/directory hierarchy  # ----------------- output starting row to the indexed file/directory hierarchy
         my $titleclr="#ddffff";          my $titleclr="#ddffff";
 #        $r->print(&initdebug());          #$r->print(&initdebug());
 #        $r->print(&writedebug("Omit:@Omit")) if (@Omit);          #$r->print(&writedebug("Omit:@Omit")) if (@Omit);
 #        $r->print(&writedebug("Only:@Only")) if (@Only);          #$r->print(&writedebug("Only:@Only")) if (@Only);
         $r->print("<table width='100\%' border=0><tr><td bgcolor=#777777>\n");          $r->print('<table width="100%" border="0"><tr><td bgcolor="#777777">'."\n");
  $r->print("<table width='100\%' border=0><tr bgcolor=$titleclr>\n");   $r->print('<table width="100%" border="0"><tr bgcolor="'.$titleclr.'">'."\n");
  $r->print("<td $colspan><b>".&mt('Name')."</b></td>\n");   $r->print("<td $colspan><b>".&mt('Name')."</b></td>\n");
  $r->print("<td><b>".&mt('Title')."</b></td>\n")    $r->print("<td><b>".&mt('Title')."</b></td>\n") 
     if ($hash{'display_attrs_0'} == 1);      if ($hash{'display_attrs_0'} == 1);
Line 542  END Line 539  END
     }      }
  }   }
   
  if ($ENV{'form.openuri'}) {  # take care of review and refresh options   if ($env{'form.openuri'}) {  # take care of review and refresh options
     my $uri=$ENV{'form.openuri'};      my $uri=$env{'form.openuri'};
     if (exists($hash{'diropen_status_'.$uri})) {      if (exists($hash{'diropen_status_'.$uri})) {
  my $cursta = $hash{'diropen_status_'.$uri};   my $cursta = $hash{'diropen_status_'.$uri};
  $dirs{$uri} = 'open';   $dirs{$uri} = 'open';
Line 562  END Line 559  END
  my $indent = 0;   my $indent = 0;
  $uri = $uri.'/' if $uri !~ /.*\/$/;   $uri = $uri.'/' if $uri !~ /.*\/$/;
   
   if ($ENV{'form.dirPointer'} ne 'on') {    if ($env{'form.dirPointer'} ne 'on') {
      $hash{'top.level'} = $uri;       $hash{'top.level'} = $uri;
      $toplevel = $uri;       $toplevel = $uri;
   } else {    } else {
Line 584  END Line 581  END
   
 # ---------------------------- embed hidden information useful for group import  # ---------------------------- embed hidden information useful for group import
  $r->print("<form name='fnum'>");   $r->print("<form name='fnum'>");
  $r->print("<input type='hidden' name='fnum' value='$fnum'></form>");   $r->print("<input type='hidden' name='fnum' value='$fnum' /></form>");
   
 # -------------------------------------------------------------- end the tables  # -------------------------------------------------------------- end the tables
  $r->print('</table>');   $r->print('</table>');
  $r->print('</td></tr></table>');   $r->print('</td></tr></table>');
   
 # --------------------------------------------------- end the output and return  # --------------------------------------------------- end the output and return
  $r->print('</body></html>'."\n");   $r->print(&Apache::loncommon::end_page()."\n");
     }      }
     if(! $c->aborted()) {      if(! $c->aborted()) {
 # write back into the temporary file  # write back into the temporary file
Line 663  sub get_list { Line 660  sub get_list {
     my ($r,$uri)=@_;      my ($r,$uri)=@_;
     my @list=();      my @list=();
     (my $luri = $uri) =~ s/\//_/g;      (my $luri = $uri) =~ s/\//_/g;
     if ($ENV{'form.updatedisplay'}) {      if ($env{'form.updatedisplay'}) {
  foreach (keys %hash) {   foreach (keys %hash) {
     delete $hash{$_} if ($_ =~ /^dirlist_files_/);      delete $hash{$_} if ($_ =~ /^dirlist_files_/);
     delete $hash{$_} if ($_ =~ /^dirlist_timestamp_files_/);      delete $hash{$_} if ($_ =~ /^dirlist_timestamp_files_/);
Line 707  sub dynmetaread { Line 704  sub dynmetaread {
  }   }
 # Actually get the data  # Actually get the data
  %dynhash=   %dynhash=
     (%dynhash,&Apache::lonmeta::get_dynamic_metadata_from_sql($uri));      (%dynhash,&Apache::lonmeta::get_dynamic_metadata_from_sql($uri.'/'));
 # Remember that we got it  # Remember that we got it
  $dynread{$uri}=1;   $dynread{$uri}=1;
     }       } 
 }  }
   
 sub initdebug {  sub initdebug {
       my $start_page=
    &Apache::loncommon::start_page('Debug',undef,
          {'only_body' => 1,});
       $start_page =~ s/\n/ /g;
     return <<ENDJS;      return <<ENDJS;
 <script>  <script type="text/javascript">
 var debugging = true;  var debugging = true;
 if (debugging) {  if (debugging) {
     var debuggingWindow = window.open('','Debug','width=400,height=300',true);      var debuggingWindow = window.open('','Debug','width=400,height=300',true);
Line 726  function output(text) { Line 727  function output(text) {
         debuggingWindow.document.writeln(text);          debuggingWindow.document.writeln(text);
     }      }
 }  }
 output("<html><head><title>Debugging Window</title></head><body><pre>");     output('$start_page<pre>');   
 </script>  </script>
 ENDJS  ENDJS
 }  }
   
 sub writedebug {  sub writedebug {
     my $text = shift;      my ($text) = @_;
     return "<script>output('$text');</script>";      return "<script type=\"text/javascript\">output('$text');</script>";
 }  }
   
 # -------------------- filters out files based on extensions (returns an array)  # -------------------- filters out files based on extensions (returns an array)
Line 816  sub display_line { Line 817  sub display_line {
    'enctype="application/x-www-form-urlencoded"'.     'enctype="application/x-www-form-urlencoded"'.
                    '>'."\n");                     '>'."\n");
  $r->print ('<input type=hidden name=openuri value="'.   $r->print ('<input type=hidden name=openuri value="'.
    $startdir.'">'."\n");     $startdir.'" />'."\n");
  $r->print ('<input type="hidden" name="acts" value="">'."\n");   $r->print ('<input type="hidden" name="acts" value="" />'."\n");
  $r->print ('<input src="'.$iconpath.'arrow_up.gif"');   $r->print ('<input src="'.$iconpath.'arrow_up.gif"');
  $r->print (' name="'.$msg.'" height="22" type="image" border="0">'.   $r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
    "\n");     "\n");
  $r->print(&mt("Up")." $tabtag</tr></form>\n");   $r->print(&mt("Up")."</form>$tabtag</tr>\n");
  return OK;   return OK;
     }      }
 # Do we have permission to look at this?  # Do we have permission to look at this?
Line 833  sub display_line { Line 834  sub display_line {
   
 # display domain  # display domain
     if ($filecom[1] eq 'domain') {      if ($filecom[1] eq 'domain') {
   $r->print ('<input type="hidden" name="dirPointer" value="on">'."\n")    $r->print ('<input type="hidden" name="dirPointer" value="on" />'."\n")
      if ($ENV{'form.dirPointer'} eq "on");       if ($env{'form.dirPointer'} eq "on");
  $r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");   $r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");
  $r->print("<td>");   $r->print("<td>");
  &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.'">');
  $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"'); 
  $r->print (' name="'.$msg.'" height="22" type="image" border="0">'.   $r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
    "\n");     "\n");
  my $quotable_filecom = &javascript_escape($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 src="'.$iconpath.'server.gif"');
  $r->print (' border="0" /></a>'."\n");   $r->print (' border="0" /></a>'."\n");
Line 855  sub display_line { Line 856  sub display_line {
     $r->print("(".$Apache::lonnet::domaindescription{$listname}.      $r->print("(".$Apache::lonnet::domaindescription{$listname}.
       ")");        ")");
  }   }
  $r->print (" $tabtag</tr></form>\n");   $r->print ("</form>$tabtag</tr>\n");
  return OK;   return OK;
   
 # display user directory  # display user directory
Line 869  sub display_line { Line 870  sub display_line {
  &begin_form ($r,$curdir);   &begin_form ($r,$curdir);
  $r->print ('<a name="'.$anchor.'"><img src="'.$iconpath.   $r->print ('<a name="'.$anchor.'"><img 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.
    '.gif"');      '.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 = &javascript_escape($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 src='.
    $iconpath.'quill.gif border="0" name="'.$msg.     $iconpath.'quill.gif border="0" name="'.$msg.
Line 883  sub display_line { Line 884  sub display_line {
  my $plainname=&Apache::loncommon::plainname($listname,$domain);   my $plainname=&Apache::loncommon::plainname($listname,$domain);
  $r->print ($listname);   $r->print ($listname);
  if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }   if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
  $r->print ($tabtag.'</tr></form>'."\n");   $r->print ('</form>'.$tabtag.'</tr>'."\n");
  return OK;   return OK;
     }      }
   
Line 902  sub display_line { Line 903  sub display_line {
         }          }
  # Set the icon for the file   # Set the icon for the file
  my $iconname = &Apache::loncommon::icon($listname);   my $iconname = &Apache::loncommon::icon($listname);
  $r->print("<tr valign='$valign' bgcolor=$fileclr><td nowrap='1' align='top'>");   $r->print("<tr valign='$valign' bgcolor=$fileclr><td nowrap='nowrap' valign='top'>");
   
         if ($ENV{'form.catalogmode'} eq 'interactive') {          if ($env{'form.catalogmode'} eq 'interactive') {
     my $quotable_filelink = &javascript_escape($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 src='",$iconpath,"select.gif' border='0' /></a>".
       "\n");        "\n");
     $r->print("</td><td nowrap>");      $r->print("</td><td nowrap>");
  } 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'>\n");
     $r->print("<input type='checkbox' name='filelink"."' ".      $r->print("<input type='checkbox' name='filelink"."' ".
       "value='$filelink' onClick='".        "value='$filelink' onClick='".
Line 919  sub display_line { Line 920  sub display_line {
     if ($hash{'store_'.$filelink}) {      if ($hash{'store_'.$filelink}) {
  $r->print("checked");   $r->print("checked");
     }      }
     $r->print(">\n");      $r->print(" />\n");
     $r->print("</form>\n");      $r->print("</form></td><td nowrap>");
     $r->print("</td><td nowrap>");  
     $hash{"pre_${fnum}_link"}=$filelink;      $hash{"pre_${fnum}_link"}=$filelink;
      $fnum++;       $fnum++;
  }   }
Line 954  sub display_line { Line 954  sub display_line {
     my $curdir = $startdir.$filecom[0].'/';      my $curdir = $startdir.$filecom[0].'/';
     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.'"><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 src='$iconname' border='0' />\n");
 # Close form to open/close sequence   my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
  if ($filelink=~/\.(page|sequence)$/) {  
     $r->print('</form>');  
  }  
  my $quotable_filelink = &javascript_escape($filelink);  
   
   
  $r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.   $r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.
Line 976  sub display_line { Line 972  sub display_line {
  $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
    if ($filelink=~/\.(page|sequence)$/) {
       $r->print('</form>');
    }
  $r->print("</td>\n");   $r->print("</td>\n");
  if ($hash{'display_attrs_0'} == 1) {   if ($hash{'display_attrs_0'} == 1) {
     my $title = &Apache::lonnet::gettitle($filelink,'title');      my $title = &Apache::lonnet::gettitle($filelink,'title');
Line 1033  sub display_line { Line 1033  sub display_line {
     my $source = &Apache::lonnet::metadata($filelink,'sourceavail');      my $source = &Apache::lonnet::metadata($filelink,'sourceavail');
     if($source eq 'open') {      if($source eq 'open') {
  my $sourcelink = &Apache::lonsource::make_link($filelink,$listname);   my $sourcelink = &Apache::lonsource::make_link($filelink,$listname);
  my $quotable_sourcelink = &javascript_escape($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')\";".
Line 1050  sub display_line { Line 1050  sub display_line {
    &dynmetaprint($r,$filelink,'comefrom_list');     &dynmetaprint($r,$filelink,'comefrom_list');
    &dynmetaprint($r,$filelink,'sequsage_list');     &dynmetaprint($r,$filelink,'sequsage_list');
    &dynmetaprint($r,$filelink,'dependencies');     &dynmetaprint($r,$filelink,'dependencies');
              &dynmetaprint($r,$filelink,'course_list');
    $r->print('</td>');     $r->print('</td>');
         }          }
         if ($hash{'display_attrs_7'} == 1) {          if ($hash{'display_attrs_7'} == 1) {
 # Show resource  # Show resource
             my $output='';     my $output=&showpreview($filelink);
             my $embstyle=&Apache::loncommon::fileembstyle($curfext);             $r->print('<td> '.($output eq '' ? '&nbsp;':$output).
     if ($embstyle eq 'ssi') {  
  my $cache=$Apache::lonnet::perlvar{'lonDocRoot'}.$filelink.  
     '.tmp';  
  if ((!$ENV{'form.updatedisplay'}) &&  
     (-e $cache)) {  
     open(FH,$cache);  
     $output=join("\n",<FH>);  
     close(FH);  
  } else {  
     $output=&Apache::lonnet::ssi_body($filelink);  
     open(FH,">$cache");  
     print FH $output;  
     close(FH);  
  }  
  $output='<font size="-2">'.$output.'</font>';  
    } elsif ($embstyle eq 'img') {  
                $output='<img src="'.$filelink.'" />';  
            } elsif ($filelink=~/^\/res\/(\w+)\/(\w+)\//) {  
                $output='<img src="http://'.  
  $Apache::lonnet::hostname{&Apache::lonnet::homeserver($2,$1)}.  
                  '/cgi-bin/thumbnail.gif?url='.$filelink.'" />';  
            }  
    $r->print('<td> '.($output eq '' ? '&nbsp;':$output).  
       " </td>\n");        " </td>\n");
         }          }
  $r->print("</tr>\n");   $r->print("</tr>\n");
Line 1107  sub display_line { Line 1085  sub display_line {
     $r->print ("<img src=",$iconpath,"whitespace",$rem,      $r->print ("<img 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.'"><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 = &javascript_escape($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 src="'.
    $iconpath.'folder_'.$diropen.'.gif" border="0" /></a>'.     $iconpath.'folder_'.$diropen.'.gif" border="0" /></a>'.
Line 1170  sub display_line { Line 1148  sub display_line {
   
 }  }
   
   sub showpreview {
       my ($filelink)=@_;
       my ($curfext)=($filelink=~/\.(\w+)$/);
       my $output='';
       my $embstyle=&Apache::loncommon::fileembstyle($curfext);
       if ($embstyle eq 'ssi') {
          my $cache=$Apache::lonnet::perlvar{'lonDocRoot'}.$filelink.
                       '.tmp';
          if ((!$env{'form.updatedisplay'}) &&
                       (-e $cache)) {
             open(FH,$cache);
             $output=join("\n",<FH>);
             close(FH);
          } else {
             $output=&Apache::lonnet::ssi_body($filelink);
   # Is access denied? Don't render, don't store
             if ($output=~/LONCAPAACCESSCONTROLERRORSCREEN/s) {
                $output='';
   # Was this rendered in course content? Don't store
             } elsif (!&Apache::lonnet::symbread($filelink)) {
                open(FH,">$cache");
                print FH $output;
                close(FH);
             }
          }
          $output='<font size="-2">'.$output.'</font>';
       } elsif ($embstyle eq 'img') {
          $output='<img src="'.$filelink.'" />';
       } elsif ($filelink=~/^\/res\/(\w+)\/(\w+)\//) {
          $output='<img src="http://'.
                    $Apache::lonnet::hostname{&Apache::lonnet::homeserver($2,$1)}.
                    '/cgi-bin/thumbnail.gif?url='.$filelink.'" />';
       }
       return $output;
   }
   
 sub dynmetaprint {  sub dynmetaprint {
     my ($r,$filelink,$item)=@_;      my ($r,$filelink,$item)=@_;
     if ($dynhash{$filelink}->{$item}) {      if ($dynhash{$filelink}->{$item}) {
  $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 1192  sub begin_form { Line 1206  sub begin_form {
        '" onSubmit="return rep_dirpath(\''.$dnum.'\''.         '" onSubmit="return rep_dirpath(\''.$dnum.'\''.
        ',document.forms.fileattr.acts.value)" '.         ',document.forms.fileattr.acts.value)" '.
        'enctype="application/x-www-form-urlencoded">'."\n");         'enctype="application/x-www-form-urlencoded">'."\n");
     $r->print ('<input type="hidden" name="openuri" value="'.$uri.'">'.      $r->print ('<input type="hidden" name="openuri" value="'.$uri.'" />'.
        "\n");         "\n");
     $r->print ('<input type="hidden" name="dirPointer" value="on">'."\n");      $r->print ('<input type="hidden" name="dirPointer" value="on" />'."\n");
     $dnum++;      $dnum++;
 }  }
   
Line 1230  sub cleanup { Line 1244  sub cleanup {
     if (tied(%hash)){      if (tied(%hash)){
  &Apache::lonnet::logthis('Cleanup indexer: hash');   &Apache::lonnet::logthis('Cleanup indexer: hash');
     }      }
       return OK;
 }  }
   
   
 #  
 #    Escapes strings that may have embedded 's that will be put into  
 #    javascript strings as 'strings'.  
 #    The assumptions are:  
 #       There has been no effort to escape ' with \'  
 #       Any \'s in the string are intended to be there as part of the URL  
 #        and must also be escaped.  
 # Parameters:  
 #     input     - The string to escape.  
 # Returns:  
 #     The escaped string (' replaced by \' and \ replaced by \\).  
 #  
 sub javascript_escape {  
     my ($input) = @_;  
   
     #  I imagine a regexp wizard could combine the two expressions below.  
     #  If you do you might want to comment the result.  
   
     $input =~ s/\\/\\\\/g; # Escape the /'s..(must be first)>  
     $input =~ s/\'/\\\'/g; # Esacpe the 's....  
   
     return $input;  
 }  
   
   
   
Removed from v.1.126  
changed lines
  Added in v.1.146

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