version 1.291, 2008/02/14 18:04:09
|
version 1.300, 2008/10/16 22:58:15
|
Line 281 sub handler {
|
Line 281 sub handler {
|
$closebutton .="onClick='self.close()'"; |
$closebutton .="onClick='self.close()'"; |
} |
} |
$closebutton .= ">"; |
$closebutton .= ">"; |
|
my $txt_import = &mt('IMPORT'); |
$importbutton=<<END; |
$importbutton=<<END; |
<input type='button' name='import' value='IMPORT' |
<input type='button' name='import' value='$txt_import' |
onClick='javascript:select_group()'> |
onClick='javascript:select_group()'> |
END |
END |
} else { |
} else { |
Line 759 sub setup_basic_search {
|
Line 760 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?'. |
&Apache::loncommon::inhibit_menu_check(). |
&Apache::loncommon::inhibit_menu_check(). |
'&phase=disp_adv'. |
'&phase=disp_adv'. |
Line 926 ENDHEADER
|
Line 922 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 1044 ENDHEADER
|
Line 1035 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 - Day - Year)')."</td></tr>\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 1403 sub parse_advanced_search {
|
Line 1394 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 1648 sub parse_advanced_search {
|
Line 1639 sub parse_advanced_search {
|
# |
# |
if (@queries) { |
if (@queries) { |
if ($env{'form.area'} eq 'portfolio') { |
if ($env{'form.area'} eq 'portfolio') { |
$query ="SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa, portfolio_addedfields pf WHERE (pm.url = pa.url AND pf.url = pm.url AND (pa.start < NOW() AND (pa.end IS NULL OR pa.end > NOW())) AND (".join(') AND (',@queries).'))'; |
$query ="SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa, portfolio_addedfields pf WHERE (pm.url = pa.url AND pf.url = pm.url AND (pa.start < UTC_TIMESTAMP() AND (pa.end IS NULL OR pa.end > UTC_TIMESTAMP())) AND (".join(') AND (',@queries).'))'; |
} else { |
} else { |
$query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')'; |
$query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')'; |
} |
} |
Line 1711 sub parse_basic_search {
|
Line 1702 sub parse_basic_search {
|
# |
# |
# Clean up fields for safety |
# Clean up fields for safety |
for my $field ('basicexp') { |
for my $field ('basicexp') { |
$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 1750 sub parse_basic_search {
|
Line 1741 sub parse_basic_search {
|
#} |
#} |
my $final_query; |
my $final_query; |
if ($env{'form.area'} eq 'portfolio') { |
if ($env{'form.area'} eq 'portfolio') { |
$final_query = 'SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa WHERE (pm.url = pa.url AND (pa.start < NOW() AND (pa.end IS NULL OR pa.end > NOW())) AND '.join(" AND ",@Queries).')'; |
$final_query = 'SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa WHERE (pm.url = pa.url AND (pa.start < UTC_TIMESTAMP() AND (pa.end IS NULL OR pa.end > UTC_TIMESTAMP())) AND '.join(" AND ",@Queries).')'; |
} else { |
} else { |
$final_query = 'SELECT * FROM metadata WHERE '.join(" AND ",@Queries); |
$final_query = 'SELECT * FROM metadata WHERE '.join(" AND ",@Queries); |
} |
} |
Line 2126 sub copyright_check {
|
Line 2117 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 2494 sub run_search {
|
Line 2489 sub run_search {
|
$r->print(<<END); |
$r->print(<<END); |
$start_page |
$start_page |
$breadcrumbs |
$breadcrumbs |
<form name="statusform" action="" method="post"> |
|
<input type="hidden" name="acts" value="" /> |
|
END |
END |
# Remove leading and trailing <br /> |
# Remove leading and trailing <br /> |
$pretty_string =~ s:^\s*<br />::i; |
$pretty_string =~ s:^\s*<br />::i; |
Line 2506 END
|
Line 2499 END
|
pop(@Lines); |
pop(@Lines); |
} |
} |
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: [_1]",$pretty_string)); |
$r->print(&mt("Search: [_1]",$pretty_string)); |
$r->rflush(); |
$r->rflush(); |
Line 2561 END
|
Line 2554 END
|
my $server; |
my $server; |
my $status; |
my $status; |
my $revise = &revise_button(); |
my $revise = &revise_button(); |
$r->print(<<END); |
$r->print('<form name="statusform" action="" method="post">'."\n". |
<table> |
'<input type="hidden" name="acts" value="" />'."\n". |
<tr><th>Status</th><th>Total Matches</th><th>Time Remaining</th><th></th></tr> |
'<table border="0"><tr><td>'."\n". |
<tr> |
&Apache::loncommon::start_data_table()); |
<td><input type="text" name="status" value="" size="50" /></td> |
$r->print(&Apache::loncommon::start_data_table_header_row() |
<td><input type="text" name="count" value="" size="10" /></td> |
.'<th>'.&mt('Status').'</th>' |
<td><input type="text" name="seconds" value="" size="8" /></td> |
.'<th>'.&mt('Total Matches').'</th>' |
<td>$revise</td> |
.'<th>'.&mt('Time Remaining').'</th>' |
</tr> |
.&Apache::loncommon::end_data_table_header_row() |
</table> |
.&Apache::loncommon::start_data_table_row() |
</form> |
.'<td><input type="text" name="status" value="" size="50" readonly="readonly" /></td>' |
END |
.'<td><input type="text" name="count" value="" size="10" readonly="readonly" /></td>' |
|
.'<td><input type="text" name="seconds" value="" size="8" readonly="readonly" /></td>' |
|
.&Apache::loncommon::end_data_table_row() |
|
.&Apache::loncommon::end_data_table() |
|
.'</td><td> </td><td>'.$revise.'</td></tr></table></form>'); |
$r->rflush(); |
$r->rflush(); |
&reset_timing(); |
&reset_timing(); |
&update_seconds($r); |
&update_seconds($r); |
Line 2644 END
|
Line 2641 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)); |
|
|