--- loncom/interface/lonmeta.pm	2005/12/19 21:56:07	1.147
+++ loncom/interface/lonmeta.pm	2006/05/20 06:40:53	1.156
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.147 2005/12/19 21:56:07 albertel Exp $
+# $Id: lonmeta.pm,v 1.156 2006/05/20 06:40:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,7 +71,7 @@ sub get_dynamic_metadata_from_sql {
     if (! defined($authordom) || ! defined($author)) {
         return ();
     }
-    my @Fields = ('url','count','course',
+    my @Fields = ('url','count','course','course_list',
                   'goto','goto_list',
                   'comefrom','comefrom_list',
                   'sequsage','sequsage_list',
@@ -248,8 +248,13 @@ sub fieldnames {
          'notes' => 'Notes',
          'abstract' => 'Abstract',
          'lowestgradelevel' => 'Lowest Grade Level',
-         'highestgradelevel' => 'Highest Grade Level',
-         'courserestricted' => 'Course Restricting Metadata');
+         'highestgradelevel' => 'Highest Grade Level');
+    
+    if (! defined($file_type) || $file_type ne 'portfolio') {
+        %fields = 
+	    (%fields,
+	     'courserestricted' => 'Course Restricting Metadata');
+    }
          
     if (! defined($file_type) || $file_type ne 'portfolio') {
         %fields = 
@@ -291,36 +296,61 @@ sub fieldnames {
 }
 
 sub portfolio_linked_path {
-    my ($path) = @_;
-    my $result = &Apache::portfolio::make_anchor('portfolio','/');
+    my ($path,$group,$port_path) = @_;
+
+    my $start = 'portfolio';
+    if ($group) {
+	$start = "groups/$group/".$start;
+    }
+    my $result = &Apache::portfolio::make_anchor($port_path,$start,'/',
+						 undef,undef,undef,$group);
+    
     my $fullpath = '/';
     my (undef,@tree) = split('/',$path);
     my $filename = pop(@tree);
     foreach my $dir (@tree) {
 	$fullpath .= $dir.'/';
 	$result .= '/';
-	$result .= &Apache::portfolio::make_anchor($dir,$fullpath);
+	$result .= &Apache::portfolio::make_anchor($port_path,$dir,$fullpath,
+						   undef,undef,undef,$group);
     }
     $result .= "/$filename";
     return $result;
 }
 
+sub get_port_path_and_group {
+    my ($uri)=@_;
+
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+
+    my ($port_path,$group);
+    if ($uri =~ m{^/editupload/\Q$cdom\E/\Q$cnum\E/groups/}) {
+	$group = (split('/',$uri))[5];
+	$port_path = '/adm/coursegrp_portfolio';
+    } else {
+	$port_path = '/adm/portfolio';
+    }
+    return ($port_path,$group);
+}
+
 sub portfolio_display_uri {
     my ($uri,$as_links)=@_;
+
+    my ($port_path,$group) = &get_port_path_and_group($uri);
+
     $uri =~ s|.*/(portfolio/.*)$|$1|;
     my ($res_uri,$meta_uri) = ($uri,$uri);
-
     if ($uri =~ /\.meta$/) {
 	$res_uri =~ s/\.meta//;
     } else {
 	$meta_uri .= '.meta';
     }
 
-    my ($path) = ($res_uri =~ m|(.*)/[^/]*$|);
-
+    my ($path) = ($res_uri =~ m|^portfolio(.*/)[^/]*$|);
     if ($as_links) {
-	$res_uri = &portfolio_linked_path($res_uri);
-	$meta_uri = &portfolio_linked_path($meta_uri);
+	$res_uri = &portfolio_linked_path($res_uri,$group,$port_path);
+	$meta_uri = &portfolio_linked_path($meta_uri,$group,$port_path);
     }
     return ($res_uri,$meta_uri,$path);
 }
@@ -345,44 +375,41 @@ sub pre_select_course {
                   &mt('Associate Resource With Selected Course').'">');
     $r->print('</form>');
     
-    $r->print('<br /><br /><form method="POST" action="/adm/portfolio">'.
+    my ($port_path,$group) = &get_port_path_and_group($uri);
+    $r->print('<br /><br /><form method="POST" action="'.$port_path.'">'.
               '<input type="hidden" name="currentpath" value="'.$path.'" />'.
+	      '<input type="hidden" name="group" value="'.$group.'" />'.
 	      '<input type="submit" name="cancel" value="'.&mt('Cancel').'">'.
 	      '</form>');
 
     return;
 }
 sub select_course {
-    my %courses;
-    my $output;
-    my $selected;
-    foreach my $key (keys(%env)) { 
-        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 = '';
-    }
+    my $output=$/;
+    my $current_restriction=
+	$Apache::lonpublisher::metadatafields{'courserestricted'};
+    my $selected = ($current_restriction eq 'none' ? 'selected="selected"' 
+		                                   : '');
+
     $output .= '<select name="new_courserestricted" >';
-    $output .= '<option value="none" '.$selected.'>None</option>';
-    foreach my $key (keys (%courses)) {    
-        $key =~ m/(^.+)\.description$/;
-        if ($Apache::lonpublisher::metadatafields{'courserestricted'} eq $1) {
-            $selected = ' SELECTED ';
-        } else {
-            $selected = '';
-        }
-        $output .= '<option value="'.$1.'"'.$selected.'>';
-        $output .= $courses{$key};
-        $output .= '</option>';
+    $output .= '<option value="none" '.$selected.'>'.
+	&mt('None').'</option>'.$/;
+    my %courses;
+    foreach my $key (keys(%env)) {
+        if ($key !~ m/^course\.(.+)\.description$/) { next; }
+	my $cid = $1;
+        if ($env{$key} !~ /\S/) { next; }
+	$courses{$key} = $cid;
+    }
+    foreach my $key (sort { lc($env{$a}) cmp lc($env{$b}) } (keys(%courses))) {
+	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 />';
     return ($output);
@@ -447,7 +474,7 @@ sub prettyprint {
 	($type eq 'comefrom_list') ||
 	($type eq 'sequsage_list') ||
 	($type eq 'dependencies')) {
-	return '<ul><font size="-1">'.join("\n",map {
+	return '<font size="-1"><ul>'.join("\n",map {
             my $url = &Apache::lonnet::clutter($_);
             my $title = &Apache::lonnet::gettitle($url);
             if ($title eq '') {
@@ -484,18 +511,19 @@ sub prettyprint {
     # List of courses
     if ($type=~/\_list/) {
         my @Courses = split(/\s*\,\s*/,$value);
-        my $Str;
+        my $Str='<font size="-1"><ul>';
         foreach my $course (@Courses) {
-            my %courseinfo = &Apache::lonnet::coursedescription($course);
+            my %courseinfo =
+		&Apache::lonnet::coursedescription($course,
+						   {'one_time' => 1});
             if (! exists($courseinfo{'num'}) || $courseinfo{'num'} eq '') {
                 next;
             }
-            if ($Str ne '') { $Str .= '<br />'; }
-            $Str .= '<a href="/public/'.$courseinfo{'domain'}.'/'.
+            $Str .= '<li><a href="/public/'.$courseinfo{'domain'}.'/'.
                 $courseinfo{'num'}.'/syllabus" target="preview">'.
-                $courseinfo{'description'}.'</a>';
+                $courseinfo{'description'}.'</a></li>';
         }
-	return $Str;
+	return $Str.'</ul></font>';
     }
     # No pretty print found
     return $value;
@@ -544,7 +572,8 @@ sub prettyinput {
         $size = 80;
     }
     my $output;
-    if (defined($course_key)) {
+    if (defined($course_key) 
+	&& exists($env{$course_key.'.metadata.'.$type.'.options'})) {
         my $stu_add;
         my $only_one;
         my %meta_options;
@@ -701,19 +730,17 @@ sub handler {
     #
     my ($resdomain,$resuser)=
         (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);
-    my $html=&Apache::lonxml::xmlbegin();
-    $r->print($html.'<head><title>'.
-              'Catalog Information'.
-              '</title></head>');
+
     if ($uri=~m:/adm/bombs/(.*)$:) {
-        $r->print(&Apache::loncommon::bodytag('Error Messages'));
+        $r->print(&Apache::loncommon::start_page('Error Messages'));
         # Looking for all bombs?
         &report_bombs($r,$uri);
     } elsif ($uri=~/\/portfolio\//) {
 	    ($resdomain,$resuser)=
 	    (&Apache::lonnet::declutter($uri)=~m|^(\w+)/(\w+)/portfolio|);
-        $r->print(&Apache::loncommon::bodytag
-          ('Edit Portfolio File Information','','','',$resdomain));
+        $r->print(&Apache::loncommon::start_page('Edit Portfolio File Catalog Information',
+						 undef,
+						 {'domain' => $resdomain,}));
         if ($env{'form.store'}) {
             &present_editable_metadata($r,$uri,'portfolio');
         } else {
@@ -721,15 +748,17 @@ sub handler {
         }
     } elsif ($uri=~/^\/\~/) { 
         # Construction space
-        $r->print(&Apache::loncommon::bodytag
-                  ('Edit Catalog Information','','','',$resdomain));
+        $r->print(&Apache::loncommon::start_page('Edit Catalog nformation',
+						 undef,
+						 {'domain' => $resdomain,}));
         &present_editable_metadata($r,$uri);
     } else {
-        $r->print(&Apache::loncommon::bodytag
-		  ('Catalog Information','','','',$resdomain));
+        $r->print(&Apache::loncommon::start_page('Catalog Information',
+						 undef,
+						 {'domain' => $resdomain,}));
         &present_uneditable_metadata($r,$uri);
     }
-    $r->print('</body></html>');
+    $r->print(&Apache::loncommon::end_page());
     return OK;
 }
 
@@ -793,6 +822,7 @@ sub present_uneditable_metadata {
     my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
     $uri=~s/\.meta$//;
     my $disuri=&Apache::lonnet::clutter($uri);
+    $disuri=~s/^\/adm\/wrapper//;
     # version
     my $currentversion=&Apache::lonnet::getversion($disuri);
     my $versiondisplay='';
@@ -943,7 +973,9 @@ sub print_dynamic_metadata {
             foreach my $identifier (sort(keys(%{$dynmeta{'stats'}}))) {
                 my $data = $dynmeta{'stats'}->{$identifier};
                 my $course = $data->{'course'};
-                my %courseinfo = &Apache::lonnet::coursedescription($course);
+                my %courseinfo = 
+		    &Apache::lonnet::coursedescription($course,
+						       {'one_time' => 1});
                 if (! exists($courseinfo{'num'}) || $courseinfo{'num'} eq '') {
                     &Apache::lonnet::logthis('lookup for '.$course.' failed');
                     next;
@@ -1068,7 +1100,7 @@ sub present_editable_metadata {
     # Header
     my $disuri=$uri;
     my $fn=&Apache::lonnet::filelocation('',$uri);
-    $disuri=~s/^\/\~/\/priv\//;
+    $disuri=~s{^/\~}{/priv/};
     $disuri=~s/\.meta$//;
     my $meta_uri = $disuri;
     my $path;
@@ -1076,7 +1108,7 @@ sub present_editable_metadata {
 	($disuri, $meta_uri, $path) =  &portfolio_display_uri($disuri,1);
     }
     my $target=$uri;
-    $target=~s/^\/\~/\/res\/$env{'request.role.domain'}\//;
+    $target=~s{^/\~}{/res/$env{'request.role.domain'}/};
     $target=~s/\.meta$//;
     my $bombs=&Apache::lonmsg::retrieve_author_res_msg($target);
     if ($bombs) {
@@ -1164,19 +1196,22 @@ ENDEDIT
                 $Apache::lonpublisher::metadatafields{'copyright'}=
                 'default';
         }
-        if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
-            $r->print(&mt('Associated with course [_1]','<strong>'.$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.".description"}.
-                        '</strong>').'<br />');
-        } else {
-            $r->print("This resource is not associated with a course.<br />");
-        }
+	if ($file_type eq 'portfolio') {
+	    if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
+		$r->print(&mt('Associated with course [_1]','<strong>'.$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.".description"}.
+			      '</strong>').'<br />');
+	    } else {
+		$r->print("This resource is not associated with a course.<br />");
+	    }
+	}
         foreach my $field_name (@fields) {
 
             if (defined($env{'form.new_'.$field_name})) {
                 $Apache::lonpublisher::metadatafields{$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
                 if (($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/active/) ||
                     ($field_name eq 'courserestricted')){
@@ -1260,12 +1295,16 @@ ENDEDIT
 	$r->print($output.'<br /><input type="submit" name="store" value="'.
                   &mt('Store Catalog Information').'">');
 
-         $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').'">');
-
+	if ($file_type eq 'portfolio') {
+	    my ($port_path,$group) = &get_port_path_and_group($uri);
+	    $r->print('</form>
+               <br /><br /><form method="POST" action="'.$port_path.'">'.
+		      '<input type="hidden" name="group" value="'.$group.'" />'.
+		      '<input type="hidden" name="currentpath" value="'.$path.'" />'.
+		      '<input type="submit" name="cancel" value="'.&mt('Discard Edits and Return to Portfolio').'">');
+	}
     }
+    
     $r->print('</form>');
 
     return;