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

Diff for /loncom/imspackages/imsimportdocs.pm between versions 1.33 and 1.37

version 1.33, 2013/12/30 21:46:52 version 1.37, 2018/05/02 17:06:45
Line 36  use Apache::imsprocessor; Line 36  use Apache::imsprocessor;
 use LONCAPA::map();  use LONCAPA::map();
 use lib '/home/httpd/lib/perl/';  use lib '/home/httpd/lib/perl/';
 use LONCAPA;  use LONCAPA;
   use File::Path();
     
 use strict;  use strict;
   
Line 249  sub display_one { Line 250  sub display_one {
     }      }
   
     # Count areas depending on cms version      # Count areas depending on cms version
     foreach my $res (sort keys %resources) {      foreach my $res (sort(keys(%resources))) {
         if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webctce4') {          if ($cms eq 'bb5' || $cms eq 'bb6' || $cms eq 'webctce4') {
             foreach my $area (keys %{$cmsmap{$cms}}) {              foreach my $area (keys(%{$cmsmap{$cms}})) {
                 if ($resources{$res}{type} eq $cmsmap{$cms}{$area}) {                  if ($resources{$res}{type} eq $cmsmap{$cms}{$area}) {
                     $count{$area} ++;                      $count{$area} ++;
                 }                  }
             }              }
         } elsif ($cms eq 'angel5') {          } elsif ($cms eq 'angel5') {
             foreach my $area (keys %{$cmsmap{$cms}}) {              foreach my $area (keys(%{$cmsmap{$cms}})) {
                 if ($area eq 'doc') {                  if ($area eq 'doc') {
                     if (grep/^$resources{$res}{type}$/,@{$cmsmap{$cms}{doc}}) {                      if (grep/^$resources{$res}{type}$/,@{$cmsmap{$cms}{doc}}) {
                         $count{$area} ++;                          $count{$area} ++;
Line 396  sub display_two { Line 397  sub display_two {
     my $folder = $env{'form.folder'};      my $folder = $env{'form.folder'};
     my $cms = $env{'form.source'};      my $cms = $env{'form.source'};
     my $tempdir = $env{'form.tempdir'};      my $tempdir = $env{'form.tempdir'};
     my $longcrs = '';  
     if ($crs =~ m/^(\d)(\d)(\d)/) {  
         $longcrs = $1.'/'.$2.'/'.$3.'/'.$crs;  
     }  
     my %importareas = ();      my %importareas = ();
     my %includedres = ();      my %includedres = ();
     my %includeditems = ();      my %includeditems = ();
Line 457  sub display_two { Line 454  sub display_two {
   
     my $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,\%resources,\%items,\%hrefs,\%resinfo,'prepare',\%includedres,\%includeditems);      my $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,\%resources,\%items,\%hrefs,\%resinfo,'prepare',\%includedres,\%includeditems);
     if ($manifest_result eq 'ok') {      if ($manifest_result eq 'ok') {
         foreach my $res (sort keys %resources) {          foreach my $res (sort(keys(%resources))) {
             if ($importareas{$resources{$res}{type}}) {              if ($importareas{$resources{$res}{type}}) {
                 $includedres{$res} = 1;                  $includedres{$res} = 1;
             }              }
         }          }
         foreach my $itm (sort keys %items) {          foreach my $itm (sort(keys(%items))) {
             &Apache::imsprocessor::get_imports(\%includeditems,\%items,\%resources,\%importareas,$itm);              &Apache::imsprocessor::get_imports(\%includeditems,\%items,\%resources,\%importareas,$itm);
         }          }
     }      }
     foreach my $itm (sort keys %includeditems) {      foreach my $itm (sort(keys(%includeditems))) {
         &Apache::imsprocessor::get_parents(\%includeditems,\%items,$itm);          &Apache::imsprocessor::get_parents(\%includeditems,\%items,$itm);
     }      }
   
Line 548  sub display_two { Line 545  sub display_two {
         }          }
     }      }
     if ($tempdir =~ m/^\/home\/httpd\/perl\/tmp\/$crs\/\d{10}/) {      if ($tempdir =~ m/^\/home\/httpd\/perl\/tmp\/$crs\/\d{10}/) {
         system("rm -r -f $tempdir");          &File::Path::remove_tree($tempdir,{ safe => 1 });
     }      }
   
     # All done, display success message      # All done, display success message
Line 562  sub display_two { Line 559  sub display_two {
            '<input type="button" value="'             '<input type="button" value="'
           .&mt('re-initializing Course')            .&mt('re-initializing Course')
           .'" onclick="javascript:init(this.form)" />';            .'" onclick="javascript:init(this.form)" />';
       my $windowname = 'loncapaclient';
       if ($env{'request.lti.login'}) {
           $windowname .= 'lti';
       }
     $r->print(      $r->print(
         '<form method="post" action="/adm/roles" target="loncapaclient" name="importDone">'          '<form method="post" action="/adm/roles" target="'.$windowname.'" name="importDone">'
        .'<input type="hidden" name="orgurl" value="/adm/coursedocs" />'         .'<input type="hidden" name="orgurl" value="/adm/coursedocs" />'
        .'<input type="hidden" name="selectrole" value="1" />'         .'<input type="hidden" name="selectrole" value="1" />'
        .'<input type="hidden" name="'.$env{'request.role'}.'" value="1" />'         .'<input type="hidden" name="'.$env{'request.role'}.'" value="1" />'
Removed from v.1.33  
changed lines
  Added in v.1.37

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