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

Diff for /loncom/interface/lonparmset.pm between versions 1.601 and 1.603

version 1.601, 2021/08/04 19:59:10 version 1.603, 2022/01/03 20:08:24
Line 2089  sub extractResourceInformation { Line 2089  sub extractResourceInformation {
     my $uris=shift;      my $uris=shift;
     my $keyorder=shift;      my $keyorder=shift;
     my $defkeytype=shift;      my $defkeytype=shift;
       my $pssymb=shift;
   
     my $keyordercnt=100;      my $keyordercnt=100;
   
     my $navmap = Apache::lonnavmaps::navmap->new();      my $navmap = Apache::lonnavmaps::navmap->new();
     my @allres=$navmap->retrieveResources(undef,undef,1,undef,1);      return unless(ref($navmap));
       my @allres;
       if ($pssymb ne '') {
           my $res = $navmap->getBySymb($pssymb);
           if (ref($res)) {
               @allres = ($res);
           }
       }
       if (!@allres) { 
           @allres=$navmap->retrieveResources(undef,undef,1,undef,1);
       }
     foreach my $resource (@allres) {      foreach my $resource (@allres) {
         my $id=$resource->id();          my $id=$resource->id();
         my ($mapid,$resid)=split(/\./,$id);          my ($mapid,$resid)=split(/\./,$id);
Line 2217  sub isdateparm { Line 2228  sub isdateparm {
   
 sub is_specialstring {  sub is_specialstring {
     my $type=shift;      my $type=shift;
     return (($type=~/^string_/) && (($type ne 'string_yesno')));      return (($type=~/^string_/) && ($type ne 'string_yesno'));
 }  }
   
 # Prints the HTML and Javascript to select parameters, with various shortcuts.  # Prints the HTML and Javascript to select parameters, with various shortcuts.
Line 3366  sub assessparms { Line 3377  sub assessparms {
 # --------------------------------------------------------- Get all assessments  # --------------------------------------------------------- Get all assessments
     &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,      &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
                 \%mapp, \%symbp,\%maptitles,\%uris,                  \%mapp, \%symbp,\%maptitles,\%uris,
                 \%keyorder);                  \%keyorder,undef,$pssymb);
   
     %allmaps_inverted = reverse(%allmaps);      %allmaps_inverted = reverse(%allmaps);
   
Line 5279  my %stringmatches = ( Line 5290  my %stringmatches = (
               => [['_allowfrom_','[^\!]+'],                => [['_allowfrom_','[^\!]+'],
                   ['_denyfrom_','\!']],                    ['_denyfrom_','\!']],
          'string_deeplink'           'string_deeplink'
               => [['on','^(full|absent|grades|details|datestatus)\,(res|map|rec)\,(any|only|key\:\w+|lti\:\d+)\,(\d+|)$']],                => [['on','^(only|off|both)\,(hide|unhide)\,(full|absent|grades|details|datestatus)\,(res|map|rec)\,(none|key\:\w+|ltic\:\d+|ltid\:\d+)\,(\d+|)$']],
     );      );
   
 my %stringtypes = (  my %stringtypes = (
Line 5886  ENDOVER Line 5897  ENDOVER
   
     &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,      &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
                 \%mapp, \%symbp,\%maptitles,\%uris,                  \%mapp, \%symbp,\%maptitles,\%uris,
                 \%keyorder,\%defkeytype);                  \%keyorder,\%defkeytype,$pssymb);
   
     if (grep {$_ eq 'all'} (@psprt)) {      if (grep {$_ eq 'all'} (@psprt)) {
         @psprt = keys(%allparts);          @psprt = keys(%allparts);
Removed from v.1.601  
changed lines
  Added in v.1.603

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