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

Diff for /loncom/interface/londocs.pm between versions 1.91 and 1.95

version 1.91, 2003/10/28 21:50:02 version 1.95, 2003/11/07 23:22:21
Line 510  sub checkonthis { Line 510  sub checkonthis {
                  &Apache::lonxml::xmlparse($r,'web',                   &Apache::lonxml::xmlparse($r,'web',
                    &Apache::lonnet::getfile(                     &Apache::lonnet::getfile(
                     &Apache::lonnet::filelocation('',$url)));                      &Apache::lonnet::filelocation('',$url)));
    undef($Apache::lonhomework::parsing_a_problem);
  $ENV{'request.filename'}=$oldpath;   $ENV{'request.filename'}=$oldpath;
                  if (($Apache::lonxml::errorcount) ||                   if (($Apache::lonxml::errorcount) ||
                      ($Apache::lonxml::warningcount)) {                       ($Apache::lonxml::warningcount)) {
Line 585  sub checkversions { Line 586  sub checkversions {
     my %changes=();      my %changes=();
     my $starttime=0;      my $starttime=0;
     my $haschanged=0;      my $haschanged=0;
       my %setversions=&Apache::lonnet::dump('resourceversions',
     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
   
       $hashtied=0;
       &tiehash();
       my %newsetversions=();
     if ($ENV{'form.setmostrecent'}) {      if ($ENV{'form.setmostrecent'}) {
  $haschanged=1;   $haschanged=1;
    foreach (keys %hash) {
       if ($_=~/^ids\_(\/res\/.+)$/) {
    $newsetversions{$1}='mostrecent';
       }
    }
     } elsif ($ENV{'form.setcurrent'}) {      } elsif ($ENV{'form.setcurrent'}) {
  $haschanged=1;   $haschanged=1;
    foreach (keys %hash) {
       if ($_=~/^ids\_(\/res\/.+)$/) {
    my $getvers=&Apache::lonnet::getversion($1);
    if ($getvers>0) {
       $newsetversions{$1}=$getvers;
    }
       }
    }
     } elsif ($ENV{'form.setversions'}) {      } elsif ($ENV{'form.setversions'}) {
  $haschanged=1;   $haschanged=1;
    foreach (keys %ENV) {
       if ($_=~/^form\.set_version_(.+)$/) {
    my $src=$1;
    &Apache::lonnet::logthis('Found: '.$1.' '.$ENV{$_});
    if (($ENV{$_}) && ($ENV{$_} ne $setversions{$src})) {
       $newsetversions{$src}=$ENV{$_};
    }
       }
    }
     }      }
     if ($haschanged) {      if ($haschanged) {
  $r->print('<h1>'.&mt('Your Version Settings have been Stored').'</h1>');          if (&Apache::lonnet::put('resourceversions',\%newsetversions,
     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
     $ENV{'course.'.$ENV{'request.course.id'}.'.num'}) eq 'ok') {
       $r->print('<h1>'.&mt('Your Version Settings have been Stored').'</h1>');
    } else {
       $r->print('<h1><font color="red">'.&mt('An Error Occured while Attempting to Store your Version Settings').'</font></h1>');
    }
  &changewarning($r,'');   &changewarning($r,'');
  return;  
     }      }
     $hashtied=0;  
     &tiehash();  
     if ($ENV{'form.timerange'} eq 'all') {      if ($ENV{'form.timerange'} eq 'all') {
 # show all documents  # show all documents
  $header=&mt('All Documents in Course');   $header=&mt('All Documents in Course');
Line 642  sub checkversions { Line 675  sub checkversions {
     $header=&mt('No content modifications yet.');      $header=&mt('No content modifications yet.');
  }   }
     }      }
       %setversions=&Apache::lonnet::dump('resourceversions',
     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
     my %lt=&Apache::lonlocal::texthash      my %lt=&Apache::lonlocal::texthash
       ('st' => 'Version changes since start of Course',        ('st' => 'Version changes since start of Course',
        'lm' => 'Version changes since last Month',         'lm' => 'Version changes since last Month',
Line 671  sub checkversions { Line 707  sub checkversions {
 <option value="86400" $daysel>$lt{'sy'}</option>  <option value="86400" $daysel>$lt{'sy'}</option>
 </select>  </select>
 <input type="submit" name="display" value="$lt{'sd'}" />  <input type="submit" name="display" value="$lt{'sd'}" />
 </form>  
 <h3>$header</h3>  <h3>$header</h3>
 <input type="submit" name="setversions" value="$lt{'sv'}" />  <input type="submit" name="setversions" value="$lt{'sv'}" />
 <table border="2">  <table border="2">
Line 683  ENDHEADERS Line 718  ENDHEADERS
  if ($changes{$_}>$starttime) {   if ($changes{$_}>$starttime) {
     my ($root,$extension)=($_=~/^(.*)\.(\w+)$/);      my ($root,$extension)=($_=~/^(.*)\.(\w+)$/);
     my $currentversion=&Apache::lonnet::getversion($_);      my $currentversion=&Apache::lonnet::getversion($_);
       if ($currentversion<0) {
    $currentversion=&mt('Could not be determined.');
       }
     my $linkurl=&Apache::lonnet::clutter($_);      my $linkurl=&Apache::lonnet::clutter($_);
     $r->print(      $r->print(
       '<tr><td><b>'.        '<tr><td><b>'.
Line 694  ENDHEADERS Line 732  ENDHEADERS
       $currentversion.'</font></td><td><font size="+2">');        $currentversion.'</font></td><td><font size="+2">');
 # Used in course  # Used in course
     my $usedversion=$hash{'version_'.$linkurl};      my $usedversion=$hash{'version_'.$linkurl};
     if ($usedversion) {      if (($usedversion) && ($usedversion ne 'mostrecent')) {
  $r->print($usedversion);   $r->print($usedversion);
     } else {      } else {
  $r->print($currentversion);   $r->print($currentversion);
     }      }
     $r->print('</font></td><td>');      $r->print('</font></td><td>');
 # Set version  # Set version
     $r->print(&Apache::loncommon::select_form($usedversion,      $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
       'set_version_'.$linkurl,        'set_version_'.$linkurl,
       ('' => '',        ('' => '',
        'current' => 'most recent',         'mostrecent' => 'most recent',
        map {$_,$_} (1..$currentversion))));         map {$_,$_} (1..$currentversion))));
     $r->print('</td><td><font size="1"><ul>');      $r->print('</td><td><font size="1"><ul>');
     my $lastold=1;      my $lastold=1;
Line 732  ENDHEADERS Line 770  ENDHEADERS
     $r->print('</ul></font></td></tr>');      $r->print('</ul></font></td></tr>');
  }   }
     }      }
     $r->print('</table>');      $r->print('</table></form>');
     $r->print('<h1>'.&mt('Done').'.</h1>');      $r->print('<h1>'.&mt('Done').'.</h1>');
   
     &untiehash();      &untiehash();
Line 758  sub handler { Line 796  sub handler {
     $r->send_http_header;      $r->send_http_header;
     return OK if $r->header_only;      return OK if $r->header_only;
   
     &Apache::lonlocal::clearreroutetrans();  
 # --------------------------------------------- Initialize help topics for this  # --------------------------------------------- Initialize help topics for this
   foreach ('Adding_Course_Doc','Main_Course_Documents',    foreach ('Adding_Course_Doc','Main_Course_Documents',
            'Adding_External_Resource','Navigate_Content',             'Adding_External_Resource','Navigate_Content',
Line 1245  ENDSUPFORM Line 1282  ENDSUPFORM
          &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>');           &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>');
   }    }
  }   }
  $r->print(&Apache::lonlocal::endreroutetrans().'</body></html>');   $r->print('</body></html>');
  return OK;   return OK;
 }   } 
   
Removed from v.1.91  
changed lines
  Added in v.1.95

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