version 1.282, 2007/03/12 17:09:23
|
version 1.296, 2008/07/15 16:18:41
|
Line 138 sub handler {
|
Line 138 sub handler {
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
['catalogmode','launch','acts','mode','form','element','pause', |
['catalogmode','launch','acts','mode','form','element','pause', |
'phase','persistent_db_id','table','start','show', |
'phase','persistent_db_id','table','start','show', |
'cleargroupsort','titleelement','area']); |
'cleargroupsort','titleelement','area','inhibitmenu']); |
## |
## |
## The following is a trick - we wait a few seconds if asked to so |
## The following is a trick - we wait a few seconds if asked to so |
## the daemon running the search can get ahead of the daemon |
## the daemon running the search can get ahead of the daemon |
Line 190 sub handler {
|
Line 190 sub handler {
|
} |
} |
&Apache::lonhtmlcommon::add_breadcrumb |
&Apache::lonhtmlcommon::add_breadcrumb |
({href=>'/adm/searchcat?'. |
({href=>'/adm/searchcat?'. |
'catalogmode='.$env{'form.catalogmode'}. |
&Apache::loncommon::inhibit_menu_check(). |
|
'&catalogmode='.$env{'form.catalogmode'}. |
'&launch='.$env{'form.launch'}. |
'&launch='.$env{'form.launch'}. |
'&mode='.$env{'form.mode'}, |
'&mode='.$env{'form.mode'}, |
text=>"$crumb_text", |
text=>"$crumb_text", |
Line 258 sub handler {
|
Line 259 sub handler {
|
if (exists($env{'form.area'})) { |
if (exists($env{'form.area'})) { |
$hidden_fields .= &hidden_field('area'); |
$hidden_fields .= &hidden_field('area'); |
} |
} |
|
if (exists($env{'form.inhibitmenu'})) { |
|
$hidden_fields .= &hidden_field('inhibitmenu'); |
|
} |
## |
## |
## Configure dynamic components of interface |
## Configure dynamic components of interface |
## |
## |
if ($env{'form.catalogmode'} eq 'interactive') { |
if ($env{'form.catalogmode'} eq 'interactive') { |
$closebutton="<input type='button' name='close' value='CLOSE' "; |
$closebutton="<input type='button' name='close' value='".&mt('CLOSE')."' "; |
if ($env{'form.phase'} =~ /(results|run_search)/) { |
if ($env{'form.phase'} =~ /(results|run_search)/) { |
$closebutton .="onClick='parent.close()'"; |
$closebutton .="onClick='parent.close()'"; |
} else { |
} else { |
Line 270 sub handler {
|
Line 274 sub handler {
|
} |
} |
$closebutton .=">\n"; |
$closebutton .=">\n"; |
} elsif ($env{'form.catalogmode'} eq 'import') { |
} elsif ($env{'form.catalogmode'} eq 'import') { |
$closebutton="<input type='button' name='close' value='CLOSE' "; |
$closebutton="<input type='button' name='close' value='".&mt('CLOSE')."' "; |
if ($env{'form.phase'} =~ /(results|run_search)/) { |
if ($env{'form.phase'} =~ /(results|run_search)/) { |
$closebutton .="onClick='parent.close()'"; |
$closebutton .="onClick='parent.close()'"; |
} else { |
} else { |
Line 308 END
|
Line 312 END
|
$srchtype = 'Portfolio'; |
$srchtype = 'Portfolio'; |
} |
} |
&Apache::lonhtmlcommon::add_breadcrumb |
&Apache::lonhtmlcommon::add_breadcrumb |
({href=>'/adm/searchcat?phase=disp_adv&'. |
({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check(). |
'catalogmode='.$env{'form.catalogmode'}. |
'&phase=disp_adv'. |
|
'&catalogmode='.$env{'form.catalogmode'}. |
'&launch='.$env{'form.launch'}. |
'&launch='.$env{'form.launch'}. |
'&mode='.$env{'form.mode'}, |
'&mode='.$env{'form.mode'}, |
text=>"Advanced $srchtype Search", |
text=>"Advanced $srchtype Search", |
bug=>'Searching',}); |
bug=>'Searching',}); |
} elsif ($env{'form.searchmode'} eq 'course search') { |
} elsif ($env{'form.searchmode'} eq 'course search') { |
&Apache::lonhtmlcommon::add_breadcrumb |
&Apache::lonhtmlcommon::add_breadcrumb |
({href=>'/adm/searchcat?phase=disp_adv&'. |
({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check(). |
|
'&phase=disp_adv'. |
'catalogmode='.$env{'form.catalogmode'}. |
'catalogmode='.$env{'form.catalogmode'}. |
'&launch='.$env{'form.launch'}. |
'&launch='.$env{'form.launch'}. |
'&mode='.$env{'form.mode'}, |
'&mode='.$env{'form.mode'}, |
Line 379 END
|
Line 385 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 394 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 753 sub setup_basic_search {
|
Line 759 sub setup_basic_search {
|
$r->dir_config('lonDefDomain')), |
$r->dir_config('lonDefDomain')), |
$r->dir_config('lonDefDomain')). |
$r->dir_config('lonDefDomain')). |
'</label>'; |
'</label>'; |
if ($area eq 'res') { |
|
$inclext= '<label>'.&mt('[_1] include external resources', |
|
&Apache::lonhtmlcommon::checkbox('inclext',$env{'form.inclext'})). |
|
'</label>'; |
|
} |
|
$adv_search_link = '<a href="/adm/searchcat?'. |
$adv_search_link = '<a href="/adm/searchcat?'. |
'phase=disp_adv&'. |
&Apache::loncommon::inhibit_menu_check(). |
'catalogmode='.$env{'form.catalogmode'}. |
'&phase=disp_adv'. |
|
'&catalogmode='.$env{'form.catalogmode'}. |
'&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 858 ENDHEADER
|
Line 863 ENDHEADER
|
'<input type="hidden" name="phase" value="adv_search" />'; |
'<input type="hidden" name="phase" value="adv_search" />'; |
my %fields=&Apache::lonmeta::fieldnames(); |
my %fields=&Apache::lonmeta::fieldnames(); |
# |
# |
$scrout .= '<h3>'.&mt('Standard [_1] Metadata',$srchtype).'</h3>'; |
$scrout .= '<h3>'.&mt("Standard $srchtype Metadata").'</h3>'; |
$scrout .= "<table>\n"; |
$scrout .= "<table>\n"; |
$scrout .= '<tr><td> </td><td colspan="2"><font size="-1">'. |
$scrout .= '<tr><td> </td><td colspan="2"><font size="-1">'. |
(' 'x2).&searchhelp()."</font></td></tr>\n"; |
(' 'x2).&searchhelp()."</font></td></tr>\n"; |
Line 889 ENDHEADER
|
Line 894 ENDHEADER
|
$env{'form.'.$field.'_related'}, |
$env{'form.'.$field.'_related'}, |
50); |
50); |
if ($related_word_search{$field}) { |
if ($related_word_search{$field}) { |
$scrout .= 'related words'; |
$scrout .= &mt('related words'); |
} else { |
} else { |
$scrout .= '</td><td> '; |
$scrout .= '</td><td> '; |
} |
} |
Line 916 ENDHEADER
|
Line 921 ENDHEADER
|
&Apache::loncommon::domain_select('domains', |
&Apache::loncommon::domain_select('domains', |
$env{'form.domains'},1). |
$env{'form.domains'},1). |
'<br /><label>'; |
'<br /><label>'; |
if ($env{'form.area'} ne 'portfolio') { |
|
$scrout .= &mt('[_1] include external resources', |
|
&Apache::lonhtmlcommon::checkbox |
|
('inclext',$env{'form.inclext'})).'</label>' |
|
} |
|
$scrout .= '</td></tr>'.$/; |
$scrout .= '</td></tr>'.$/; |
# |
# |
# Misc metadata |
# Misc metadata |
Line 987 ENDHEADER
|
Line 987 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 1034 ENDHEADER
|
Line 1034 ENDHEADER
|
# Creation/Modification date limits |
# Creation/Modification date limits |
$scrout .= '<h3>'.&mt('Creation and Modification dates').'</h3>'; |
$scrout .= '<h3>'.&mt('Creation and Modification dates').'</h3>'; |
$scrout .= "\n<table>\n"; |
$scrout .= "\n<table>\n"; |
|
$scrout .= "<tr><td> </td><td>".&mt('Month[_1]Day[_2]Year',' 'x14,' 'x6)."</td></tr>\n"; |
my $cafter = |
my $cafter = |
&Apache::lonhtmlcommon::date_setter('advsearch', # formname |
&Apache::lonhtmlcommon::date_setter('advsearch', # formname |
'creationdate1', # fieldname |
'creationdate1', # fieldname |
Line 1052 ENDHEADER
|
Line 1053 ENDHEADER
|
'', # state |
'', # state |
1, # no_hh_mm_ss |
1, # no_hh_mm_ss |
); |
); |
$scrout .= &mt('<tr><td align="right">Created between</td>'. |
$scrout .= '<tr><td align="right">'.&mt('Created between').'</td>' |
'<td>[_1]</td></tr>'. |
.'<td>'.$cafter.'</td></tr>' |
'<tr><td align="right">and </td>'. |
.'<tr><td align="right">'.&mt('and').'</td>' |
'<td>[_2]</td></tr>',$cafter,$cbefore); |
.'<td>'.$cbefore.'</td></tr>'; |
my $lafter = |
my $lafter = |
&Apache::lonhtmlcommon::date_setter('advsearch', |
&Apache::lonhtmlcommon::date_setter('advsearch', |
'revisiondate1', |
'revisiondate1', |
Line 1074 ENDHEADER
|
Line 1075 ENDHEADER
|
'', # state |
'', # state |
1, # no_hh_mm_ss |
1, # no_hh_mm_ss |
); |
); |
$scrout .= &mt('<tr><td align="right">Last modified between </td>'. |
$scrout .= '<tr><td align="right">'.&mt('Last modified between').'</td>' |
'<td>[_1]</td></tr>'. |
.'<td>'.$lafter.'</td></tr>' |
'<tr><td align="right">and</td>'. |
.'<tr><td align="right">'.&mt('and').'</td>' |
'<td>[_2]</td></tr>',$lafter,$lbefore); |
.'<td>'.$lbefore.'</td></tr>'; |
$scrout.="</table>\n"; |
$scrout.="</table>\n"; |
$scrout.=<<ENDDOCUMENT; |
$scrout.=<<ENDDOCUMENT; |
$advanced_buttons |
$advanced_buttons |
Line 1392 sub parse_advanced_search {
|
Line 1393 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 1856 sub process_phrase_input {
|
$item[1]; |
$item[1]; |
} |
} |
term: |
term: |
/[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E]+/ { |
/[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E\-]+/ { |
$item[1]; |
$item[1]; |
} |
} |
ENDGRAMMAR |
ENDGRAMMAR |
Line 2115 sub copyright_check {
|
Line 2116 sub copyright_check {
|
($env{'user.domain'} ne $resdom)) { |
($env{'user.domain'} ne $resdom)) { |
return 0; |
return 0; |
} |
} |
|
# Check for custom rights |
|
if ($Metadata->{'copyright'} eq 'custom') { |
|
return &Apache::lonnet::customaccess('bre',$Metadata->{'url'}); |
|
} |
return 1; |
return 1; |
} |
} |
|
|
Line 2143 sub ensure_db_and_table {
|
Line 2148 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 2158 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 2262 END
|
Line 2267 END
|
# } |
# } |
# $result.="</select>\n"; |
# $result.="</select>\n"; |
my $revise = &revise_button(); |
my $revise = &revise_button(); |
$result.=<<END; |
$result.='<p>' |
<p> |
.&mt('There are [_1] matches to your query.',$total_results) |
There are $total_results matches to your query. $revise |
.' '.$revise.'</p>' |
</p><p> |
.'<p>'.&mt('Search: ').$pretty_query_string |
Search: $pretty_query_string |
.'</p></form>'; |
</p> |
|
</form> |
|
END |
|
$r->print($result.&Apache::loncommon::end_page()); |
$r->print($result.&Apache::loncommon::end_page()); |
return; |
return; |
} |
} |
Line 2441 Returns: html string for a 'revise searc
|
Line 2443 Returns: html string for a 'revise searc
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub revise_button { |
sub revise_button { |
|
my $revisetext = &mt('Revise search'); |
my $revise_phase = 'disp_basic'; |
my $revise_phase = 'disp_basic'; |
$revise_phase = 'disp_adv' if ($env{'form.searchmode'} eq 'advanced'); |
$revise_phase = 'disp_adv' if ($env{'form.searchmode'} eq 'advanced'); |
my $newloc = '/adm/searchcat'. |
my $newloc = '/adm/searchcat'. |
'?persistent_db_id='.$env{'form.persistent_db_id'}. |
'?persistent_db_id='.$env{'form.persistent_db_id'}. |
'&cleargroupsort=1'. |
'&cleargroupsort=1'. |
'&phase='.$revise_phase; |
'&phase='.$revise_phase; |
my $result = qq{<input type="button" value="Revise search" name="revise"} . |
my $result = qq{<input type="button" value="$revisetext" name="revise"} . |
qq{ onClick="parent.location='$newloc';" /> }; |
qq{ onClick="parent.location='$newloc';" /> }; |
return $result; |
return $result; |
} |
} |
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 2635 END
|
Line 2638 END
|
my %Fields = &parse_raw_result($result,$server,$tabletype); |
my %Fields = &parse_raw_result($result,$server,$tabletype); |
$Fields{'hostname'} = $server; |
$Fields{'hostname'} = $server; |
# |
# |
# Skip if external and we did not want that |
|
next if ((! $env{'form.inclext'}) && ($Fields{'url'}=~/^\/ext\//)); |
|
# Skip based on copyright |
# Skip based on copyright |
next if (! ©right_check(\%Fields)); |
next if (! ©right_check(\%Fields)); |
|
|
Line 2757 sub display_results {
|
Line 2758 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 2995 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 3005 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 3231 function changeURL(val) {
|
Line 3232 function changeURL(val) {
|
SCRIPT |
SCRIPT |
} |
} |
} |
} |
|
my $inhibit_menu = "&".&Apache::loncommon::inhibit_menu_check(); |
$js.=<<SCRIPT if $env{'form.catalogmode'} eq 'import'; |
$js.=<<SCRIPT if $env{'form.catalogmode'} eq 'import'; |
<script type="text/javascript"> |
<script type="text/javascript"> |
function queue(checkbox_num,val) { |
function queue(checkbox_num,val) { |
Line 3251 SCRIPT
|
Line 3253 SCRIPT
|
} |
} |
function select_group() { |
function select_group() { |
parent.window.location= |
parent.window.location= |
"/adm/groupsort?mode=$env{'form.mode'}&catalogmode=import&acts="+ |
"/adm/groupsort?mode=$env{'form.mode'}&catalogmode=import$inhibit_menu&acts="+ |
parent.statusframe.document.forms.statusform.elements.acts.value; |
parent.statusframe.document.forms.statusform.elements.acts.value; |
} |
} |
</script> |
</script> |
Line 3374 sub detailed_citation_view {
|
Line 3376 sub detailed_citation_view {
|
$jumpurl=~s|^/ext/|http://|; |
$jumpurl=~s|^/ext/|http://|; |
$result .= '<b>'.$prefix. |
$result .= '<b>'.$prefix. |
'<img src="'.&Apache::loncommon::icon($values{'url'}).'" />'.' '. |
'<img src="'.&Apache::loncommon::icon($values{'url'}).'" />'.' '. |
'<a href="'.$jumpurl.'" '. |
'<a href="'.$jumpurl.'?inhibitmenu=yes" '. |
'target="preview">'.$values{'title'}."</a></b>\n"; |
'target="preview">'.$values{'title'}."</a></b>\n"; |
$result .= "<p>\n"; |
$result .= "<p>\n"; |
$result .= '<b>'.$values{'author'}.'</b>,'. |
$result .= '<b>'.$values{'author'}.'</b>,'. |
Line 3441 sub detailed_citation_view {
|
Line 3443 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 3452 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 3508 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?inhibitmenu=yes" |
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 3547 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 3559 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.'?inhibitmenu=yes" 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; |
|
} |
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
Line 3609 sub fielded_format_view {
|
Line 3606 sub fielded_format_view {
|
$prefix <img src="$icon" /> |
$prefix <img src="$icon" /> |
<dl> |
<dl> |
<dt>URL:</dt> |
<dt>URL:</dt> |
<dd><a href="$jumpurl" |
<dd><a href="$jumpurl?inhibitmenu=yes" |
target='preview'>$values{'url'}</a></dd> |
target='preview'>$values{'url'}</a></dd> |
END |
END |
foreach my $field ('title','author','domain','subject','keywords','notes', |
foreach my $field ('title','author','domain','subject','keywords','notes', |