loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

Up to [LON-CAPA] / loncom / lonnet / perl

Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.533 and 1.534

-version 1.533, 2004/08/27 18:37:03
+version 1.534, 2004/08/27 21:09:22
  Line 4439  sub metadata_generate_part0 {
  sub gettitle {
      my $urlsymb=shift;
      my $symb=&symbread($urlsymb);
-     unless ($symb) {
+     if ($symb) {
- 	unless ($urlsymb) { $urlsymb=$ENV{'request.filename'}; }
+ 	my ($result,$cached)=&is_cached(\%titlecache,$symb,'title',600);
-         return &metadata($urlsymb,'title');
+ 	if (defined($cached)) { return $result; }
-     }
+ 	my ($map,$resid,$url)=&decode_symb($symb);
-     my ($result,$cached)=&is_cached(\%titlecache,$symb,'title',600);
+ 	my $title='';
-     if (defined($cached)) { return $result; }
+ 	my %bighash;
-     my ($map,$resid,$url)=&decode_symb($symb);
+ 	if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
-     my $title='';
+ 		&GDBM_READER(),0640)) {
-     my %bighash;
+ 	    my $mapid=$bighash{'map_pc_'.&clutter($map)};
-     if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
+ 	    $title=$bighash{'title_'.$mapid.'.'.$resid};
-                             &GDBM_READER(),0640)) {
+ 	    untie %bighash;
-         my $mapid=$bighash{'map_pc_'.&clutter($map)};
+ 	}
-         $title=$bighash{'title_'.$mapid.'.'.$resid};
+ 	$title=~s/\&colon\;/\:/gs;
-         untie %bighash;
+ 	if ($title) {
-     }
+ 	    return &do_cache(\%titlecache,$symb,$title,'title');
-     $title=~s/\&colon\;/\:/gs;
+ 	}
-     if ($title) {
+ 	$urlsymb=$url;
-         return &do_cache(\%titlecache,$symb,$title,'title');
-     } else {
- 	return &metadata($urlsymb,'title');
      }
+     my $title=&metadata($urlsymb,'title');
+     if (!$title) { $title=(split('/',$urlsymb))[-1]; }
+     return $title;
  }
  # ------------------------------------------------- Update symbolic store links

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

Removed from v.1.533
changed lines
	Added in v.1.534