Diff for /loncom/interface/lonindexer.pm between versions 1.152 and 1.161

version 1.152, 2006/09/21 22:11:12 version 1.161, 2007/06/27 16:35:55
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 349  END Line 350  END
  my $js = <<"ENDHEADER";   my $js = <<"ENDHEADER";
 <script type="text/javascript">  <script type="text/javascript">
 $catalogmodefunctions  $catalogmodefunctions
   function checkAll(dir) {
       var numForms = document.forms.length;
       var dirLength = dir.length;
       var dirCheckbox = document.getElementById(dir);
       for (i=0;i<numForms;i++) {
           var numElements = document.forms[i].elements.length;
           for (j=0;j<numElements;j++){
               var fieldVal = document.forms[i].elements[j].value;
               var comp = fieldVal.substr(0,dirLength);
               if ((comp == dir) && (dirLength < fieldVal.length)) {
                   if (dirCheckbox.checked == true) {
                       document.forms[i].elements[j].checked = true;
                   } else {
                       document.forms[i].elements[j].checked = false;
                   }
               }
           }
       }
   }
 function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {  function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {
     var xpos = (screen.width-w)/2;      var xpos = (screen.width-w)/2;
     xpos = (xpos < 0) ? '0' : xpos;      xpos = (xpos < 0) ? '0' : xpos;
Line 366  function gothere(val) { Line 386  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)
Line 679  sub get_list { Line 699  sub get_list {
  $uri=~s/\/+/\//g;   $uri=~s/\/+/\//g;
  foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$uri))) {   foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$uri))) {
     my @ratpart=split(/\:/,$_);      my @ratpart=split(/\:/,$_);
     push @list,$ratpart[1];      push(@list,&LONCAPA::map::qtescape($ratpart[1]));
  }    } 
  $hash{'dirlist_files_'.$luri} = join("\n",@list);   $hash{'dirlist_files_'.$luri} = join("\n",@list);
     } else {      } else {
Line 688  sub get_list { Line 708  sub get_list {
  $hash{'dirlist_files_'.$luri} = join("\n",@list);   $hash{'dirlist_files_'.$luri} = join("\n",@list);
  $hash{'dirlist_timestamp_files_'.$luri} = time;   $hash{'dirlist_timestamp_files_'.$luri} = time;
     }      }
     return @list=&match_ext($r,@list);      return @list=&match_ext($r,@list);    
 }  }
   
 sub dynmetaread {  sub dynmetaread {
Line 798  sub display_line { Line 818  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 810  sub display_line { Line 831  sub display_line {
  $updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1];   $updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1];
  $updir=~s/\/+/\//g;   $updir=~s/\/+/\//g;
   
  $r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");   $r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
  $r->print("<td>\n");   $r->print("<td>\n");
  $r->print ('<form method="post" name="dirpathUP" action="'.$updir.   $r->print ('<form method="post" name="dirpathUP" action="'.$updir.
    '/" '.     '/" '.
Line 838  sub display_line { Line 859  sub display_line {
     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];
Line 854  sub display_line { Line 875  sub display_line {
    '\')"><img alt="" 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::domain($listname,'description')) {
     $r->print("(".$Apache::lonnet::domaindescription{$listname}.      $r->print("(".&Apache::lonnet::domain($listname,'description').
       ")");        ")");
  }   }
  $r->print ("</form>$tabtag</tr>\n");   $r->print ("</form>$tabtag</tr>\n");
Line 864  sub display_line { Line 885  sub display_line {
 # display user directory  # display user directory
     }      }
     if ($filecom[1] eq 'user') {      if ($filecom[1] eq 'user') {
  $r->print("<tr valign=$valign bgcolor=$fileclr>$extrafield");   # $r->print("<tr valign=$valign bgcolor=\"$fileclr\">$extrafield");
  $r->print("<td nowrap>\n");  
  my $curdir = $startdir.$filecom[0].'/';   my $curdir = $startdir.$filecom[0].'/';
  my $anchor = $curdir;   my $anchor = $curdir;
  $anchor =~ s/\///g;   $anchor =~ s/\///g;
    $r->print("<tr valign=$valign bgcolor=\"$fileclr\">");
    $r->print("<td>\n");
    $r->print("<input type=\"checkbox\" name=\"$curdir\" id=\"$curdir\" value=\"$curdir\" onClick=\"javascript:checkAll('$curdir')\" /></td>\n");
    $r->print("<td nowrap>\n");
  &begin_form ($r,$curdir);   &begin_form ($r,$curdir);
  $r->print ('<a name="'.$anchor.'"></a><img alt="" src="'.$iconpath.   $r->print ('<a name="'.$anchor.'"></a><img alt="" src="'.$iconpath.
    'whitespace1.gif" border="0" />'."\n");     'whitespace1.gif" border="0" />'."\n");
Line 905  sub display_line { Line 929  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='nowrap' valign='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 = &Apache::loncommon::escape_single($filelink);      my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
Line 913  sub display_line { Line 937  sub display_line {
                       $quotable_filelink,"')\">");                        $quotable_filelink,"')\">");
     $r->print("<img alt=\"\" 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 'import') {   } elsif ($env{'form.catalogmode'} eq 'import') {
     $r->print("<form name='form$fnum' action=''>\n");      $r->print("<form name='form$fnum' action=''>\n");
     $r->print("<input type='checkbox' name='filelink"."' ".      $r->print("<input type='checkbox' name='filelink"."' ".
Line 923  sub display_line { Line 947  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 1070  sub display_line { Line 1094  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("<tr bgcolor=$fileclr>$extrafield<td valign=$valign>");   $r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
  &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) {
Line 1199  sub showpreview { Line 1223  sub showpreview {
        $output='<font size="-2">'.$output.'</font>';         $output='<font size="-2">'.$output.'</font>';
     } elsif ($embstyle eq 'img') {      } elsif ($embstyle eq 'img') {
        $output='<img alt="'.&mt('Preview').'" src="'.$filelink.'" />';         $output='<img alt="'.&mt('Preview').'" src="'.$filelink.'" />';
     } elsif ($filelink=~/^\/res\/(\w+)\/(\w+)\//) {      } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {
        $output='<img  alt="'.&mt('Preview').'" 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.'" />';
     }      }
     return $output;      return $output;

Removed from v.1.152  
changed lines
  Added in v.1.161


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