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

Diff for /loncom/interface/lonpickcourse.pm between versions 1.19 and 1.20

version 1.19, 2004/11/23 18:03:04 version 1.20, 2004/11/27 17:23:09
Line 53  ENDDOCUMENT Line 53  ENDDOCUMENT
         ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter',          ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter',
        'sincefilter','form','cnumelement',         'sincefilter','form','cnumelement',
        'cdomelement','cnameelement','roleelement',         'cdomelement','cnameelement','roleelement',
                                'pickedcourse']);                                 'pickedcourse','instcodefilter','ownerfilter']);
 # domain filter and selection  # domain filter and selection
     my $domainfilter=$ENV{'form.domainfilter'};      my $domainfilter=$ENV{'form.domainfilter'};
     $domainfilter=~s/\W//g;      $domainfilter=~s/\W//g;
Line 64  ENDDOCUMENT Line 64  ENDDOCUMENT
     my $descriptfilter=$ENV{'form.descriptfilter'};      my $descriptfilter=$ENV{'form.descriptfilter'};
     unless ($descriptfilter) { $descriptfilter=''; }      unless ($descriptfilter) { $descriptfilter=''; }
     my $listdescript=&HTML::Entities::encode($descriptfilter,'<>&"');      my $listdescript=&HTML::Entities::encode($descriptfilter,'<>&"');
   # institutional code filter
       my $instcodefilter=$ENV{'form.instcodefilter'};
       unless ($instcodefilter) { $instcodefilter=''; }
       my $listinstcode=&HTML::Entities::encode($instcodefilter,'<>&"');
   # course owner filter
       my $ownerfilter=$ENV{'form.ownerfilter'};
       unless ($ownerfilter) { $ownerfilter=''; }
       my $listowner=&HTML::Entities::encode($ownerfilter,'<>&"');
 # last course activity filter and selection  # last course activity filter and selection
     my $sincefilter=$ENV{'form.sincefilter'};      my $sincefilter=$ENV{'form.sincefilter'};
     $sincefilter=~s/[^\d-]//g;      $sincefilter=~s/[^\d-]//g;
Line 98  ENDDOCUMENT Line 106  ENDDOCUMENT
     my %lt=&Apache::lonlocal::texthash(      my %lt=&Apache::lonlocal::texthash(
        'cac' => 'Course Activity',         'cac' => 'Course Activity',
        'cde' => 'Course Description',         'cde' => 'Course Description',
        'cdo' => 'Course Domain');         'cdo' => 'Course Domain',
                                          'cin' => 'Course Institutional Code',
                                          'cow' => "Course Owner's usename");
     my ($name_code,$name_input);      my ($name_code,$name_input);
     if (defined($ENV{'form.cnameelement'}) && $ENV{'form.cnameelement'} ne '') {      if (defined($ENV{'form.cnameelement'}) && $ENV{'form.cnameelement'} ne '') {
  $name_code = "opener.document.$ENV{'form.form'}.$ENV{'form.cnameelement'}.value=cdesc;";   $name_code = "opener.document.$ENV{'form.form'}.$ENV{'form.cnameelement'}.value=cdesc;";
Line 173  $lt{'cac'}: $sincefilterform Line 183  $lt{'cac'}: $sincefilterform
 <br />  <br />
 $lt{'cdo'}: $domainselectform  $lt{'cdo'}: $domainselectform
 <br />  <br />
   $lt{'cin'}:
   <input type="text" name="instcodefilter" size="10" value="$listinstcode" />
   <br />
   $lt{'cow'}:
   <input type="text" name="ownerfilter" size="10" value="$listowner" />
   <br />
 $lt{'cde'}:  $lt{'cde'}:
 <input type="text" name="descriptfilter" size="40" value="$listdescript" />  <input type="text" name="descriptfilter" size="40" value="$listdescript" />
 <p><input type="submit" name="gosearch" value="Search" /></p>  <p><input type="submit" name="gosearch" value="Search" /></p>
Line 184  ENDSCRIPT Line 200  ENDSCRIPT
         $r->print(&mt('Searching').' ...<br />&nbsp;<br />');          $r->print(&mt('Searching').' ...<br />&nbsp;<br />');
         $r->rflush();          $r->rflush();
  unless ($descriptfilter) { $descriptfilter='.'; }   unless ($descriptfilter) { $descriptfilter='.'; }
           unless ($instcodefilter) { $instcodefilter='.'; }
           unless ($ownerfilter) { $ownerfilter='.'; }
         my $timefilter=($sincefilter==-1?1:time-$sincefilter);          my $timefilter=($sincefilter==-1?1:time-$sincefilter);
  my %courses=   my %courses=
     &Apache::lonnet::courseiddump      &Apache::lonnet::courseiddump
     ($domainfilter,$descriptfilter,$timefilter);      ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter);
  $r->print('<form name="courselist">');   $r->print('<form name="courselist">');
  my %by_descrip;   my %by_descrip;
  foreach my $course (keys %courses) {   foreach my $course (keys %courses) {
Removed from v.1.19  
changed lines
  Added in v.1.20

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