version 1.282, 2007/03/12 17:09:23
|
version 1.287, 2007/06/15 23:29:17
|
Line 379 END
|
Line 379 END
|
$errorstring); |
$errorstring); |
|
|
my $msg = |
my $msg = |
'Unable to create table in which to store search results. '. |
'Unable to create table in which to save search results. '. |
'The search has been aborted.'; |
'The search has been aborted.'; |
&Apache::loncommon::simple_error_page($r,'Search Error', |
&Apache::loncommon::simple_error_page($r,'Search Error', |
$msg); |
$msg); |
Line 388 END
|
Line 388 END
|
delete($env{'form.launch'}); |
delete($env{'form.launch'}); |
if (! &make_form_data_persistent($r,$persistent_db_file)) { |
if (! &make_form_data_persistent($r,$persistent_db_file)) { |
my $msg= |
my $msg= |
'Unable to properly store search information. '. |
'Unable to properly save search information. '. |
'The search has been aborted.'; |
'The search has been aborted.'; |
&Apache::loncommon::simple_error_page($r,'Search Error', |
&Apache::loncommon::simple_error_page($r,'Search Error', |
$msg); |
$msg); |
Line 764 sub setup_basic_search {
|
Line 764 sub setup_basic_search {
|
'&launch='.$env{'form.launch'}. |
'&launch='.$env{'form.launch'}. |
'&mode='.$env{'form.mode'}. |
'&mode='.$env{'form.mode'}. |
'&area='.$area. |
'&area='.$area. |
|
'&form='.$env{'form.form'}. |
|
'&titleelement='.$env{'form.titleelement'}. |
|
'&element='.$env{'form.element'}. |
'">'.&mt('Advanced Search').'</a>'; |
'">'.&mt('Advanced Search').'</a>'; |
# |
# |
$scrout.='<form name="loncapa_search" method="post" '. |
$scrout.='<form name="loncapa_search" method="post" '. |
Line 987 ENDHEADER
|
Line 990 ENDHEADER
|
description=>'Network-wide number of accesses (hits)',}, |
description=>'Network-wide number of accesses (hits)',}, |
{ name=>'stdno', |
{ name=>'stdno', |
description=> |
description=> |
'Total number of students who have worked on this problem',}, |
'Statistics calculated for number of students',}, |
{ name => 'avetries', |
{ name => 'avetries', |
description=>'Average number of tries till solved',}, |
description=>'Average number of tries till solved',}, |
{ name => 'difficulty', |
{ name => 'difficulty', |
Line 1392 sub parse_advanced_search {
|
Line 1395 sub parse_advanced_search {
|
'lastrevisiondatestart_month','lastrevisiondatestart_day', |
'lastrevisiondatestart_month','lastrevisiondatestart_day', |
'lastrevisiondatestart_year','lastrevisiondateend_month', |
'lastrevisiondatestart_year','lastrevisiondateend_month', |
'lastrevisiondateend_day','lastrevisiondateend_year') { |
'lastrevisiondateend_day','lastrevisiondateend_year') { |
$env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
$env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\'.]//g; |
} |
} |
foreach ('mode','form','element') { |
foreach ('mode','form','element') { |
# is this required? Hmmm. |
# is this required? Hmmm. |
Line 1855 sub process_phrase_input {
|
Line 1858 sub process_phrase_input {
|
$item[1]; |
$item[1]; |
} |
} |
term: |
term: |
/[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E]+/ { |
/[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E\-]+/ { |
$item[1]; |
$item[1]; |
} |
} |
ENDGRAMMAR |
ENDGRAMMAR |
Line 2143 sub ensure_db_and_table {
|
Line 2146 sub ensure_db_and_table {
|
## |
## |
if (! defined($table) || $table eq '' || $table =~ /\D/ ) { |
if (! defined($table) || $table eq '' || $table =~ /\D/ ) { |
$r->print("Unable to retrieve search results. ". |
$r->print("Unable to retrieve search results. ". |
"Unable to determine the table results were stored in. ". |
"Unable to determine the table results were saved in. ". |
&Apache::loncommon::end_page()); |
&Apache::loncommon::end_page()); |
return undef; |
return undef; |
} |
} |
Line 2153 sub ensure_db_and_table {
|
Line 2156 sub ensure_db_and_table {
|
my $connection_result = &Apache::lonmysql::connect_to_db(); |
my $connection_result = &Apache::lonmysql::connect_to_db(); |
if (!defined($connection_result)) { |
if (!defined($connection_result)) { |
$r->print("Unable to connect to the MySQL database where your results". |
$r->print("Unable to connect to the MySQL database where your results". |
" are stored.". |
" are saved.". |
&Apache::loncommon::end_page()); |
&Apache::loncommon::end_page()); |
&Apache::lonnet::logthis("lonsearchcat: unable to get lonmysql to". |
&Apache::lonnet::logthis("lonsearchcat: unable to get lonmysql to". |
" connect to database."); |
" connect to database."); |
Line 2519 END
|
Line 2522 END
|
# Check on the mysql table we will use to store results. |
# 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 save search results in.". |
"The search has been aborted.". |
"The search has been aborted.". |
&Apache::loncommon::end_page()); |
&Apache::loncommon::end_page()); |
return; |
return; |
Line 2757 sub display_results {
|
Line 2760 sub display_results {
|
if ($env{'form.catalogmode'} eq 'import') { |
if ($env{'form.catalogmode'} eq 'import') { |
if (! tie(%groupsearch_db,'GDBM_File',$diropendb, |
if (! tie(%groupsearch_db,'GDBM_File',$diropendb, |
&GDBM_WRCREAT(),0640)) { |
&GDBM_WRCREAT(),0640)) { |
$r->print('Unable to store import results.</form>'. |
$r->print('Unable to save import results.</form>'. |
&Apache::loncommon::end_page()); |
&Apache::loncommon::end_page()); |
$r->rflush(); |
$r->rflush(); |
return; |
return; |
Line 2994 sub catalogmode_output {
|
Line 2997 sub catalogmode_output {
|
$title=~ s/\'/\\\'/g; |
$title=~ s/\'/\\\'/g; |
if ($env{'form.catalogmode'} eq 'interactive') { |
if ($env{'form.catalogmode'} eq 'interactive') { |
$output.=<<END |
$output.=<<END |
<font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT" |
<font size='-1'><input type="button" name="returnvalues" value="select" |
onClick="javascript:select_data('$title','$url')"> |
onClick="javascript:select_data('$title','$url')" /> |
</font> |
</font> |
END |
END |
} |
} |
Line 3004 END
|
Line 3007 END
|
$groupsearch_db{"pre_${fnum}_title"}=$title; |
$groupsearch_db{"pre_${fnum}_title"}=$title; |
$output.=<<END; |
$output.=<<END; |
<font size='-1'> |
<font size='-1'> |
<input type="checkbox" name="returnvalues" value="SELECT" |
<input type="checkbox" name="returnvalues" value="select" |
onClick="javascript:queue($checkbox_num,$fnum)" /> |
onClick="javascript:queue($checkbox_num,$fnum)" /> |
</font> |
</font> |
END |
END |
Line 3441 sub detailed_citation_view {
|
Line 3444 sub detailed_citation_view {
|
if (exists($field->{'type'}) && $field->{'type'} eq 'list') { |
if (exists($field->{'type'}) && $field->{'type'} eq 'list') { |
$result .= '<b>'.&mt($field->{'translate'}).'</b>'; |
$result .= '<b>'.&mt($field->{'translate'}).'</b>'; |
foreach my $item (split(',',$values{$field->{'name'}})){ |
foreach my $item (split(',',$values{$field->{'name'}})){ |
$result .= |
$item = &Apache::lonnet::clutter($item); |
&Apache::lonhtmlcommon::crumbs(&Apache::lonnet::clutter($item), |
$result .= &display_url($item,[2,0,1]); |
'preview', |
|
'', |
|
(($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),2,0,1); |
|
} |
} |
} elsif (exists($field->{'format'}) && $field->{'format'} ne ''){ |
} elsif (exists($field->{'format'}) && $field->{'format'} ne ''){ |
$result.= &mt($field->{'translate'}, |
$result.= &mt($field->{'translate'}, |
Line 3453 sub detailed_citation_view {
|
Line 3453 sub detailed_citation_view {
|
$values{$field->{'name'}}))."<br />\n"; |
$values{$field->{'name'}}))."<br />\n"; |
} else { |
} else { |
if ($field->{'special'} eq 'url link') { |
if ($field->{'special'} eq 'url link') { |
if ($jumpurl=~/^http\:\/\//) { |
$result .= &display_url($jumpurl,[3,0,1]); |
$result.='<tt>'.$jumpurl.'</tt>'; |
|
} else { |
|
$result .= |
|
&Apache::lonhtmlcommon::crumbs($jumpurl, |
|
'preview', |
|
'', |
|
(($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),3,0,1); |
|
} |
|
} else { |
} else { |
$result.= &mt($field->{'translate'}, |
$result.= &mt($field->{'translate'}, |
$values{$field->{'name'}}); |
$values{$field->{'name'}}); |
Line 3517 sub summary_view {
|
Line 3509 sub summary_view {
|
$result .= ' '.$tmp.' '; |
$result .= ' '.$tmp.' '; |
} |
} |
my $jumpurl=$values{'url'}; |
my $jumpurl=$values{'url'}; |
my $link; |
$jumpurl=~s|^/ext/|http://|; |
if ($jumpurl=~m|^/ext/|) { |
my $link = &display_url($jumpurl,[2,0,1]); |
$jumpurl=~s|^/ext/|http://|; |
|
$link='<br /><tt>'.$jumpurl.'</tt>'; |
|
} else { |
|
$link=&Apache::lonhtmlcommon::crumbs($jumpurl, |
|
'preview', |
|
'', |
|
(($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),2,0,1); |
|
} |
|
$result.=<<END; |
$result.=<<END; |
<a href="$jumpurl" |
<a href="$jumpurl" |
target='preview'>$values{'title'}</a>$link |
target='preview'>$values{'title'}</a> <br /> |
|
$link <br /> |
$values{'author'}, $values{'owner'} -- $values{'lastrevisiondate'}<br /> |
$values{'author'}, $values{'owner'} -- $values{'lastrevisiondate'}<br /> |
$values{'copyrighttag'}<br /> |
$values{'copyrighttag'}<br /> |
$values{'extrashow'} |
$values{'extrashow'} |
Line 3562 sub summary_preview {
|
Line 3548 sub summary_preview {
|
sub compact_view { |
sub compact_view { |
my ($prefix,%values) = @_; |
my ($prefix,%values) = @_; |
my $jumpurl=$values{'url'}; |
my $jumpurl=$values{'url'}; |
my $link; |
$jumpurl=~s|^/ext/|http://|; |
if ($jumpurl=~m|^/ext/|) { |
|
$jumpurl=~s|^/ext/|http://|; |
my $link = &display_url($jumpurl,[1,1,1]); |
$link='<tt>'.$jumpurl.'</tt>'; |
|
} else { |
|
$link=&Apache::lonhtmlcommon::crumbs($jumpurl, |
|
'preview', |
|
'', |
|
(($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),1,1,1).' '; |
|
} |
|
my $result = |
my $result = |
$prefix.'<img src="'.&Apache::loncommon::icon($values{'url'}).'">'; |
$prefix.'<img src="'.&Apache::loncommon::icon($values{'url'}).'">'; |
if (exists($env{'form.sortfield'}) && |
if (exists($env{'form.sortfield'}) && |
Line 3580 sub compact_view {
|
Line 3560 sub compact_view {
|
if (! defined($tmp)) { $tmp = 'undefined'; } |
if (! defined($tmp)) { $tmp = 'undefined'; } |
$result .= ' '.$tmp.' '; |
$result .= ' '.$tmp.' '; |
} |
} |
$result.=' <a href="'.$jumpurl.'" target="preview">'. |
$jumpurl = &HTML::Entities::encode($jumpurl,'<>&"'); |
$values{'title'}.'</a>'.(' 'x2).$link. |
$result.=' <span class="LC_nobreak">'. |
'<b>'.$values{'author'}.'</b> ('.$values{'domain'}.')<br />'; |
'<a href="'.$jumpurl.'" target="preview">'. |
|
&HTML::Entities::encode($values{'title'},'<>&"').'</a></span> '. |
|
$link.' <b>'.$values{'author'}.'</b> ('.$values{'domain'}.')<br />'; |
return $result; |
return $result; |
} |
} |
|
|
|
sub display_url { |
|
my ($url,$crumb_args) = @_; |
|
my $link; |
|
if ($url=~m|^/ext/|) { |
|
$url=~s|^/ext/|http://|; |
|
$link='<span class="LC_filename">'.$url.'</span>'; |
|
} elsif ($url=~m{^(http://|/uploaded/)}) { |
|
$link='<span class="LC_filename">'.$url.'</span>'; |
|
} else { |
|
$link=&Apache::lonhtmlcommon::crumbs($url, |
|
'preview', |
|
'', |
|
(($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),@{$crumb_args}).' '; |
|
} |
|
return $link; |
|
} |
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |