loncom/interface/lonmeta.pm - diff

Return to lonmeta.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmeta.pm between versions 1.146 and 1.150

version 1.146, 2005/12/19 21:49:12	version 1.150, 2006/01/04 05:43:19
Line 248 sub fieldnames {	Line 248 sub fieldnames {
'notes' => 'Notes',	'notes' => 'Notes',
'abstract' => 'Abstract',	'abstract' => 'Abstract',
'lowestgradelevel' => 'Lowest Grade Level',	'lowestgradelevel' => 'Lowest Grade Level',
'highestgradelevel' => 'Highest Grade Level',	'highestgradelevel' => 'Highest Grade Level');
'courserestricted' => 'Course Restricting Metadata');
	if (! defined($file_type) \|\| $file_type ne 'portfolio') {
	%fields =
	(%fields,
	'courserestricted' => 'Course Restricting Metadata');
	}

if (! defined($file_type) \|\| $file_type ne 'portfolio') {	if (! defined($file_type) \|\| $file_type ne 'portfolio') {
%fields =	%fields =
Line 295 sub portfolio_linked_path {	Line 300 sub portfolio_linked_path {
my $result = &Apache::portfolio::make_anchor('portfolio','/');	my $result = &Apache::portfolio::make_anchor('portfolio','/');
my $fullpath = '/';	my $fullpath = '/';
my (undef,@tree) = split('/',$path);	my (undef,@tree) = split('/',$path);
	my $filename = pop(@tree);
foreach my $dir (@tree) {	foreach my $dir (@tree) {
$fullpath .= $dir.'/';	$fullpath .= $dir.'/';
$result .= '/';	$result .= '/';
$result .= &Apache::portfolio::make_anchor($dir,$fullpath);	$result .= &Apache::portfolio::make_anchor($dir,$fullpath);
}	}
	$result .= "/$filename";
return $result;	return $result;
}	}

Line 314 sub portfolio_display_uri {	Line 321 sub portfolio_display_uri {
$meta_uri .= '.meta';	$meta_uri .= '.meta';
}	}

my ($path) = ($res_uri =~ m\|(.)/[^/]$\|);	my ($path) = ($res_uri =~ m\|^portfolio(./)[^/]$\|);

if ($as_links) {	if ($as_links) {
$res_uri = &portfolio_linked_path($res_uri);	$res_uri = &portfolio_linked_path($res_uri);
Line 351 sub pre_select_course {	Line 358 sub pre_select_course {
return;	return;
}	}
sub select_course {	sub select_course {
my %courses;	my $output=$/;
my $output;	my $current_restriction=
my $selected;	$Apache::lonpublisher::metadatafields{'courserestricted'};
foreach my $key (keys(%env)) {	my $selected = ($current_restriction eq 'none' ? 'selected="selected"'
if ($key =~ m/\.metadata\./) {	: '');
$key =~ m/^course\.(.+)(\.metadata.+$)/;
my $course = $1;
my $coursekey = 'course.'.$course.'.description';
my $value = $env{$coursekey};
$courses{$coursekey} = $value;
}
}
my $meta_not_found = 1;
if ($Apache::lonpublisher::metadatafields{'courserestricted'} eq 'none') {
$selected = ' SELECTED ';
} else {
$selected = '';
}
$output .= '<select name="new_courserestricted" >';	$output .= '<select name="new_courserestricted" >';
$output .= '<option value="none" '.$selected.'>None</option>';	$output .= '<option value="none" '.$selected.'>'.
foreach my $key (keys (%courses)) {	&mt('None').'</option>'.$/;
$key =~ m/(^.+)\.description$/;	my %courses;
if ($Apache::lonpublisher::metadatafields{'courserestricted'} eq $1) {	foreach my $key (keys(%env)) {
$selected = ' SELECTED ';	if ($key !~ m/^course\.(.+)\.description$/) { next; }
} else {	my $cid = $1;
$selected = '';	if ($env{$key} !~ /\S/) { next; }
}	$courses{$key} = $cid;
$output .= '<option value="'.$1.'"'.$selected.'>';	}
$output .= $courses{$key};	foreach my $key (sort { lc($env{$a}) cmp lc($env{$b}) } (keys(%courses))) {
$output .= '</option>';	my $cid = 'course.'.$courses{$key};
	my $selected = ($current_restriction eq $cid ? 'selected="selected"'
	: '');
	if ($env{$key} !~ /\S/) { next; }
	$output .= '<option value="'.$cid.'" '.$selected.'>';
	$output .= $env{$key};
	$output .= '</option>'.$/;
	$selected = '';
}	}
$output .= '</select><br />';	$output .= '</select><br />';
return ($output);	return ($output);
Line 542 sub prettyinput {	Line 544 sub prettyinput {
$size = 80;	$size = 80;
}	}
my $output;	my $output;
if (defined($course_key)) {	if (defined($course_key)
	&& exists($env{$course_key.'.metadata.'.$type.'.options'})) {
my $stu_add;	my $stu_add;
my $only_one;	my $only_one;
my %meta_options;	my %meta_options;
Line 1069 sub present_editable_metadata {	Line 1072 sub present_editable_metadata {
$disuri=~s/^\/\~/\/priv\//;	$disuri=~s/^\/\~/\/priv\//;
$disuri=~s/\.meta$//;	$disuri=~s/\.meta$//;
my $meta_uri = $disuri;	my $meta_uri = $disuri;
	my $path;
if ($disuri =~ m\|/portfolio/\|) {	if ($disuri =~ m\|/portfolio/\|) {
($disuri, $meta_uri) = &portfolio_display_uri($disuri,1);	($disuri, $meta_uri, $path) = &portfolio_display_uri($disuri,1);
}	}
my $target=$uri;	my $target=$uri;
$target=~s/^\/\~/\/res\/$env{'request.role.domain'}\//;	$target=~s/^\/\~/\/res\/$env{'request.role.domain'}\//;
Line 1161 ENDEDIT	Line 1165 ENDEDIT
$Apache::lonpublisher::metadatafields{'copyright'}=	$Apache::lonpublisher::metadatafields{'copyright'}=
'default';	'default';
}	}
if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {	if ($file_type eq 'portfolio') {
$r->print(&mt('Associated with course [_1]','<strong>'.$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.".description"}.	if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
'</strong>').'<br />');	$r->print(&mt('Associated with course [_1]','<strong>'.$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.".description"}.
} else {	'</strong>').'<br />');
$r->print("This resource is not associated with a course.<br />");	} else {
}	$r->print("This resource is not associated with a course.<br />");
	}
	}
foreach my $field_name (@fields) {	foreach my $field_name (@fields) {

if (defined($env{'form.new_'.$field_name})) {	if (defined($env{'form.new_'.$field_name})) {
$Apache::lonpublisher::metadatafields{$field_name}=	$Apache::lonpublisher::metadatafields{$field_name}=
join(',',&Apache::loncommon::get_env_multiple('form.new_'.$field_name));	join(',',&Apache::loncommon::get_env_multiple('form.new_'.$field_name));
}	}
if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {	if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none'
	&& exists($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'})) {
# handle restrictions here	# handle restrictions here
if (($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/active/) \|\|	if (($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/active/) \|\|
($field_name eq 'courserestricted')){	($field_name eq 'courserestricted')){
Line 1256 ENDEDIT	Line 1263 ENDEDIT

$r->print($output.'<br /><input type="submit" name="store" value="'.	$r->print($output.'<br /><input type="submit" name="store" value="'.
&mt('Store Catalog Information').'">');	&mt('Store Catalog Information').'">');

	if ($file_type eq 'portfolio') {
	$r->print('</form>
	<br /><br /><form method="POST" action="/adm/portfolio">'.
	'<input type="hidden" name="currentpath" value="'.$path.'" />'.
	'<input type="submit" name="cancel" value="'.&mt('Discard Edits and Return to Portfolio').'">');
	}
}	}

$r->print('</form>');	$r->print('</form>');

return;	return;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.146
changed lines
	Added in v.1.150