[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.35

version 1.33, 2013/12/30 21:46:52 version 1.35, 2017/11/05 20:00:48
Line 249  sub display_one { Line 249  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 396  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 453  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);
     }      }
   
Removed from v.1.33  
changed lines
  Added in v.1.35

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