[BACK]Return to lonuserstate.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / rat

Diff for /rat/lonuserstate.pm between versions 1.149.2.2 and 1.149.4.1

version 1.149.2.2, 2019/02/07 01:51:34 version 1.149.4.1, 2020/04/07 20:57:02
Line 42  use Safe::Hole; Line 42  use Safe::Hole;
 use Opcode;  use Opcode;
 use Apache::lonenc;  use Apache::lonenc;
 use Fcntl qw(:flock);  use Fcntl qw(:flock);
 use LONCAPA;  use LONCAPA qw(:DEFAULT :match);
 use File::Basename;  use File::Basename;
   
     
Line 62  my %randomorder; # maps to order content Line 62  my %randomorder; # maps to order content
 my %randomizationcode; # code used to grade folder for bubblesheet exam   my %randomizationcode; # code used to grade folder for bubblesheet exam 
 my %encurl; # URLs in this folder are supposed to be encrypted  my %encurl; # URLs in this folder are supposed to be encrypted
 my %hiddenurl; # this URL (or complete folder) is supposed to be hidden  my %hiddenurl; # this URL (or complete folder) is supposed to be hidden
 my %rescount; # count of unhidden items in each map  
 my %mapcount; # count of unhidden maps in each map  
   
 # ----------------------------------- Remove version from URL and store in hash  # ----------------------------------- Remove version from URL and store in hash
   
Line 242  sub loadmap { Line 240  sub loadmap {
   
     my @map_ids;      my @map_ids;
     my $codechecked;      my $codechecked;
     $rescount{$lpc} = 0;  
     $mapcount{$lpc} = 0;  
     while (my $token = $parser->get_token) {      while (my $token = $parser->get_token) {
  next if ($token->[0] ne 'S');   next if ($token->[0] ne 'S');
   
Line 253  sub loadmap { Line 249  sub loadmap {
     my $resource_id = &parse_resource($token,$lpc,$ispage,$uri,$courseid);      my $resource_id = &parse_resource($token,$lpc,$ispage,$uri,$courseid);
     if (defined $resource_id) {      if (defined $resource_id) {
  push(@map_ids, $resource_id);   push(@map_ids, $resource_id);
                 if ($hash{'src_'.$lpc.'.'.$resource_id}) {  
                     $rescount{$lpc} ++;  
                     if (($hash{'src_'.$lpc.'.'.$resource_id}=~/\.sequence$/) ||  
                         ($hash{'src_'.$lpc.'.'.$resource_id}=~/\.page$/)) {  
                         $mapcount{$lpc} ++;  
                     }  
                 }  
                 unless ($codechecked) {                  unless ($codechecked) {
                     my $startsymb =                      my $startsymb =
                        &Apache::lonnet::encode_symb($hash{'map_id_'.$lpc},$resource_id,                         &Apache::lonnet::encode_symb($hash{'map_id_'.$lpc},$resource_id,
Line 484  sub parse_resource { Line 473  sub parse_resource {
     } elsif ($turi!~/\.(sequence|page)$/) {      } elsif ($turi!~/\.(sequence|page)$/) {
  $turi='/adm/coursedocs/showdoc'.$turi;   $turi='/adm/coursedocs/showdoc'.$turi;
     }      }
           } elsif ($turi=~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) {
               $turi='/adm/wrapper'.$turi;
  } elsif ($turi=~/\S/) { # normal non-empty internal resource   } elsif ($turi=~/\S/) { # normal non-empty internal resource
     my $mapdir=$uri;      my $mapdir=$uri;
     $mapdir=~s/[^\/]+$//;      $mapdir=~s/[^\/]+$//;
Line 1123  sub hiddenurls { Line 1114  sub hiddenurls {
             if ($currentrids[$k]) {              if ($currentrids[$k]) {
  $hash{'randomout_'.$currentrids[$k]}=1;   $hash{'randomout_'.$currentrids[$k]}=1;
                 my ($mapid,$resid)=split(/\./,$currentrids[$k]);                  my ($mapid,$resid)=split(/\./,$currentrids[$k]);
                 if ($rescount{$mapid}) {  
                     $rescount{$mapid} --;  
                 }  
                 if ($hash{'is_map_'.$currentrids[$k]}) {  
                     if ($mapcount{$mapid}) {  
                         $mapcount{$mapid} --;  
                     }  
                 }  
                 $randomoutentry.='&'.                  $randomoutentry.='&'.
     &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},      &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},
  $resid,   $resid,
Line 1143  sub hiddenurls { Line 1126  sub hiddenurls {
     foreach my $rid (keys(%hiddenurl)) {      foreach my $rid (keys(%hiddenurl)) {
  $hash{'randomout_'.$rid}=1;   $hash{'randomout_'.$rid}=1;
  my ($mapid,$resid)=split(/\./,$rid);   my ($mapid,$resid)=split(/\./,$rid);
         if ($rescount{$mapid}) {  
             $rescount{$mapid} --;  
         }  
         if ($hash{'is_map_'.$rid}) {  
             if ($mapcount{$mapid}) {  
                 $mapcount{$mapid} --;  
             }  
         }  
  $randomoutentry.='&'.   $randomoutentry.='&'.
     &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,      &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,
  $hash{'src_'.$rid}).'&';   $hash{'src_'.$rid}).'&';
Line 1161  sub hiddenurls { Line 1136  sub hiddenurls {
     }      }
 }  }
   
 # -------------------------------------- populate big hash with map breadcrumbs  
   
 # Create map_breadcrumbs_$pc from map_hierarchy_$pc by omitting intermediate  
 # maps not shown in Course Contents table.  
   
 sub mapcrumbs {  
     foreach my $key (keys(%rescount)) {  
         if ($hash{'map_hierarchy_'.$key}) {  
             my $skipnext = 0;  
             foreach my $id (split(/,/,$hash{'map_hierarchy_'.$key}),$key) {  
                 unless ($skipnext) {  
                     $hash{'map_breadcrumbs_'.$key} .= "$id,";  
                 }  
                 unless (($id == 0) || ($id == 1)) {  
                     if ((!$rescount{$id}) || ($rescount{$id} == 1 && $mapcount{$id} == 1)) {  
                         $skipnext = 1;  
                     } else {  
                         $skipnext = 0;  
                     }  
                 }  
             }  
             $hash{'map_breadcrumbs_'.$key} =~ s/,$//;  
         }  
     }  
 }  
   
 # ---------------------------------------------------- Read map and all submaps  # ---------------------------------------------------- Read map and all submaps
   
 sub readmap {  sub readmap {
Line 1207  sub readmap { Line 1156  sub readmap {
     }      }
     @cond=('true:normal');      @cond=('true:normal');
   
     unless (open(LOCKFILE,">","$fn.db.lock")) {      unless (open(LOCKFILE,">$fn.db.lock")) {
  #    # 
  # Most likely a permissions problem on the lockfile or its directory.   # Most likely a permissions problem on the lockfile or its directory.
  #   #
Line 1230  sub readmap { Line 1179  sub readmap {
     undef %randomizationcode;      undef %randomizationcode;
     undef %hiddenurl;      undef %hiddenurl;
     undef %encurl;      undef %encurl;
     undef %rescount;  
     undef %mapcount;  
     $retfrid='';      $retfrid='';
     $errtext='';      $errtext='';
     my ($untiedhash,$untiedparmhash,$tiedhash,$tiedparmhash); # More state flags.      my ($untiedhash,$untiedparmhash,$tiedhash,$tiedparmhash); # More state flags.
Line 1378  sub readmap { Line 1325  sub readmap {
         undef %randomizationcode;          undef %randomizationcode;
         undef %hiddenurl;          undef %hiddenurl;
         undef %encurl;          undef %encurl;
         undef %rescount;  
         undef %mapcount;  
         $errtext='';          $errtext='';
         $retfrid='';          $retfrid='';
  #   #
Line 1498  sub build_tmp_hashes { Line 1444  sub build_tmp_hashes {
         &traceroute('0',$hash{'map_start_'.$uri},'&');          &traceroute('0',$hash{'map_start_'.$uri},'&');
         &accinit($uri,$short,$fn);          &accinit($uri,$short,$fn);
         &hiddenurls();          &hiddenurls();
         &mapcrumbs();  
     }      }
     $errtext .= &get_mapalias_errors();      $errtext .= &get_mapalias_errors();
 # ------------------------------------------------------- Put versions into src  # ------------------------------------------------------- Put versions into src
Line 1530  sub build_tmp_hashes { Line 1475  sub build_tmp_hashes {
 # ---------------------------------------------------- Store away initial state  # ---------------------------------------------------- Store away initial state
     {      {
         my $cfh;          my $cfh;
         if (open($cfh,">","$fn.state")) {          if (open($cfh,">$fn.state")) {
             print $cfh join("\n",@cond);              print $cfh join("\n",@cond);
             $gotstate = 1;              $gotstate = 1;
         } else {          } else {
Line 1567  sub evalstate { Line 1512  sub evalstate {
     if (-e $fn) {      if (-e $fn) {
  my @conditions=();   my @conditions=();
  {   {
     open(my $fh,"<",$fn);      open(my $fh,"<$fn");
     @conditions=<$fh>;      @conditions=<$fh>;
             close($fh);              close($fh);
  }     }  
Removed from v.1.149.2.2  
changed lines
  Added in v.1.149.4.1

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