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

Diff for /loncom/interface/lonindexer.pm between versions 1.203 and 1.213.4.1

version 1.203, 2009/12/02 18:33:27 version 1.213.4.1, 2012/05/07 05:15:00
Line 120  sub handler { Line 120  sub handler {
     my $colspan='';       my $colspan=''; 
           
     $extrafield='';      $extrafield='';
     my $diropendb =       my $diropendb = LONCAPA::tempdir() .
  "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db";   "$env{'user.domain'}_$env{'user.name'}_sel_res.db";
     %hash = ();      %hash = ();
     {      {
  my %dbfile;   my %dbfile;
Line 165  sub handler { Line 165  sub handler {
 ENDSUBM  ENDSUBM
        $r->print(&Apache::loncommon::start_page(undef,$js,         $r->print(&Apache::loncommon::start_page(undef,$js,
  {'only_body'   =>1,   {'only_body'   =>1,
                                                    'add_modal' => 1,
  'add_entries' =>   'add_entries' =>
      {'onload' => "load();"},}       {'onload' => "load();"},}
  ).   ).
Line 321  function select_group() { Line 322  function select_group() {
   
 function changeURL(val) {  function changeURL(val) {
     if (window.opener.document) {      if (window.opener.document) {
         var elementname  = "$element"+"_value";          var elementname  = "$element";
         var checkboxname = "$element"+"_setparmval";  
  window.opener.document.forms["$form"].elements[elementname].value=val;   window.opener.document.forms["$form"].elements[elementname].value=val;
         window.opener.document.forms["$form"].elements[checkboxname].checked=true;  
     } else {      } else {
     alert("The file you selected is: "+val);      alert("The file you selected is: "+val);
     }      }
Line 392  function uncheckAll() { Line 391  function uncheckAll() {
         }          }
     }      }
 }  }
   
 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 403  function openWindow(url, wdwName, w, h, Line 403  function openWindow(url, wdwName, w, h,
     var newWin = window.open(url, wdwName, options);      var newWin = window.open(url, wdwName, options);
     newWin.focus();      newWin.focus();
 }  }
   
 function gothere(val) {  function gothere(val) {
     window.location=val+'?acts='+document.forms.fileattr.acts.value$inhibit_menu;      window.location=val+'?acts='+document.forms.fileattr.acts.value$inhibit_menu;
 }  }
Line 415  ENDHEADER Line 416  ENDHEADER
         if ($env{'form.catalogmode'}) {          if ($env{'form.catalogmode'}) {
             # "Popup mode"              # "Popup mode"
             $r->print(&Apache::loncommon::start_page('Browse published resources',$js,              $r->print(&Apache::loncommon::start_page('Browse published resources',$js,
                                                      {'only_body' => 1,                                                       {'only_body' => 1, 'add_modal' =>1, 
                                                       'domain' => $headerdom,}));                                                        'domain' => $headerdom,}));
         } else {          } else {
             # Only display page header and breadcrumbs in non-popup mode              # Only display page header and breadcrumbs in non-popup mode
Line 452  ENDHEADER Line 453  ENDHEADER
     }      }
  }   }
   
           my @file_categories = &Apache::loncommon::filecategories();
           my %select_file_categories;
           my @select_form_order = ('');
           $select_file_categories{''} = &mt('All file types');
           foreach my $cat (@file_categories) {
               my $types = join(",",&Apache::loncommon::filecategorytypes($cat));
               $select_file_categories{$types} = &mt($cat);
               push(@select_form_order,$types);
           }
           $select_file_categories{'select_form_order'} = \@select_form_order;
           my $onchange = 'this.form.submit();';
           my $type_element=
               &Apache::loncommon::select_form(
                   $typeselect,
                   'only',
                   \%select_file_categories,$onchange);
           my $type_selector = '<label>'.&mt('File Type Displayed: [_1]',
                                             $type_element).'</label>';
   
 # ------------------------------- output state of file attributes to be showing  # ------------------------------- output state of file attributes to be showing
 #                                 All versions has to the last item  #                                 All versions has to the last item
 #                                 since it does not take an extra col  #                                 since it does not take an extra col
  my %lt=&Apache::lonlocal::texthash(   my %lt=&Apache::lonlocal::texthash(
    'ti' => 'Title',  
    'si' => 'Size',  
    'la' => 'Last access',  
    'lm' => 'Last modified',  
    'st' => 'Statistics',  
    'au' => 'Author',  
    'kw' => 'Keywords',  
    'sb' => 'Subject',  
    'nt' => 'Notes',  
    'ab' => 'Abstract',  
    'ln' => 'Language',  
    'gl' => 'Grade Level',  
    'sd' => 'Standards',  
    'sa' => 'Source Available',  
    'sr' => 'Show resource',  
    'li' => 'Linked/Related Resources',  
    'av' => 'All versions',     'av' => 'All versions',
    'ud' => 'Update Display',     'ud' => 'Update Display',
    'pr' => 'Problems',     'pr' => 'Problems',
Line 479  ENDHEADER Line 483  ENDHEADER
    'at' => 'All types',     'at' => 'All types',
    'hd' => 'Display Options'     'hd' => 'Display Options'
    );     );
  $r->print(<<END);          my @disp_order = ('0','4','5','6','13','1','2','3','10','14','8','11','7','12','15','16');
 <form method="post" name="fileattr" action="$uri" enctype="application/x-www-form-urlencoded">          my %disp_options = &Apache::lonlocal::texthash (
                                 0  => 'Title',
                                 4  => 'Author',
                                 5  => 'Keywords',
                                 6  => 'Language',
                                 13 => 'Notes',
                                 1  => 'Size',
                                 2  => 'Last access',
                                 3  => 'Last modified',
                                 10 => 'Source Available',
                                 14 => 'Abstract',
                                 8  => 'Statistics',
                                 11 => 'Linked/Related Resources',
                                 7  => 'Show resource',
                                 12 => 'Subject',
                                 15 => 'Grade Level',
                                 16 => 'Standards',
                              );
           my $cell = 0;
           my $numinrow = 4;
    $r->print('
   <form method="post" name="fileattr" action="'.$uri.'" enctype="application/x-www-form-urlencoded">
 <fieldset>  <fieldset>
 <legend>$lt{'hd'}</legend>  <legend>'.$lt{'hd'}.'</legend>
 <label><input type="checkbox" name="attr9" value="1" $attrchk[9] onclick="this.form.submit();" /> $lt{'av'}</label>  <table style=" border-collapse: collapse; border-style: none;">'."\n");
 <table border="0">          foreach my $item (@disp_order) {
 <tr>              my $style = 'padding-left: 12px; padding-right: 8px;';
 <td><label><input type="checkbox" name="attr0" value="1" $attrchk[0] onclick="this.form.submit();" /> $lt{'ti'}</label></td>              if ($cell%$numinrow == 0) {
 <td><label><input type="checkbox" name="attr4" value="1" $attrchk[4] onclick="this.form.submit();" /> $lt{'au'}</label></td>                  $r->print('<tr>');
 <td><label><input type="checkbox" name="attr5" value="1" $attrchk[5] onclick="this.form.submit();" /> $lt{'kw'}</label></td>              }
 <td><label><input type="checkbox" name="attr6" value="1" $attrchk[6] onclick="this.form.submit();" /> $lt{'ln'}</label></td>              $cell ++;
 <td><label><input type="checkbox" name="attr13" value="1" $attrchk[13] onclick="this.form.submit();" /> $lt{'nt'}</label></td>              if ($cell > 3 * $numinrow) {
 <td><label><input type="checkbox" name="attr16" value="1" $attrchk[16] onclick="this.form.submit();" /> $lt{'sd'}</label></td>                  $style .= ' padding-bottom: 6px;'; 
 </tr>              }
 <tr>              if (defined($disp_options{$item})) {
 <td><label><input type="checkbox" name="attr1" value="1" $attrchk[1] onclick="this.form.submit();" /> $lt{'si'}</label></td>                  $r->print('<td style="'.$style.'"><span class="LC_nobreak">'.
 <td><label><input type="checkbox" name="attr2" value="1" $attrchk[2] onclick="this.form.submit();" /> $lt{'la'}</label></td>                            '<label><input type="checkbox" name="attr'.$item.'" value="1" '.
 <td><label><input type="checkbox" name="attr3" value="1" $attrchk[3] onclick="this.form.submit();" /> $lt{'lm'}</label></td>                            $attrchk[$item].' onclick="this.form.submit();" /> '.$disp_options{$item}.
 <td><label><input type="checkbox" name="attr10" value="1" $attrchk[10] onclick="this.form.submit();" /> $lt{'sa'}</label></td>                            '</label></span></td>'."\n");
 <td><label><input type="checkbox" name="attr14" value="1" $attrchk[14] onclick="this.form.submit();" /> $lt{'ab'}</label></td>              }
 <td>&nbsp;</td>              if ($cell > 1 && $cell%$numinrow == 0) {
 </tr>                  $r->print('</tr>');
               }
           }
           $r->print(<<END);
 <tr>  <tr>
 <td><label><input type="checkbox" name="attr8" value="1" $attrchk[8] onclick="this.form.submit();" /> $lt{'st'}</label></td>  <td style="font-style: italic; border-top: 1px solid black; padding-top: 6px"> 
 <td><label><input type="checkbox" name="attr11" value="1" $attrchk[11] onclick="this.form.submit();" /> $lt{'li'}</label></td>  <label><input type="checkbox" name="attr9" value="1" $attrchk[9] onclick="this.form.submit();" /> $lt{'av'}</label>
 <td><label><input type="checkbox" name="attr7" value="1" $attrchk[7] onclick="this.form.submit();" /> $lt{'sr'}</label></td>  </td>
 <td><label><input type="checkbox" name="attr12" value="1" $attrchk[12] onclick="this.form.submit();" /> $lt{'sb'}</label></td>  <td colspan="3" style="padding-left:8px; padding-top: 4px; font-style: italic; border-top: 1px solid black; padding-top: 8px">$type_selector</td>
 <td><label><input type="checkbox" name="attr15" value="1" $attrchk[15] onclick="this.form.submit();" /> $lt{'gl'}</label></td>  
 <td>&nbsp;</td>  
 </tr>  </tr>
 </table>  </table>
 <input type="hidden" name="attrs" value="1" />  <input type="hidden" name="attrs" value="1" />
 END  </fieldset>
         my @file_categories = &Apache::loncommon::filecategories();  
         my %select_file_categories;  
         my @select_form_order = ('');  
         $select_file_categories{''} = &mt('All file types');  
         foreach my $cat (@file_categories) {  
     my $types = join(",",&Apache::loncommon::filecategorytypes($cat));  
     $select_file_categories{$types} = &mt($cat);  
     push(@select_form_order,$types);  
  }  
         $select_file_categories{'select_form_order'} = \@select_form_order;  
         my $type_element=  
             &Apache::loncommon::select_form(  
                 $typeselect,  
                 'only',  
                 %select_file_categories);  
         $type_element = '<label>'.&mt('File Type Displayed: [_1]',  
       $type_element).'</label>';  
         $r->print($type_element  
                  .'</fieldset>');  
         $r->print(<<END);  
 <input type="submit" name="updatedisplay" value="$lt{'ud'}" />  <input type="submit" name="updatedisplay" value="$lt{'ud'}" />
 <input type="hidden" name="acts" value="" />  <input type="hidden" name="acts" value="" />
 $closebutton $groupimportbutton  $closebutton $groupimportbutton
Line 751  sub scanDir { Line 757  sub scanDir {
 sub get_list {  sub get_list {
     my ($r,$uri)=@_;      my ($r,$uri)=@_;
     my @list=();      my @list=();
       my $listerror;
       
     (my $luri = $uri) =~ s/\//_/g;      (my $luri = $uri) =~ s/\//_/g;
     if ($env{'form.updatedisplay'}) {      if ($env{'form.updatedisplay'}) {
  foreach (keys %hash) {   foreach (keys %hash) {
Line 774  sub get_list { Line 782  sub get_list {
  $hash{'dirlist_files_'.$luri} = join("\n",@list);   $hash{'dirlist_files_'.$luri} = join("\n",@list);
     } else {      } else {
 # is really a directory  # is really a directory
  @list = &Apache::lonnet::dirlist($uri);   (my $listref,$listerror) = &Apache::lonnet::dirlist($uri);
           if (ref($listref) eq 'ARRAY') {
               @list = @{$listref};
           }
  $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;
     }      }
   #Checking for error messages associated with empty directories or inaccessible servers (See Bug 4984)
       if (($listerror eq 'no_such_dir') || ($listerror eq 'no_such_host') || ($listerror eq 'no_host')) { 
           $r->print("<p class='LC_info'>" . &mt("Directory does not exist."). "</p>");
       } elsif ($listerror eq 'con_lost') {
           $r->print("<p class='LC_info'>" . &mt("Directory temporarily not accessible."). "</p>");
       }
   
     return @list=&match_ext($r,@list);          return @list=&match_ext($r,@list);    
 }  }
   
Line 986  $r->print ('<input type="hidden" name="a Line 1004  $r->print ('<input type="hidden" name="a
         $r->print ($listname.'</a>');          $r->print ($listname.'</a>');
   
         if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }          if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
         $r->print('</form>'.$tabtag);          $r->print('</form></td>');
         $r->print(&Apache::loncommon::end_data_table_row());          $r->print(&Apache::loncommon::end_data_table_row());
         return OK;          return OK;
     }      }
Line 1068  $r->print ('<input type="hidden" name="a Line 1086  $r->print ('<input type="hidden" name="a
  $r->print("<img alt=\"\" src='$iconname' class='LC_fileicon' />\n");   $r->print("<img alt=\"\" src='$iconname' class='LC_fileicon' />\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:openMyModal('".$quotable_filelink."?inhibitmenu=yes',500,500,'yes');\">$listname</a> ");
    "?inhibitmenu=yes','previewfile','450','500','no','yes','yes');\"".  
    " target=\"_self\">$listname</a> ");  
  $quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta');   $quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta');
  &Apache::loncommon::inhibit_menu_check(\$quotable_filelink);   &Apache::loncommon::inhibit_menu_check(\$quotable_filelink);
  $r->print (" (<a href=\"javascript:openWindow('".$quotable_filelink.   $r->print (" (<a href=\"javascript:openMyModal('".$quotable_filelink."?inhibitmenu=yes',500,500,'yes');\">".&mt('metadata')."</a>) ");
    "?inhibitmenu=yes','metadatafile','500','550','no','yes','no');\" ".  
    " target=\"_self\">".&mt('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 1223  $r->print ('<input type="hidden" name="a Line 1237  $r->print ('<input type="hidden" name="a
                   
         my $location = &Apache::loncommon::lonhttpdurl("/adm/lonIcons");          my $location = &Apache::loncommon::lonhttpdurl("/adm/lonIcons");
  my $icon = "navmap.folder.".($nowOpen ? "open":"closed").'.gif';   my $icon = "navmap.folder.".($nowOpen ? "open":"closed").'.gif';
         $r->print ('<a href="javascript:gothere(\''          $r->print ('<a href="javascript:gothere('
    .$quotable_curdir.'\')"">'                    ."'$quotable_curdir'".');">'
    .'<img class="LC_fileicon" alt="'.&mt('Open Folder').'" src="'.                    .'<img class="LC_fileicon" alt="'.&mt('Open Folder').'" src="'
                    $location."/".$icon.'" />'.                    .$location.'/'.$icon.'" />'
                    "\n");                    ."\n");
  $r->print ("$listname</a></form></td>\n");   $r->print ("$listname</a></form>");
           $r->print('</td>');
 # Attributes  # Attributes
  my $filelink = $startdir.$filecom[0].'/default';   my $filelink = $startdir.$filecom[0].'/default';
   
Removed from v.1.203  
changed lines
  Added in v.1.213.4.1

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