version 1.206, 2004/04/14 18:29:32
|
version 1.219, 2004/04/30 21:28:07
|
Line 74 use Apache::lonmeta;
|
Line 74 use Apache::lonmeta;
|
use Apache::lonhtmlcommon; |
use Apache::lonhtmlcommon; |
use Apache::lonlocal; |
use Apache::lonlocal; |
use LONCAPA::lonmetadata(); |
use LONCAPA::lonmetadata(); |
|
use HTML::Entities(); |
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
Line 149 sub handler {
|
Line 150 sub handler {
|
## Initialize global variables |
## Initialize global variables |
## |
## |
my $domain = $r->dir_config('lonDefDomain'); |
my $domain = $r->dir_config('lonDefDomain'); |
$diropendb= "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_searchcat.db"; |
$diropendb= "/home/httpd/perl/tmp/". |
|
"$ENV{'user.domain'}_$ENV{'user.name'}_searchcat.db"; |
# |
# |
# set the name of the persistent database |
# set the name of the persistent database |
# $ENV{'form.persistent_db_id'} can only have digits in it. |
# $ENV{'form.persistent_db_id'} can only have digits in it. |
Line 164 sub handler {
|
Line 166 sub handler {
|
'_'.&Apache::lonnet::escape($ENV{'user.name'}). |
'_'.&Apache::lonnet::escape($ENV{'user.name'}). |
'_'.$ENV{'form.persistent_db_id'}.'_persistent_search.db'; |
'_'.$ENV{'form.persistent_db_id'}.'_persistent_search.db'; |
## |
## |
|
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
|
if (exists($ENV{'request.course.id'}) && $ENV{'request.course.id'} ne '') { |
|
&Apache::lonhtmlcommon::add_breadcrumb |
|
({href=>'/adm/searchcat?'. |
|
'catalogmode='.$ENV{'form.catalogmode'}. |
|
'&launch='.$ENV{'form.launch'}. |
|
'&mode='.$ENV{'form.mode'}, |
|
text=>"Course and Catalog Search", |
|
bug=>'Searching',}); |
|
} else { |
|
&Apache::lonhtmlcommon::add_breadcrumb |
|
({href=>'/adm/searchcat?'. |
|
'catalogmode='.$ENV{'form.catalogmode'}. |
|
'&launch='.$ENV{'form.launch'}. |
|
'&mode='.$ENV{'form.mode'}, |
|
text=>"Catalog Search", |
|
bug=>'Searching',}); |
|
} |
|
# |
if (! &get_persistent_form_data($persistent_db_file)) { |
if (! &get_persistent_form_data($persistent_db_file)) { |
if ($ENV{'form.phase'} =~ /(run_search|results)/) { |
if ($ENV{'form.phase'} =~ /(run_search|results)/) { |
&Apache::lonnet::logthis("lonsearchcat:Unable to recover data ". |
&Apache::lonnet::logthis("lonsearchcat:Unable to recover data ". |
Line 264 END
|
Line 285 END
|
} |
} |
$ENV{'form.phase'} = 'disp_basic' if (! exists($ENV{'form.phase'})); |
$ENV{'form.phase'} = 'disp_basic' if (! exists($ENV{'form.phase'})); |
$ENV{'form.show'} = 20 if (! exists($ENV{'form.show'})); |
$ENV{'form.show'} = 20 if (! exists($ENV{'form.show'})); |
|
# |
|
$ENV{'form.searchmode'} = 'basic' if (! exists($ENV{'form.searchmode'})); |
|
if ($ENV{'form.phase'} eq 'adv_search' || |
|
$ENV{'form.phase'} eq 'disp_adv') { |
|
$ENV{'form.searchmode'} = 'advanced'; |
|
} elsif ($ENV{'form.phase'} eq 'course_search') { |
|
$ENV{'form.searchmode'} = 'course_search'; |
|
} |
|
# |
|
if ($ENV{'form.searchmode'} eq 'advanced') { |
|
&Apache::lonhtmlcommon::add_breadcrumb |
|
({href=>'/adm/searchcat?phase=disp_adv&'. |
|
'catalogmode='.$ENV{'form.catalogmode'}. |
|
'&launch='.$ENV{'form.launch'}. |
|
'&mode='.$ENV{'form.mode'}, |
|
text=>"Advanced Search", |
|
bug=>'Searching',}); |
|
} elsif ($ENV{'form.searchmode'} eq 'course search') { |
|
&Apache::lonhtmlcommon::add_breadcrumb |
|
({href=>'/adm/searchcat?phase=disp_adv&'. |
|
'catalogmode='.$ENV{'form.catalogmode'}. |
|
'&launch='.$ENV{'form.launch'}. |
|
'&mode='.$ENV{'form.mode'}, |
|
text=>"Course Search", |
|
bug=>'Searching',}); |
|
} |
## |
## |
## Switch on the phase |
## Switch on the phase |
## |
## |
Line 288 END
|
Line 335 END
|
&course_search($r); |
&course_search($r); |
} elsif(($ENV{'form.phase'} eq 'basic_search') || |
} elsif(($ENV{'form.phase'} eq 'basic_search') || |
($ENV{'form.phase'} eq 'adv_search')) { |
($ENV{'form.phase'} eq 'adv_search')) { |
$ENV{'form.searchmode'} = 'basic'; |
|
if ($ENV{'form.phase'} eq 'adv_search') { |
|
$ENV{'form.searchmode'} = 'advanced'; |
|
} |
|
# Set up table |
# Set up table |
if (! defined(&create_results_table())) { |
if (! defined(&create_results_table())) { |
my $errorstring=&Apache::lonmysql::get_error(); |
my $errorstring=&Apache::lonmysql::get_error(); |
|
&Apache::lonnet::logthis('lonsearchcat.pm: Unable to create '. |
|
'needed table. lonmysql error:'. |
|
$errorstring); |
$r->print(<<END); |
$r->print(<<END); |
<html><head><title>Search Error</title></head> |
<html><head><title>Search Error</title></head> |
$bodytag |
$bodytag |
Unable to create table in which to store search results. |
Unable to create table in which to store search results. |
The search has been aborted. |
The search has been aborted. |
<br />$errorstring |
|
</body> |
</body> |
</html> |
</html> |
END |
END |
Line 360 my $totalfound;
|
Line 405 my $totalfound;
|
|
|
sub course_search { |
sub course_search { |
my $r=shift; |
my $r=shift; |
my $bodytag=&Apache::loncommon::bodytag('Course Search'). |
my $bodytag=&Apache::loncommon::bodytag('Course Search'); |
&Apache::loncommon::help_open_bug('Searching'); |
|
my $pretty_search_string = '<b>'.$ENV{'form.courseexp'}.'</b>'; |
my $pretty_search_string = '<b>'.$ENV{'form.courseexp'}.'</b>'; |
my $search_string = $ENV{'form.courseexp'}; |
my $search_string = $ENV{'form.courseexp'}; |
my @New_Words; |
my @New_Words; |
Line 454 sub untiehash {
|
Line 498 sub untiehash {
|
|
|
} # End of course search scoping |
} # End of course search scoping |
|
|
|
sub search_html_header { |
|
my $Str = <<ENDHEADER; |
|
<html> |
|
<head> |
|
<title>The LearningOnline Network with CAPA</title> |
|
</head> |
|
ENDHEADER |
|
return $Str; |
|
} |
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
|
|
Line 470 Prints the form for the basic search. S
|
Line 524 Prints the form for the basic search. S
|
sub print_basic_search_form { |
sub print_basic_search_form { |
my ($r,$closebutton,$hidden_fields) = @_; |
my ($r,$closebutton,$hidden_fields) = @_; |
my $bodytag=&Apache::loncommon::bodytag('Search'). |
my $bodytag=&Apache::loncommon::bodytag('Search'). |
&Apache::loncommon::help_open_topic('Finding_Resources'). |
&Apache::lonhtmlcommon::breadcrumbs(undef,'Searching','Searching', |
&Apache::loncommon::help_open_bug('Searching'); |
undef,undef,! $ENV{'form.launch'}); |
my $scrout=<<"ENDDOCUMENT"; |
my $scrout = &search_html_header().$bodytag; |
<html> |
if (&Apache::lonnet::allowed('bre',$ENV{'request.role.domain'})) { |
<head> |
# Define interface components |
<title>The LearningOnline Network with CAPA</title> |
my $userelatedwords= |
<script type="text/javascript"> |
&mt('[_1] use related words', |
function openhelp(val) { |
&Apache::lonhtmlcommon::checkbox |
openhelpwin=open('/adm/help/searchcat.html','helpscreen', |
('related',$ENV{'form.related'})); |
'scrollbars=1,width=600,height=300'); |
my $onlysearchdomain= |
openhelpwin.focus(); |
&mt('[_1] only search domain [_2]', |
} |
&Apache::lonhtmlcommon::checkbox |
</script> |
('domains',$ENV{'form.domains'}), |
</head> |
$r->dir_config('lonDefDomain')); |
$bodytag |
my $adv_search_link = |
ENDDOCUMENT |
'<a href="/adm/searchcat?'. |
if (&Apache::lonnet::allowed('bre',$ENV{'request.role.domain'})) { |
'phase=disp_adv&'. |
my $CatalogSearch=&mt('Catalog Search'); |
'catalogmode='.$ENV{'form.catalogmode'}. |
my $Statement=&searchhelp(); |
'&launch='.$ENV{'form.launch'}. |
$scrout.=(<<ENDDOCUMENT); |
'&mode='.$ENV{'form.mode'}. |
<h1>$CatalogSearch</h1> |
'">'.&mt('Advanced Search').'</a>'; |
<form name="loncapa_search" method="post" action="/adm/searchcat"> |
# |
<input type="hidden" name="phase" value="basic_search" /> |
$scrout.='<form name="loncapa_search" method="post" '. |
$hidden_fields |
'action="/adm/searchcat">'. |
<p> |
'<input type="hidden" name="phase" value="basic_search" />'. |
$Statement. |
$hidden_fields; |
</p> |
# |
<p> |
$scrout .= '<center>'.$/; |
<table> |
if ($ENV{'request.course.id'}) { |
<tr><td> |
$scrout .= '<h1>'.&mt('LON-CAPA Catalog Search').'</h1>'; |
ENDDOCUMENT |
} else { |
$scrout.=' '.&Apache::lonhtmlcommon::textbox('basicexp', |
# No need to tell them they are searching |
$ENV{'form.basicexp'},40). |
$scrout.= ('<br />'x2); |
' '; |
} |
my $relatedcheckbox = &Apache::lonhtmlcommon::checkbox('related', |
$scrout.='<table>'. |
$ENV{'form.related'}); |
'<tr><td align="center" valign="top">'. |
my $domain = $r->dir_config('lonDefDomain'); |
&Apache::lonhtmlcommon::textbox('basicexp', |
my $domaincheckbox = &Apache::lonhtmlcommon::checkbox('domains', |
$ENV{'form.basicexp'},50).'<br />'. |
$ENV{'form.domains'}); |
'<font size="-1">'.&searchhelp().'</font>'.'</td>'. |
my $srch=&mt('Search'); |
'<td><font size="-1">'. |
my $header=&mt('Advanced Search'); |
'<nobr>'.(' 'x3).$adv_search_link.'</nobr>'.'<br />'. |
my $userelatedwords=&mt('use related words'); |
'<nobr>'.(' 'x1).$userelatedwords.'</nobr>'.'<br />'. |
my $onlysearchdomain=&mt('only search domain'); |
'<nobr>'.(' 'x1).$onlysearchdomain.'</nobr>'.'<br />'. |
my $view=&viewoptions(); |
'</font></td>'. |
$scrout.=<<END; |
'</tr>'.$/; |
</td><td><a |
# |
href="/adm/searchcat?phase=disp_adv&catalogmode=$ENV{'form.catalogmode'}&launch=$ENV{'form.launch'}&mode=$ENV{'form.mode'}" |
# $scrout .= '<tr><td align="center">'. |
>$header</a></td></tr> |
# '<font size="-1">'. |
<tr><td>$relatedcheckbox $userelatedwords</td> |
# $userelatedwords.(' 'x3). |
<td>$domaincheckbox $onlysearchdomain <b>$domain</b></td></tr> |
# $onlysearchdomain.(' 'x2).$adv_search_link. |
</table> |
# '</font>'. |
</p> |
# '</td></tr>'.$/; |
$view |
$scrout .= '<tr><td align="center" colspan="2">'. |
<p> |
'<font size="-1">'. |
<input type="submit" name="basicsubmit" value='$srch' /> |
'<input type="submit" name="basicsubmit" '. |
$closebutton |
'value="'.&mt('Search').'" />'. |
END |
(' 'x2).$closebutton.(' 'x2).&viewoptions(). |
$scrout.=<<ENDDOCUMENT; |
'</font>'. |
</p> |
'</td></tr>'.$/; |
</form> |
$scrout .= '</table>'.$/.'</center>'.'</form>'; |
ENDDOCUMENT |
|
} |
} |
if ($ENV{'request.course.id'}) { |
if ($ENV{'request.course.id'}) { |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash('srch' => 'Search', |
'srch' => 'Search', |
|
'header' => 'Course Search', |
'header' => 'Course Search', |
'note' => 'Enter terms or phrases, then press "Search" below', |
'note' => 'Enter terms or phrases, then press "Search" below', |
'use' => 'use related words', |
'use' => 'use related words', |
'full' =>'fulltext search (time consuming)' |
'full' =>'fulltext search (time consuming)' |
); |
); |
$scrout.=(<<ENDCOURSESEARCH); |
$scrout.=(<<ENDCOURSESEARCH); |
|
<form name="loncapa_search" method="post" action="/adm/searchcat"> |
|
<center> |
<hr /> |
<hr /> |
<h1>$lt{'header'}</h1> |
<h1>$lt{'header'}</h1> |
<form name="course_search" method="post" action="/adm/searchcat"> |
|
<input type="hidden" name="phase" value="course_search" /> |
<input type="hidden" name="phase" value="course_search" /> |
$hidden_fields |
$hidden_fields |
<p> |
<p> |
Line 569 ENDCOURSESEARCH
|
Line 622 ENDCOURSESEARCH
|
</table><p> |
</table><p> |
<input type="submit" name="coursesubmit" value='$lt{'srch'}' /> |
<input type="submit" name="coursesubmit" value='$lt{'srch'}' /> |
</p> |
</p> |
|
</center> |
|
</form> |
ENDENDCOURSE |
ENDENDCOURSE |
} |
} |
$scrout.=(<<ENDDOCUMENT); |
$scrout.=(<<ENDDOCUMENT); |
Line 593 Prints the advanced search form.
|
Line 648 Prints the advanced search form.
|
###################################################################### |
###################################################################### |
sub print_advanced_search_form{ |
sub print_advanced_search_form{ |
my ($r,$closebutton,$hidden_fields) = @_; |
my ($r,$closebutton,$hidden_fields) = @_; |
|
my $bodytag=&Apache::loncommon::bodytag('Advanced Catalog Search'). |
|
&Apache::lonhtmlcommon::breadcrumbs(undef,'Searching', |
|
'Searching', |
|
undef,undef, |
|
! $ENV{'form.launch'}); |
|
|
my %lt=&Apache::lonlocal::texthash('srch' => 'Search', |
my %lt=&Apache::lonlocal::texthash('srch' => 'Search', |
'reset' => 'Reset', |
'reset' => 'Reset', |
'help' => 'Help'); |
'help' => 'Help'); |
my $advanced_buttons = <<"END"; |
my $advanced_buttons=<<"END"; |
<p> |
|
<input type="submit" name="advancedsubmit" value='$lt{"srch"}' /> |
<input type="submit" name="advancedsubmit" value='$lt{"srch"}' /> |
<input type="reset" name="reset" value='$lt{"reset"}' /> |
<input type="reset" name="reset" value='$lt{"reset"}' /> |
$closebutton |
$closebutton |
<input type="button" value="$lt{'help'}" onClick="openhelp()" /> |
|
</p> |
|
END |
END |
my $bodytag=&Apache::loncommon::bodytag('Advanced Catalog Search'); |
my $scrout=&search_html_header(); |
my $searchhelp=&searchhelp(); |
$scrout .= <<"ENDHEADER"; |
my $scrout=<<"ENDHEADER"; |
|
<html> |
|
<head> |
|
<title>The LearningOnline Network with CAPA</title> |
|
<script type="text/javascript"> |
|
function openhelp(val) { |
|
openhelpwin=open('/adm/help/searchcat.html','helpscreen', |
|
'scrollbars=1,width=600,height=300'); |
|
openhelpwin.focus(); |
|
} |
|
</script> |
|
</head> |
|
$bodytag |
$bodytag |
$searchhelp |
|
<form method="post" action="/adm/searchcat" name="advsearch"> |
<form method="post" action="/adm/searchcat" name="advsearch"> |
|
<p> |
$advanced_buttons |
$advanced_buttons |
$hidden_fields |
|
<input type="hidden" name="phase" value="adv_search" /> |
|
ENDHEADER |
ENDHEADER |
$scrout.=&viewoptions(); |
$scrout.=(' 'x2).&viewoptions().'</p>'.$hidden_fields. |
|
'<input type="hidden" name="phase" value="adv_search" />'; |
my %fields=&Apache::lonmeta::fieldnames(); |
my %fields=&Apache::lonmeta::fieldnames(); |
|
# |
$scrout.='<table>'; |
$scrout .= '<h3>'.&mt('Standard Metadata').'</h3>'; |
$scrout.="<tr><th>".&mt('Field').'</th><th>'.&mt('Value').'</th><th>' |
$scrout .= "<table>\n"; |
.&mt('Related').'<br />'.&mt('Words')."</td></tr>\n"; |
$scrout .= '<tr><td> </td><td colspan="2"><font size="-1">'. |
foreach ('title','author','owner','authorspace','modifyinguser', |
(' 'x2).&searchhelp()."</font></td></tr>\n"; |
'keywords','notes','abstract','standards', |
my %related_word_search = |
'lowestgradelevel','highestgradelevel','mime') { |
('title' => 1, |
$scrout.='<tr bgcolor="#FFFFBB"><td>'.&titlefield($fields{$_}).'</td><td>'. |
'author' => 0, |
&Apache::lonmeta::prettyinput($_,$ENV{'form.'.$_},$_,'advsearch', |
'owner' => 0, |
1,'</td><td>',$ENV{'form.'.$_.'_related'}). |
'authorspace' => 0, |
'</td></tr>'; |
'modifyinguser'=> 0, |
|
'keywords' => 1, |
|
'notes' => 1, |
|
'abstract' => 1, |
|
'standards'=> 1, |
|
'mime' => 1, |
|
); |
|
# |
|
foreach my $field ('title','author','owner','authorspace','modifyinguser', |
|
'keywords','notes','abstract','standards','mime') { |
|
$scrout.='<tr><td align="right">'.&titlefield($fields{$field}).'</td><td>'. |
|
&Apache::lonmeta::prettyinput($field, |
|
$ENV{'form.'.$field}, |
|
$field, |
|
'advsearch', |
|
$related_word_search{$field}, |
|
'</td><td align="left">', |
|
$ENV{'form.'.$field.'_related'}, |
|
50); |
|
if ($related_word_search{$field}) { |
|
$scrout .= 'related words'; |
|
} else { |
|
$scrout .= '</td><td> '; |
|
} |
|
$scrout .= '</td></tr>'.$/; |
|
} |
|
foreach my $field ('lowestgradelevel','highestgradelevel') { |
|
$scrout.='<tr>'. |
|
'<td align="right">'.&titlefield($fields{$field}).'</td>'. |
|
'<td colspan="2">'. |
|
&Apache::lonmeta::prettyinput($field, |
|
$ENV{'form.'.$field}, |
|
$field, |
|
'advsearch', |
|
0). |
|
'</td></tr>'.$/; |
} |
} |
$scrout.='<tr bgcolor="#FFFFBB"><td>'. |
$scrout.='<tr><td align="right">'. |
&titlefield(&mt('MIME Type Category')).'</td><td>'. |
&titlefield(&mt('MIME Type Category')).'</td><td colspan="2">'. |
&Apache::loncommon::filecategoryselect('category', |
&Apache::loncommon::filecategoryselect('category', |
$ENV{'form.category'}). |
$ENV{'form.category'}). |
'</td><td> </td></td></tr>'; |
'</td></tr>'.$/; |
$scrout.='<tr bgcolor="#FFFFBB"><td>'. |
$scrout.='<tr><td align="right" valign="top">'. |
&titlefield(&mt('Limit Search to Domains')).'</td><td>'. |
&titlefield(&mt('Domains')).'</td><td colspan="2">'. |
&Apache::loncommon::domain_select('domains', |
&Apache::loncommon::domain_select('domains', |
$ENV{'form.domains'},1). |
$ENV{'form.domains'},1). |
'</td><td> </td></td></tr>'; |
'</td></tr>'.$/; |
my %dates=&Apache::lonlocal::texthash |
# |
('creationdatestart' => 'Creation Date After', |
# Misc metadata |
'creationdateend' => 'Creation Date Before', |
$scrout.='<tr><td align="right" valign="top">'. |
'lastrevisiondatestart' => 'Last Revision Date After', |
&titlefield(&mt('Copyright/Distribution')).'</td><td colspan="2">'. |
'lastrevisiondateend' => 'Last Revision Date Before'); |
&Apache::lonmeta::selectbox('copyright', |
foreach (sort keys %dates) { |
'',, |
$scrout.='<tr bgcolor="#FFFFBB">'. |
\&Apache::loncommon::copyrightdescription, |
'<td>'.&titlefield($dates{$_}).'</td><td>'. |
( undef, |
&Apache::lonhtmlcommon::date_setter('advsearch',$_,0,'',1). |
&Apache::loncommon::copyrightids) |
'</td><td> </td></td>'. |
).'</td></tr>'.$/; |
'</tr>'; |
$scrout.='<tr><td align="right" valign="top">'. |
} |
&titlefield(&mt('Language')).'</td><td colspan="2">'. |
|
&Apache::lonmeta::selectbox('language', |
|
'notset',, |
|
\&Apache::loncommon::languagedescription, |
|
('any',&Apache::loncommon::languageids) |
|
).'</td></tr>'; |
|
$scrout .= "</table>\n"; |
|
# |
|
# Dynamic metadata |
|
$scrout .= '<h3>'.&mt('Problem Statistics').'</h3>'; |
|
$scrout .= "<table>\n"; |
|
$scrout .= '<tr><td> </td><td align="center">'.&mt('Minimum').'</td>'. |
|
'<td align="center">'.&mt('Maximum').'</td></tr>'."\n"; |
|
foreach my $statistic |
|
({ name=>'stdno', |
|
description=>'Number of Students',}, |
|
{ name => 'avetries', |
|
description=>'Average tries to answer correctly',}, |
|
{ name => 'difficulty', |
|
description=>'Degree of difficulty',}, |
|
{ name => 'disc', |
|
description=>'Degree of discrimination'}) { |
|
$scrout .= '<tr><td align="right">'. |
|
&titlefield(&mt($statistic->{'description'})). |
|
'</td><td align="center">'. |
|
'<input type="text" name="'.$statistic->{'name'}.'_min" '. |
|
'value="" size="6" />'. |
|
'</td><td align="center">'. |
|
'<input type="text" name="'.$statistic->{'name'}.'_max" '. |
|
'value="" size="6" />'. |
|
'</td></tr>'.$/; |
|
} |
|
$scrout .= "</table>\n"; |
|
$scrout .= '<h3>'.&mt('Evaluation Data').'</h3>'; |
|
$scrout .= "<table>\n"; |
|
$scrout .= '<tr><td> </td><td align="center">'.&mt('Minimum').'</td>'. |
|
'<td align="center">'.&mt('Maximum').'</td></tr>'."\n"; |
|
foreach my $evaluation |
|
( { name => 'clear', |
|
description => 'Material presented in clear way'}, |
|
{ name =>'depth', |
|
description => 'Material covered with sufficient depth'}, |
|
{ name => 'helpful', |
|
description => 'Material is helpful'}, |
|
{ name => 'correct', |
|
description => 'Material appears to be correct'}, |
|
{ name => 'technical', |
|
description => 'Resource is technically correct'}){ |
|
$scrout .= '<tr><td align="right">'. |
|
&titlefield(&mt($evaluation->{'description'})). |
|
'</td><td align="center">'. |
|
'<input type="text" name="'.$evaluation->{'name'}.'_min" '. |
|
'value="" size="6" />'. |
|
'</td><td align="center">'. |
|
'<input type="text" name="'.$evaluation->{'name'}.'_max" '. |
|
'value="" size="6" />'. |
|
'</td></tr>'.$/; |
|
} |
|
$scrout .= "</table>\n"; |
|
# |
|
# Creation/Modification date limits |
|
$scrout .= '<h3>'.&mt('Creation and Modification dates').'</h3>'; |
|
$scrout .= "\n<table>\n"; |
|
my $cafter = |
|
&Apache::lonhtmlcommon::date_setter('advsearch', # formname |
|
'creationdate1', # fieldname |
|
0, # current value |
|
'', # special |
|
1, # includeempty |
|
'', # state |
|
1, # no_hh_mm_ss |
|
); |
|
my $cbefore = |
|
&Apache::lonhtmlcommon::date_setter('advsearch', # formname |
|
'creationdate2', # fieldname |
|
0, # current value |
|
'', # special |
|
1, # includeempty |
|
'', # state |
|
1, # no_hh_mm_ss |
|
); |
|
$scrout .= &mt('<tr><td align="right">Created between</td>'. |
|
'<td>[_1]</td></tr>'. |
|
'<tr><td align="right">and </td>'. |
|
'<td>[_2]</td></tr>',$cafter,$cbefore); |
|
my $lafter = |
|
&Apache::lonhtmlcommon::date_setter('advsearch', |
|
'revisiondate1', |
|
0, # current value |
|
'', # special |
|
1, # includeempty |
|
'', # state |
|
1, # no_hh_mm_ss |
|
); |
|
my $lbefore = |
|
&Apache::lonhtmlcommon::date_setter('advsearch', |
|
'revisiondate2', |
|
0, # current value |
|
'', # special |
|
1, # includeempty |
|
'', # state |
|
1, # no_hh_mm_ss |
|
); |
|
$scrout .= &mt('<tr><td align="right">Last modified between </td>'. |
|
'<td>[_1]</td></tr>'. |
|
'<tr><td align="right">and</td>'. |
|
'<td>[_2]</td></tr>',$lafter,$lbefore); |
$scrout.="</table>\n"; |
$scrout.="</table>\n"; |
$scrout.=<<ENDDOCUMENT; |
$scrout.=<<ENDDOCUMENT; |
$advanced_buttons |
$advanced_buttons |
Line 690 Outputs: titletext with font wrapper
|
Line 875 Outputs: titletext with font wrapper
|
###################################################################### |
###################################################################### |
sub titlefield { |
sub titlefield { |
my $title=shift; |
my $title=shift; |
return '<font face="arial" color="#800000">'.$title.'</font>'; |
return $title; |
} |
} |
|
|
###################################################################### |
###################################################################### |
Line 735 Outputs: text for box with view options
|
Line 920 Outputs: text for box with view options
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub viewoptions { |
sub viewoptions { |
my $scrout="\n\n".'<table bgcolor="#FFFFBB">'. |
my $scrout="\n".'<nobr>'; |
'<tr><th>'.&mt('View Options').'</th><th>'. |
if (! defined($ENV{'form.viewselect'})) { |
&mt('Records per Page').'</th></tr><tr><td>'; |
$ENV{'form.viewselect'}='detailed'; |
unless ($ENV{'form.viewselect'}) { $ENV{'form.viewselect'}='detailed'; } |
} |
$scrout.=&Apache::lonmeta::selectbox('viewselect', |
$scrout.=&Apache::lonmeta::selectbox('viewselect', |
$ENV{'form.viewselect'}, |
$ENV{'form.viewselect'}, |
\&viewoptiontext, |
\&viewoptiontext, |
sort(keys(%Views))); |
sort(keys(%Views))); |
$scrout.='</td><td>'; |
$scrout.= ' '; |
$scrout.=&Apache::lonmeta::selectbox('show', |
my $countselect = &Apache::lonmeta::selectbox('show', |
$ENV{'form.show'}, |
$ENV{'form.show'}, |
undef, |
undef, |
(10,20,50,100,1000,10000)); |
(10,20,50,100,1000,10000)); |
$scrout.="</td></tr></table>\n\n"; |
$scrout .= (' 'x2).&mt('[_1] Records per Page',$countselect). |
|
'</nobr>'.$/; |
return $scrout; |
return $scrout; |
} |
} |
|
|
Line 958 Parse advanced search form and return th
|
Line 1144 Parse advanced search form and return th
|
###################################################################### |
###################################################################### |
sub parse_advanced_search { |
sub parse_advanced_search { |
my ($r,$closebutton,$hidden_fields)=@_; |
my ($r,$closebutton,$hidden_fields)=@_; |
|
my @BasicFields = ('title','author','subject','keywords','url','version', |
|
'notes','abstract','extension','owner', |
|
# 'custommetadata','customshow', |
|
'modifyinguser','standards','mime'); |
|
my @StatsFields = ('stdno','avetries','difficulty','disc'); |
|
my @EvalFields = ('clear','depth','helpful','correct','technical'); |
my $fillflag=0; |
my $fillflag=0; |
my $pretty_search_string = "<br />\n"; |
my $pretty_search_string = "<br />\n"; |
# Clean up fields for safety |
# Clean up fields for safety |
for my $field ('title','author','subject','keywords','url','version', |
for my $field (@BasicFields, |
'creationdatestart_month','creationdatestart_day', |
'creationdatestart_month','creationdatestart_day', |
'creationdatestart_year','creationdateend_month', |
'creationdatestart_year','creationdateend_month', |
'creationdateend_day','creationdateend_year', |
'creationdateend_day','creationdateend_year', |
'lastrevisiondatestart_month','lastrevisiondatestart_day', |
'lastrevisiondatestart_month','lastrevisiondatestart_day', |
'lastrevisiondatestart_year','lastrevisiondateend_month', |
'lastrevisiondatestart_year','lastrevisiondateend_month', |
'lastrevisiondateend_day','lastrevisiondateend_year', |
'lastrevisiondateend_day','lastrevisiondateend_year') { |
'notes','abstract','extension','language','owner', |
$ENV{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
'custommetadata','customshow','category') { |
|
$ENV{"form.$field"}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
|
} |
} |
foreach ('mode','form','element') { |
foreach ('mode','form','element') { |
# is this required? Hmmm. |
# is this required? Hmmm. |
next unless (exists($ENV{"form.$_"})); |
next if (! exists($ENV{'form.'.$_})); |
$ENV{"form.$_"}=&Apache::lonnet::unescape($ENV{"form.$_"}); |
$ENV{'form.'.$_}=&Apache::lonnet::unescape($ENV{'form.'.$_}); |
$ENV{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
$ENV{'form.'.$_}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
} |
} |
# Preprocess the category form element. |
# Preprocess the category form element. |
$ENV{'form.category'} = 'any' if (! defined($ENV{'form.category'}) || |
$ENV{'form.category'} = 'any' if (! defined($ENV{'form.category'}) || |
ref($ENV{'form.category'})); |
ref($ENV{'form.category'})); |
# |
# |
# Check to see if enough information was filled in |
# Check to see if enough information was filled in |
for my $field ('title','author','subject','keywords','url','version', |
for my $field (@BasicFields) { |
'notes','abstract','category','extension','language', |
if (&filled($ENV{'form.'.$field})) { |
'owner','custommetadata') { |
|
if (&filled($ENV{"form.$field"})) { |
|
$fillflag++; |
$fillflag++; |
} |
} |
} |
} |
unless ($fillflag) { |
for my $field ('lowestgradelevel','highestgradelevel') { |
|
if ( $ENV{'form.'.$field} =~ /^\d+$/ && |
|
$ENV{'form.'.$field} > 0) { |
|
$fillflag++; |
|
} |
|
} |
|
if (! $fillflag) { |
&output_blank_field_error($r,$closebutton, |
&output_blank_field_error($r,$closebutton, |
'phase=disp_adv',$hidden_fields); |
'phase=disp_adv',$hidden_fields); |
return ; |
return ; |
Line 1000 sub parse_advanced_search {
|
Line 1194 sub parse_advanced_search {
|
my @queries; |
my @queries; |
my $font = '<font color="#800000" face="helvetica">'; |
my $font = '<font color="#800000" face="helvetica">'; |
# Evaluate logical expression AND/OR/NOT phrase fields. |
# Evaluate logical expression AND/OR/NOT phrase fields. |
foreach my $field ('title','author','subject','notes','abstract','url', |
foreach my $field (@BasicFields) { |
'keywords','version','owner','standards') { |
|
if ($ENV{'form.'.$field}) { |
if ($ENV{'form.'.$field}) { |
my $searchphrase = $ENV{'form.'.$field}; |
my $searchphrase = $ENV{'form.'.$field}; |
$pretty_search_string .= $font."$field</font> contains <b>". |
$pretty_search_string .= $font."$field</font> contains <b>". |
Line 1033 sub parse_advanced_search {
|
Line 1226 sub parse_advanced_search {
|
$searchphrase = join(' OR ',@extensions); |
$searchphrase = join(' OR ',@extensions); |
} |
} |
} |
} |
if (exists($ENV{'form.extension'}) && $ENV{'form.extension'} !~ /^\s*$/) { |
|
$searchphrase .= ' OR ' if (defined($searchphrase)); |
|
my @extensions = split(/,/,$ENV{'form.extension'}); |
|
$searchphrase .= join(' OR ',@extensions); |
|
} |
|
if (defined($searchphrase)) { |
if (defined($searchphrase)) { |
push @queries,&build_SQL_query('mime',$searchphrase); |
push @queries,&build_SQL_query('mime',$searchphrase); |
$pretty_search_string .=$font.'mime</font> contains <b>'. |
$pretty_search_string .=$font.'mime</font> contains <b>'. |
Line 1045 sub parse_advanced_search {
|
Line 1233 sub parse_advanced_search {
|
} |
} |
# |
# |
# Evaluate option lists |
# Evaluate option lists |
|
if ($ENV{'form.lowestgradelevel'} && |
|
$ENV{'form.lowestgradelevel'} ne '0' && |
|
$ENV{'form.lowestgradelevel'} =~ /^\d+$/) { |
|
push(@queries, |
|
'(lowestgradelevel>='.$ENV{'form.lowestgradelevel'}.')'); |
|
$pretty_search_string.="lowestgradelevel>=". |
|
$ENV{'form.lowestgradelevel'}."<br />\n"; |
|
} |
|
if ($ENV{'form.highestgradelevel'} && |
|
$ENV{'form.highestgradelevel'} ne '0' && |
|
$ENV{'form.highestgradelevel'} =~ /^\d+$/) { |
|
push(@queries, |
|
'(highestgradelevel<='.$ENV{'form.highestgradelevel'}.')'); |
|
$pretty_search_string.="highestgradelevel<=". |
|
$ENV{'form.highestgradelevel'}."<br />\n"; |
|
} |
if ($ENV{'form.language'} and $ENV{'form.language'} ne 'any') { |
if ($ENV{'form.language'} and $ENV{'form.language'} ne 'any') { |
push @queries,"(language like \"$ENV{'form.language'}\")"; |
push @queries,"(language like \"$ENV{'form.language'}\")"; |
$pretty_search_string.=$font."language</font>= ". |
$pretty_search_string.=$font."language</font>= ". |
Line 1058 sub parse_advanced_search {
|
Line 1262 sub parse_advanced_search {
|
"<br \>\n"; |
"<br \>\n"; |
} |
} |
# |
# |
|
# Statistics |
|
foreach my $field (@StatsFields,@EvalFields) { |
|
my ($min,$max); |
|
if (exists($ENV{'form.'.$field.'_min'}) && |
|
$ENV{'form.'.$field.'_min'} ne '') { |
|
$min = $ENV{'form.'.$field.'_min'}; |
|
} |
|
if (exists($ENV{'form.'.$field.'_max'}) && |
|
$ENV{'form.'.$field.'_max'} ne '') { |
|
$max = $ENV{'form.'.$field.'_max'}; |
|
} |
|
next if (! defined($max) && ! defined($min)); |
|
if (defined($min) && defined($max)) { |
|
($min,$max) = sort {$a <=>$b} ($min,$max); |
|
} |
|
if (defined($min) && $min =~ /^(\d+\.\d+|\d+|\.\d+)$/) { |
|
push(@queries,'('.$field.'>'.$min.')'); |
|
$pretty_search_string.=$font.$field.'</font>>'.$min.'<br />'; |
|
} |
|
if (defined($max) && $max =~ /^(\d+\.\d+|\d+|\.\d+)$/) { |
|
push(@queries,'('.$field.'<'.$max.')'); |
|
$pretty_search_string.=$font.$field.'</font><'.$max.'<br />'; |
|
} |
|
} |
|
# |
# Evaluate date windows |
# Evaluate date windows |
my $datequery=&build_date_queries( |
my $cafter = |
$ENV{'form.creationdatestart_month'}, |
&Apache::lonhtmlcommon::get_date_from_form('creationdate1'); |
$ENV{'form.creationdatestart_day'}, |
my $cbefore = |
$ENV{'form.creationdatestart_year'}, |
&Apache::lonhtmlcommon::get_date_from_form('creationdate2'); |
$ENV{'form.creationdateend_month'}, |
if ($cafter > $cbefore) { |
$ENV{'form.creationdateend_day'}, |
my $tmp = $cafter; |
$ENV{'form.creationdateend_year'}, |
$cafter = $cbefore; |
$ENV{'form.lastrevisiondatestart_month'}, |
$cbefore = $tmp; |
$ENV{'form.lastrevisiondatestart_day'}, |
} |
$ENV{'form.lastrevisiondatestart_year'}, |
my $mafter = |
$ENV{'form.lastrevisiondateend_month'}, |
&Apache::lonhtmlcommon::get_date_from_form('revisiondate1'); |
$ENV{'form.lastrevisiondateend_day'}, |
my $mbefore = |
$ENV{'form.lastrevisiondateend_year'}, |
&Apache::lonhtmlcommon::get_date_from_form('revisiondate2'); |
); |
if ($mafter > $mbefore) { |
# Test to see if date windows are legitimate |
my $tmp = $mafter; |
if ($datequery=~/^Incorrect/) { |
$mafter = $mbefore; |
&output_date_error($r,$datequery,$closebutton,$hidden_fields); |
$mbefore = $tmp; |
return ; |
} |
} elsif ($datequery) { |
my ($datequery,$error,$prettydate)=&build_date_queries($cafter,$cbefore, |
|
$mafter,$mbefore); |
|
if (defined($error)) { |
|
&output_date_error($r,$error,$closebutton,$hidden_fields); |
|
} elsif (defined($datequery)) { |
# Here is where you would set up pretty_search_string to output |
# Here is where you would set up pretty_search_string to output |
# date query information. |
# date query information. |
|
$pretty_search_string .= '<br />'.$prettydate.'<br />'; |
push @queries,$datequery; |
push @queries,$datequery; |
} |
} |
# |
# |
Line 1113 sub parse_advanced_search {
|
Line 1347 sub parse_advanced_search {
|
$pretty_search_string .= $pretty_domains_string."<br />\n"; |
$pretty_search_string .= $pretty_domains_string."<br />\n"; |
# |
# |
if (@queries) { |
if (@queries) { |
$query=join(" AND ",@queries); |
$query="select * from metadata where ".join(" AND ",@queries); |
$query="select * from metadata where $query"; |
|
} elsif ($customquery) { |
} elsif ($customquery) { |
$query = ''; |
$query = ''; |
} |
} |
|
# &Apache::lonnet::logthis('query = '.$/.$query); |
return ($query,$customquery,$customshow,$libraries_to_query, |
return ($query,$customquery,$customshow,$libraries_to_query, |
$pretty_search_string); |
$pretty_search_string); |
} |
} |
Line 1372 Also reports errors (check for /^Incorre
|
Line 1606 Also reports errors (check for /^Incorre
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub build_date_queries { |
sub build_date_queries { |
my ($cmonth1,$cday1,$cyear1,$cmonth2,$cday2,$cyear2, |
my ($cafter,$cbefore,$mafter,$mbefore) = @_; |
$lmonth1,$lday1,$lyear1,$lmonth2,$lday2,$lyear2)=@_; |
my ($result,$error,$pretty_string); |
my @queries; |
# |
if ($cmonth1 or $cday1 or $cyear1 or $cmonth2 or $cday2 or $cyear2) { |
# Verify the input |
unless ($cmonth1 and $cday1 and $cyear1 and |
if (! defined($cafter) && ! defined($cbefore) && |
$cmonth2 and $cday2 and $cyear2) { |
! defined($mafter) && ! defined($mbefore)) { |
return "Incorrect entry for the creation date. You must specify ". |
# This is an okay situation, so return undef for the error |
"a starting month, day, and year and an ending month, ". |
return (undef,undef,undef); |
"day, and year."; |
} |
} |
if ((defined($cafter) && ! defined($cbefore)) || |
my $cnumeric1=sprintf("%d%2d%2d",$cyear1,$cmonth1,$cday1); |
(defined($cbefore) && ! defined($cafter))) { |
$cnumeric1+=0; |
# This is bad, so let them know |
my $cnumeric2=sprintf("%d%2d%2d",$cyear2,$cmonth2,$cday2); |
$error = &mt('Incorrect entry for the creation date. '. |
$cnumeric2+=0; |
'You must specify both the beginning and ending dates.'); |
if ($cnumeric1>$cnumeric2) { |
} |
return "Incorrect entry for the creation date. The starting ". |
if (! defined($error) && |
"date must occur before the ending date."; |
((defined($mafter) && ! defined($mbefore)) || |
} |
(defined($mbefore) && ! defined($mafter)))) { |
my $cquery="(creationdate BETWEEN '$cyear1-$cmonth1-$cday1' AND '". |
# This is also bad, so let them know |
"$cyear2-$cmonth2-$cday2 23:59:59')"; |
$error = &mt('Incorrect entry for the last revision date. '. |
push @queries,$cquery; |
'You must specify both the beginning and ending dates.'); |
} |
|
if ($lmonth1 or $lday1 or $lyear1 or $lmonth2 or $lday2 or $lyear2) { |
|
unless ($lmonth1 and $lday1 and $lyear1 and |
|
$lmonth2 and $lday2 and $lyear2) { |
|
return "Incorrect entry for the last revision date. You must ". |
|
"specify a starting month, day, and year and an ending ". |
|
"month, day, and year."; |
|
} |
|
my $lnumeric1=sprintf("%d%2d%2d",$lyear1,$lmonth1,$lday1); |
|
$lnumeric1+=0; |
|
my $lnumeric2=sprintf("%d%2d%2d",$lyear2,$lmonth2,$lday2); |
|
$lnumeric2+=0; |
|
if ($lnumeric1>$lnumeric2) { |
|
return "Incorrect entry for the last revision date. The ". |
|
"starting date must occur before the ending date."; |
|
} |
|
my $lquery="(lastrevisiondate BETWEEN '$lyear1-$lmonth1-$lday1' AND '". |
|
"$lyear2-$lmonth2-$lday2 23:59:59')"; |
|
push @queries,$lquery; |
|
} |
} |
if (@queries) { |
if (! defined($error)) { |
return join(" AND ",@queries); |
# |
|
# Build the queries |
|
my @queries; |
|
if (defined($cbefore) && defined($cafter)) { |
|
my (undef,undef,undef,$caday,$camon,$cayear) = localtime($cafter); |
|
my (undef,undef,undef,$cbday,$cbmon,$cbyear) = localtime($cbefore); |
|
# Correct for year being relative to 1900 |
|
$cayear+=1900; $cbyear+=1900; |
|
my $cquery= |
|
'(creationdate BETWEEN '. |
|
"'".$cayear.'-'.$camon.'-'.$caday."'". |
|
' AND '. |
|
"'".$cbyear.'-'.$cbmon.'-'.$cbday." 23:59:59')"; |
|
$pretty_string .= '<br />' if (defined($pretty_string)); |
|
$pretty_string .= |
|
&mt('created between [_1] and [_2]', |
|
&Apache::lonlocal::locallocaltime($cafter), |
|
&Apache::lonlocal::locallocaltime($cbefore+24*60*60-1)); |
|
push(@queries,$cquery); |
|
$pretty_string =~ s/ 00:00:00//g; |
|
} |
|
if (defined($mbefore) && defined($mafter)) { |
|
my (undef,undef,undef,$maday,$mamon,$mayear) = localtime($mafter); |
|
my (undef,undef,undef,$mbday,$mbmon,$mbyear) = localtime($mbefore); |
|
# Correct for year being relative to 1900 |
|
$mayear+=1900; $mbyear+=1900; |
|
my $mquery= |
|
'(lastrevisiondate BETWEEN '. |
|
"'".$mayear.'-'.$mamon.'-'.$maday."'". |
|
' AND '. |
|
"'".$mbyear.'-'.$mbmon.'-'.$mbday." 23:59:59')"; |
|
push(@queries,$mquery); |
|
$pretty_string .= '<br />' if (defined($pretty_string)); |
|
$pretty_string .= |
|
&mt('last revised between [_1] and [_2]', |
|
&Apache::lonlocal::locallocaltime($mafter), |
|
&Apache::lonlocal::locallocaltime($mbefore+24*60*60-1)); |
|
$pretty_string =~ s/ 00:00:00//g; |
|
} |
|
if (@queries) { |
|
$result .= join(" AND ",@queries); |
|
} |
} |
} |
return ''; |
return ($result,$error,$pretty_string); |
} |
} |
|
|
###################################################################### |
###################################################################### |
Line 1646 Returns: the identifier of the table on
|
Line 1902 Returns: the identifier of the table on
|
sub set_up_table_structure { |
sub set_up_table_structure { |
my ($datatypes,$fullindicies) = |
my ($datatypes,$fullindicies) = |
&LONCAPA::lonmetadata::describe_metadata_storage(); |
&LONCAPA::lonmetadata::describe_metadata_storage(); |
unshift(@$datatypes,{name => 'id', |
# Copy the table description before modifying it... |
|
@Datatypes = @{$datatypes}; |
|
unshift(@Datatypes,{name => 'id', |
type => 'MEDIUMINT', |
type => 'MEDIUMINT', |
restrictions => 'UNSIGNED NOT NULL', |
restrictions => 'UNSIGNED NOT NULL', |
primary_key => 'yes', |
primary_key => 'yes', |
auto_inc => 'yes' }); |
auto_inc => 'yes' }); |
@Datatypes = @{$datatypes}; |
|
@Fullindicies = @{$fullindicies}; |
@Fullindicies = @{$fullindicies}; |
return; |
return; |
} |
} |
Line 1714 sub update_status {
|
Line 1971 sub update_status {
|
$r->rflush(); |
$r->rflush(); |
} |
} |
|
|
|
{ |
|
my $max_time = 40; # seconds for the search to complete |
|
my $start_time = 0; |
|
my $last_time = 0; |
|
|
|
sub reset_timing { |
|
$start_time = 0; |
|
$last_time = 0; |
|
} |
|
|
|
sub time_left { |
|
if ($start_time == 0) { |
|
$start_time = time; |
|
} |
|
my $time_left = $max_time - (time - $start_time); |
|
$time_left = 0 if ($time_left < 0); |
|
return $time_left; |
|
} |
|
|
sub update_seconds { |
sub update_seconds { |
my ($r,$text) = @_; |
my ($r) = @_; |
$text =~ s/\'/\\\'/g; |
my $time = &time_left(); |
$r->print |
if (($last_time-$time) > 0) { |
("<script>document.statusform.seconds.value = ' $text'</script>\n"); |
$r->print("<script>". |
$r->rflush(); |
"document.statusform.seconds.value = '$time'". |
|
"</script>\n"); |
|
$r->rflush(); |
|
} |
|
$last_time = $time; |
|
} |
|
|
} |
} |
|
|
###################################################################### |
###################################################################### |
Line 1768 sub run_search {
|
Line 2050 sub run_search {
|
my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1); |
my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1); |
my $connection = $r->connection; |
my $connection = $r->connection; |
# |
# |
# Timing variables |
|
# |
|
my $starttime = time; |
|
my $max_time = 30; # seconds for the search to complete |
|
# |
|
# Print run_search header |
# Print run_search header |
# |
# |
$r->print(<<END); |
$r->print(<<END); |
Line 1789 END
|
Line 2066 END
|
if (@Lines > 2) { |
if (@Lines > 2) { |
$pretty_string = join '<br \>',(@Lines[0..2],'....<br />'); |
$pretty_string = join '<br \>',(@Lines[0..2],'....<br />'); |
} |
} |
$r->print(&mt("Search").": ".$pretty_string); |
$r->print(&mt("Search: [_1]",$pretty_string)); |
$r->rflush(); |
$r->rflush(); |
# |
# |
# Determine the servers we need to contact. |
# Determine the servers we need to contact. |
Line 1804 END
|
Line 2081 END
|
@Servers_to_contact = sort(keys(%Apache::lonnet::libserv)); |
@Servers_to_contact = sort(keys(%Apache::lonnet::libserv)); |
} |
} |
my %Server_status; |
my %Server_status; |
|
# |
|
# Check on the mysql table we will use to store results. |
my $table =$ENV{'form.table'}; |
my $table =$ENV{'form.table'}; |
if (! defined($table) || $table eq '' || $table =~ /\D/ ) { |
if (! defined($table) || $table eq '' || $table =~ /\D/ ) { |
$r->print("Unable to determine table id to store search results in.". |
$r->print("Unable to determine table id to store search results in.". |
Line 1848 END
|
Line 2127 END
|
</form> |
</form> |
END |
END |
$r->rflush(); |
$r->rflush(); |
my $time_remaining = $max_time - (time - $starttime) ; |
&reset_timing(); |
my $last_time = $time_remaining; |
&update_seconds($r); |
&update_seconds($r,$time_remaining); |
&update_status($r,&mt('contacting [_1]',$Servers_to_contact[0])); |
&update_status($r,'contacting '.$Servers_to_contact[0]); |
while (&time_left() && |
while (($time_remaining > 0) && |
|
((@Servers_to_contact) || keys(%Server_status))) { |
((@Servers_to_contact) || keys(%Server_status))) { |
# Send out a search request if it needs to be done. |
&update_seconds($r); |
|
# |
|
# Send out a search request |
if (@Servers_to_contact) { |
if (@Servers_to_contact) { |
# Contact one server |
# Contact one server |
my $server = shift(@Servers_to_contact); |
my $server = shift(@Servers_to_contact); |
&update_status($r,&mt('contacting').' '.$server); |
&update_status($r,&mt('contacting [_1]',$server)); |
my $reply=&Apache::lonnet::metadata_query($query,$customquery, |
my $reply=&Apache::lonnet::metadata_query($query,$customquery, |
$customshow,[$server]); |
$customshow,[$server]); |
($server) = keys(%$reply); |
($server) = keys(%$reply); |
Line 1870 END
|
Line 2150 END
|
# left to contact. |
# left to contact. |
if (scalar (keys(%Server_status))) { |
if (scalar (keys(%Server_status))) { |
&update_status($r, |
&update_status($r, |
&mt('waiting on').' '.(join(' ',keys(%Server_status)))); |
&mt('waiting on [_1]',join(' ',keys(%Server_status)))); |
} |
} |
sleep(1); |
sleep(1); |
} |
} |
Line 1879 END
|
Line 2159 END
|
# have results from yet, looking for results. |
# have results from yet, looking for results. |
while (my ($server,$status) = each(%Server_status)) { |
while (my ($server,$status) = each(%Server_status)) { |
last if ($connection->aborted()); |
last if ($connection->aborted()); |
|
&update_seconds($r); |
if ($status eq 'con_lost') { |
if ($status eq 'con_lost') { |
delete ($Server_status{$server}); |
delete ($Server_status{$server}); |
next; |
next; |
Line 1886 END
|
Line 2167 END
|
$status=~/^([\.\w]+)$/; |
$status=~/^([\.\w]+)$/; |
my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$1; |
my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$1; |
if (-e $datafile && ! -e "$datafile.end") { |
if (-e $datafile && ! -e "$datafile.end") { |
&update_status($r,&mt('Receiving results from').' '.$server); |
&update_status($r,&mt('Receiving results from [_1]',$server)); |
next; |
next; |
} |
} |
last if ($connection->aborted()); |
last if ($connection->aborted()); |
if (-e "$datafile.end") { |
if (-e "$datafile.end") { |
&update_status($r,&mt('Reading results from').' '.$server); |
&update_status($r,&mt('Reading results from [_1]',$server)); |
if (-z "$datafile") { |
if (-z "$datafile") { |
delete($Server_status{$server}); |
delete($Server_status{$server}); |
next; |
next; |
Line 1906 END
|
Line 2187 END
|
# Read in the whole file. |
# Read in the whole file. |
while (my $result = <$fh>) { |
while (my $result = <$fh>) { |
last if ($connection->aborted()); |
last if ($connection->aborted()); |
# handle custom fields? Someday we will! |
# |
|
# Records are stored one per line |
chomp($result); |
chomp($result); |
next unless $result; |
next if (! $result); |
|
# |
# Parse the result. |
# Parse the result. |
my %Fields = &parse_raw_result($result,$server); |
my %Fields = &parse_raw_result($result,$server); |
$Fields{'hostname'} = $server; |
$Fields{'hostname'} = $server; |
|
# |
|
# Skip based on copyright |
next if (! ©right_check(\%Fields)); |
next if (! ©right_check(\%Fields)); |
|
# |
# Store the result in the mysql database |
# Store the result in the mysql database |
my $result = &Apache::lonmysql::store_row($table,\%Fields); |
my $result = &Apache::lonmysql::store_row($table,\%Fields); |
if (! defined($result)) { |
if (! defined($result)) { |
$r->print(&Apache::lonmysql::get_error()); |
$r->print(&Apache::lonmysql::get_error()); |
} |
} |
# $r->print(&Apache::lonmysql::get_debug()); |
# |
$hitcountsum ++; |
$hitcountsum ++; |
$time_remaining = $max_time - (time - $starttime) ; |
&update_seconds($r); |
if ($last_time - $time_remaining > 0) { |
|
&update_seconds($r,$time_remaining); |
|
$last_time = $time_remaining; |
|
} |
|
if ($hitcountsum % 50 == 0) { |
if ($hitcountsum % 50 == 0) { |
&update_count_status($r,$hitcountsum); |
&update_count_status($r,$hitcountsum); |
} |
} |
} # End of foreach (@results) |
} |
$fh->close(); |
$fh->close(); |
# $server is only deleted if the results file has been |
# $server is only deleted if the results file has been |
# found and (successfully) opened. This may be a bad idea. |
# found and (successfully) opened. This may be a bad idea. |
Line 1938 END
|
Line 2220 END
|
&update_count_status($r,$hitcountsum); |
&update_count_status($r,$hitcountsum); |
} |
} |
last if ($connection->aborted()); |
last if ($connection->aborted()); |
# Finished looping through the servers |
&update_seconds($r); |
$starttime = time if (@Servers_to_contact); |
|
$time_remaining = $max_time - (time - $starttime) ; |
|
if ($last_time - $time_remaining > 0) { |
|
$last_time = $time_remaining; |
|
&update_seconds($r,$time_remaining); |
|
} |
|
} |
} |
&update_status($r,&mt('Search Complete').$server); |
&update_status($r,&mt('Search Complete [_1]',$server)); |
&update_seconds($r,0); |
&update_seconds($r); |
# |
# |
&Apache::lonmysql::disconnect_from_db(); |
&Apache::lonmysql::disconnect_from_db(); # This is unneccessary |
# |
# |
# We have run out of time or run out of servers to talk to and |
# We have run out of time or run out of servers to talk to and |
# results to get. |
# results to get, so let the client know the top frame needs to be |
|
# loaded from /adm/searchcat |
$r->print("</body></html>"); |
$r->print("</body></html>"); |
if ($ENV{'form.catalogmode'} ne 'groupsearch') { |
if ($ENV{'form.catalogmode'} ne 'groupsearch') { |
$r->print("<script>". |
$r->print("<script>". |
Line 1980 Returns html for the previous and next b
|
Line 2257 Returns html for the previous and next b
|
sub prev_next_buttons { |
sub prev_next_buttons { |
my ($current_min,$show,$total,$parms) = @_; |
my ($current_min,$show,$total,$parms) = @_; |
return '' if ($show eq 'all'); # No links if you get them all at once. |
return '' if ($show eq 'all'); # No links if you get them all at once. |
my $links; |
# |
## |
# Create links |
## Prev |
|
my $prev_min = $current_min - $show; |
my $prev_min = $current_min - $show; |
$prev_min = 1 if $prev_min < 1; |
$prev_min = 1 if $prev_min < 1; |
if ($prev_min < $current_min) { |
my $prevlink = |
$links .= |
qq{<a href="/adm/searchcat?$parms&start=$prev_min&show=$show">}; |
qq{<a href="/adm/searchcat?$parms&start=$prev_min&show=$show">}. |
# |
&mt('prev').'</a>'; |
|
} else { |
|
$links .= &mt('prev'); |
|
} |
|
## |
|
## Pages.... Someday. |
|
## |
|
$links .= |
|
qq{ |
|
<a href="/adm/searchcat?$parms&start=$current_min&$show=$show">}. |
|
&mt('reload').'</a>'; |
|
## |
|
## Next |
|
my $next_min = $current_min + $show; |
my $next_min = $current_min + $show; |
$next_min = $current_min if ($next_min > $total); |
$next_min = $current_min if ($next_min > $total); |
if ($next_min != $current_min) { |
my $nextlink = |
$links .= |
qq{<a href="/adm/searchcat?$parms&start=$next_min&show=$show">}; |
qq{ |
my $reloadlink = |
<a href="/adm/searchcat?$parms&start=$next_min&show=$show">}. |
qq{<a href="/adm/searchcat?$parms&start=$current_min&$show=$show">}; |
&mt('next').'</a>'; |
# |
} else { |
# Determine which parameters to pass |
$links .= ' '.&mt('next'); |
my $String = '[_1]prev[_2] [_3]reload[_4] [_5]next[_6]'; |
} |
if ($prev_min == $current_min) { |
|
$String =~ s:\[_[12]\]::g; |
|
} |
|
if ($next_min == $current_min) { |
|
$String =~ s:\[_[56]\]::g; |
|
} |
|
my $links = &mt($String, |
|
$prevlink, '</a>', |
|
$reloadlink,'</a>', |
|
$nextlink, '</a>'); |
return $links; |
return $links; |
} |
} |
|
|
Line 2095 sub display_results {
|
Line 2367 sub display_results {
|
."</center>\n" |
."</center>\n" |
); |
); |
if ($total_results == 0) { |
if ($total_results == 0) { |
$r->print('<meta HTTP-EQUIV="Refresh" CONTENT="1">'. |
$r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2">'. |
'<h3>'.&mt('There are currently no results').'.</h3>'. |
'<h3>'.&mt('There are currently no results').'.</h3>'. |
"</form></body></html>"); |
"</form></body></html>"); |
return; |
return; |
Line 2116 sub display_results {
|
Line 2388 sub display_results {
|
} |
} |
my %Fields = %{&parse_row(@$row)}; |
my %Fields = %{&parse_row(@$row)}; |
my $output="<p>\n"; |
my $output="<p>\n"; |
|
if (! defined($Fields{'title'}) || $Fields{'title'} eq '') { |
|
$Fields{'title'} = 'Untitled'; |
|
} |
my $prefix=&catalogmode_output($Fields{'title'},$Fields{'url'}, |
my $prefix=&catalogmode_output($Fields{'title'},$Fields{'url'}, |
$Fields{'id'},$checkbox_num++); |
$Fields{'id'},$checkbox_num++); |
# Render the result into html |
# Render the result into html |
Line 2507 extra custom metadata to show.
|
Line 2782 extra custom metadata to show.
|
###################################################################### |
###################################################################### |
sub detailed_citation_view { |
sub detailed_citation_view { |
my ($prefix,%values) = @_; |
my ($prefix,%values) = @_; |
my $icon=&Apache::loncommon::icon($values{'url'}); |
my $icon= |
my $result=<<END; |
my $result; |
<b>$prefix<img src="$icon" /><a href="http://$ENV{'HTTP_HOST'}$values{'url'}" |
$result .= '<b>'.$prefix. |
target='search_preview'>$values{'title'}</a></b> |
'<img src="'.&Apache::loncommon::icon($values{'url'}).' " />'. |
<p> |
'<a href="http://'.$ENV{'HTTP_HOST'}.$values{'url'}.'" '. |
<b>$values{'author'}</b>, <i>$values{'owner'}</i><br /> |
'target="search_preview">'.$values{'title'}."</a></b>\n"; |
|
$result .= "<p>\n"; |
<b>Subject: </b> $values{'subject'}<br /> |
$result .= '<b>'.$values{'author'}.'</b>,'. |
<b>Keyword(s): </b> $values{'keywords'}<br /> |
' <i>'.$values{'owner'}.'</i><br />'; |
<b>Notes: </b> $values{'notes'}<br /> |
foreach my $field |
<b>MIME Type: </b> $values{'mimetag'}<br /> |
( |
<b>Language: </b> $values{'language'}<br /> |
{ name=>'subject', |
<b>Copyright/Distribution:</b> $values{'copyrighttag'}<br /> |
translate => '<b>Subject:</b> [_1]',}, |
</p> |
{ name=>'keywords', |
$values{'extrashow'} |
translate => '<b>Keywords:</b> [_1]',}, |
<p> |
{ name=>'notes', |
$values{'shortabstract'} |
translate => '<b>Notes:</b> [_1]',}, |
</p> |
{ name=>'mimetag', |
<hr align='left' width='200' noshade /> |
translate => '<b>MIME Type:</b> [_1]',}, |
END |
{ name=>'standards', |
|
translate => '<b>Standards:</b>[_1]',}, |
|
{ name=>'copyrighttag', |
|
translate => '<b>Copyright/Distribution:</b> [_1]',}, |
|
{ name=>'stdno', |
|
translate => '<b>Number of Students:</b> [_1]',}, |
|
{ name=>'avetries', |
|
translate => '<b>Average Tries:</b> [_1]',}, |
|
{ name=>'disc', |
|
translate => '<b>Degree of Discrimination:</b> [_1]',}, |
|
{ name=>'difficulty', |
|
translate => '<b>Degree of Difficulty:</b> [_1]',}, |
|
{ name=>'clear', |
|
translate => '<b>Clear:</b> [_1]',}, |
|
{ name=>'depth', |
|
translate => '<b>Depth:</b> [_1]',}, |
|
{ name=>'helpful', |
|
translate => '<b>Helpful:</b> [_1]',}, |
|
{ name=>'correct', |
|
translate => '<b>Correcy:</b> [_1]',}, |
|
{ name=>'technical', |
|
translate => '<b>Technical:</b> [_1]',}, |
|
) { |
|
$result.= &mt($field->{'translate'},$values{$field->{'name'}}). |
|
"<br />\n"; |
|
} |
|
$result .= "</p>".$values{'extrashow'}. |
|
'<p>'.$values{'shortabstract'}.'</p>'; |
|
$result .= '<hr align="left" width="200" noshade />'."\n"; |
return $result; |
return $result; |
} |
} |
|
|
Line 2633 END
|
Line 2936 END
|
###################################################################### |
###################################################################### |
sub xml_sgml_view { |
sub xml_sgml_view { |
my ($prefix,%values) = @_; |
my ($prefix,%values) = @_; |
|
my $xml = <<END; |
|
<LonCapaResource> |
|
<url>$values{'url'}</url> |
|
<title>$values{'title'}</title> |
|
<author>$values{'author'}</author> |
|
<subject>$values{'subject'}</subject> |
|
<keywords>$values{'keywords'}</keywords> |
|
<notes>$values{'notes'}</notes> |
|
<mimeInfo> |
|
<mime>$values{'mime'}</mime> |
|
<mimetag>$values{'mimetag'}</mimetag> |
|
</mimeInfo> |
|
<languageInfo> |
|
<language>$values{'language'}</language> |
|
<languagetag>$values{'languagetag'}</languagetag> |
|
</languageInfo> |
|
<creationdate>$values{'creationdate'}</creationdate> |
|
<lastrevisiondate>$values{'lastrevisiondate'}</lastrevisiondate> |
|
<owner>$values{'owner'}</owner> |
|
<copyrightInfo> |
|
<copyright>$values{'copyright'}</copyright> |
|
<copyrighttag>$values{'copyrighttag'}</copyrighttag> |
|
</copyrightInfo> |
|
<repositoryLocation>$values{'hostname'}</repositoryLocation> |
|
<shortabstract>$values{'shortabstract'}</shortabstract> |
|
</LonCapaResource> |
|
END |
|
$xml = &HTML::Entities::encode($xml,'<>&'); |
my $result=<<END; |
my $result=<<END; |
$prefix |
$prefix |
<pre> |
<pre> |
<LonCapaResource> |
$xml |
<url>$values{'url'}</url> |
|
<title>$values{'title'}</title> |
|
<author>$values{'author'}</author> |
|
<subject>$values{'subject'}</subject> |
|
<keywords>$values{'keywords'}</keywords> |
|
<notes>$values{'notes'}</notes> |
|
<mimeInfo> |
|
<mime>$values{'mime'}</mime> |
|
<mimetag>$values{'mimetag'}</mimetag> |
|
</mimeInfo> |
|
<languageInfo> |
|
<language>$values{'language'}</language> |
|
<languagetag>$values{'languagetag'}</languagetag> |
|
</languageInfo> |
|
<creationdate>$values{'creationdate'}</creationdate> |
|
<lastrevisiondate>$values{'lastrevisiondate'}</lastrevisiondate> |
|
<owner>$values{'owner'}</owner> |
|
<copyrightInfo> |
|
<copyright>$values{'copyright'}</copyright> |
|
<copyrighttag>$values{'copyrighttag'}</copyrighttag> |
|
</copyrightInfo> |
|
<repositoryLocation>$values{'hostname'}</repositoryLocation> |
|
<shortabstract>$values{'shortabstract'}</shortabstract> |
|
</LonCapaResource> |
|
</pre> |
</pre> |
$values{'extrashow'} |
$values{'extrashow'} |
<hr align='left' width='200' noshade /> |
<hr align='left' width='200' noshade /> |