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

Diff for /loncom/interface/lonindexer.pm between versions 1.141 and 1.151

version 1.141, 2006/03/16 22:42:58 version 1.151, 2006/07/31 19:45:57
Line 119  sub handler { Line 119  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 135  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 159  ENDSUBM Line 160  ENDSUBM
        $r->print(&Apache::loncommon::start_page(undef,$js,         $r->print(&Apache::loncommon::start_page(undef,$js,
  {'only_body'   =>1,   {'only_body'   =>1,
  'add_entries' =>   'add_entries' =>
      'onLoad="load();"',}).       {'onload' => "load();"},}
    ).
  &Apache::loncommon::end_page());   &Apache::loncommon::end_page());
        return OK;         return OK;
    }     }
Line 178  ENDSUBM Line 180  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"'.   '<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
  ' border="0" /></td>';   ' border="0" /></td>';
Line 228  END Line 230  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 239  END Line 241  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 326  function rep_dirpath(suffix,val) { Line 328  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 368  ENDHEADER Line 370  ENDHEADER
  $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 477  END Line 479  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 485  END Line 487  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 703  sub dynmetaread { Line 705  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;
     }       } 
Line 911  sub display_line { Line 913  sub display_line {
     $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 1045  sub display_line { Line 1047  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 1147  sub display_line { Line 1150  sub display_line {
   
 }  }
   
   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 1161  sub showpreview { Line 1178  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 1187  sub dynmetaprint { Line 1211  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 1211  sub begin_form { Line 1235  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.141  
changed lines
  Added in v.1.151

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