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

Diff for /loncom/interface/lonmeta.pm between versions 1.161 and 1.162

version 1.161, 2006/07/19 19:29:20 version 1.162, 2006/08/04 19:42:55
Line 716  sub handler { Line 716  sub handler {
     #      #
     my ($resdomain,$resuser)=      my ($resdomain,$resuser)=
         (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);          (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);
   
     if ($uri=~m:/adm/bombs/(.*)$:) {      if ($uri=~m:/adm/bombs/(.*)$:) {
         $r->print(&Apache::loncommon::start_page('Error Messages'));          $r->print(&Apache::loncommon::start_page('Error Messages'));
         # Looking for all bombs?          # Looking for all bombs?
         &report_bombs($r,$uri);          &report_bombs($r,$uri);
     } elsif ($uri=~/\/portfolio\//) {      } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/portfolio/|) {
     ($resdomain,$resuser)=      ($resdomain,$resuser)=
     (&Apache::lonnet::declutter($uri)=~m|^(\w+)/(\w+)/portfolio|);   (&Apache::lonnet::declutter($uri)=~m|^(\w+)/(\w+)/portfolio|);
         $r->print(&Apache::loncommon::start_page('Edit Portfolio File Catalog Information',          $r->print(&Apache::loncommon::start_page('Edit Portfolio File Catalog Information',
  undef,   undef,
  {'domain' => $resdomain,}));   {'domain' => $resdomain,}));
Line 732  sub handler { Line 731  sub handler {
         } else {          } else {
             &pre_select_course($r,$uri);              &pre_select_course($r,$uri);
         }          }
     } elsif ($uri=~/^\/\~/) {       } elsif ($uri=~m|^/~|) { 
         # Construction space          # Construction space
         $r->print(&Apache::loncommon::start_page('Edit Catalog nformation',          $r->print(&Apache::loncommon::start_page('Edit Catalog nformation',
  undef,   undef,
Line 798  ENDCLEAR Line 797  ENDCLEAR
 sub present_uneditable_metadata {  sub present_uneditable_metadata {
     my ($r,$uri) = @_;      my ($r,$uri) = @_;
     #      #
       my $uploaded = ($uri =~ m|/uploaded/|);
     my %content=();      my %content=();
     # Read file      # Read file
     foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {      foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {
Line 810  sub present_uneditable_metadata { Line 810  sub present_uneditable_metadata {
     my $disuri=&Apache::lonnet::clutter($uri);      my $disuri=&Apache::lonnet::clutter($uri);
     $disuri=~s/^\/adm\/wrapper//;      $disuri=~s/^\/adm\/wrapper//;
     # version      # version
     my $currentversion=&Apache::lonnet::getversion($disuri);  
     my $versiondisplay='';      my $versiondisplay='';
     if ($thisversion) {      if (!$uploaded) {
         $versiondisplay=&mt('Version').': '.$thisversion.   my $currentversion=&Apache::lonnet::getversion($disuri);
             ' ('.&mt('most recent version').': '.   if ($thisversion) {
             ($currentversion>0 ?       $versiondisplay=&mt('Version').': '.$thisversion.
              $currentversion   :   ' ('.&mt('most recent version').': '.
              &mt('information not available')).')';   ($currentversion>0 ? 
     } else {   $currentversion   :
         $versiondisplay='Version: '.$currentversion;   &mt('information not available')).')';
    } else {
       $versiondisplay='Version: '.$currentversion;
    }
     }      }
     # crumbify displayed URL               uri     target prefix form  size      # crumbify displayed URL               uri     target prefix form  size
     $disuri=&Apache::lonhtmlcommon::crumbs($disuri,undef, undef, undef,'+1');      $disuri=&Apache::lonhtmlcommon::crumbs($disuri,undef, undef, undef,'+1');
Line 876  $versiondisplay Line 878  $versiondisplay
 $table  $table
 </table>  </table>
 ENDHEAD  ENDHEAD
     if ($env{'user.adv'}) {      if (!$uploaded && $env{'user.adv'}) {
         &print_dynamic_metadata($r,$uri,\%content);          &print_dynamic_metadata($r,$uri,\%content);
     }      }
     return;      return;
Removed from v.1.161  
changed lines
  Added in v.1.162

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