--- loncom/interface/lonindexer.pm 2004/05/07 15:43:45 1.101 +++ loncom/interface/lonindexer.pm 2004/05/11 07:35:12 1.105 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.101 2004/05/07 15:43:45 www Exp $ +# $Id: lonindexer.pm,v 1.105 2004/05/11 07:35:12 taceyjo1 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -127,7 +127,28 @@ sub handler { { if ($ENV{'form.launch'} eq '1') { &start_fresh_session(); - } + } + #Hijack lonindexer to verify a title and be close down. + if ($ENV{'form.launch'} eq '2') { + #$r->content_type('text/html'); + my $verify_title = &Apache::lonnet::gettitle($ENV{'form.acts'}); + title: $verify_title"); + $r->print(< + + + + +ENDSUBM + return OK; + } + # -------------------- refresh environment with user database values (in %hash) &setvalues(\%hash,'form.catalogmode',\%ENV,'form.catalogmode' ); @@ -236,11 +257,9 @@ END $catalogmodefunctions=<print(""); - my $metafile = grep /^\Q$filecom[0]\E\.meta\&/, @list; + + my $metafile = $Apache::lonnet::perlvar{'lonDocRoot'}.$pathprefix. + $filecom[0].'.meta'; + if (-e $metafile) { + $metafile=1; + } else { + $metafile=0; + } my $title; if ($ENV{'form.catalogmode'} eq 'interactive') { $title=$listname; @@ -924,12 +950,10 @@ sub display_line { $r->print (" (metadata) ") if ($metafile == 1); - + "TARGET=_self>metadata) "); $r->print("\n"); if ($hash{'display_attrs_0'} == 1) { - my $title = &Apache::lonnet::gettitle($filelink,'title') - if ($metafile == 1); + my $title = &Apache::lonnet::gettitle($filelink,'title'); $r->print(' '.($title eq '' ? ' ' : $title). ' '."\n"); } @@ -944,21 +968,18 @@ sub display_line { if $hash{'display_attrs_3'} == 1; if ($hash{'display_attrs_4'} == 1) { - my $author = &Apache::lonnet::metadata($filelink,'author') - if ($metafile == 1); + my $author = &Apache::lonnet::metadata($filelink,'author'); $r->print(' '.($author eq '' ? ' ' : $author). " \n"); } if ($hash{'display_attrs_5'} == 1) { - my $keywords = &Apache::lonnet::metadata($filelink,'keywords') - if ($metafile == 1); + my $keywords = &Apache::lonnet::metadata($filelink,'keywords'); # $keywords = ' ' if (!$keywords); $r->print(' '.($keywords eq '' ? ' ' : $keywords). " \n"); } if ($hash{'display_attrs_6'} == 1) { - my $lang = &Apache::lonnet::metadata($filelink,'language') - if ($metafile == 1); + my $lang = &Apache::lonnet::metadata($filelink,'language'); $lang = &Apache::loncommon::languagedescription($lang); $r->print(' '.($lang eq '' ? ' ' : $lang). " \n"); @@ -992,7 +1013,7 @@ sub display_line { " \n"); } if ($hash{'display_attrs_8'} == 1) { - my (%stat) = &Apache::lonmeta::dynamicmeta($filelink) if ($metafile == 1); + my (%stat) = &Apache::lonmeta::dynamicmeta($filelink); my $stat = (exists($stat{'course'}) ? $stat{'course'} : ''). ((exists($stat{'course'}) || exists($stat{'count'})) ? '/' : ''). (exists($stat{'count'}) ? $stat{'count'} : '');