--- loncom/interface/lonmeta.pm	2004/04/19 16:43:53	1.74
+++ loncom/interface/lonmeta.pm	2005/12/08 02:17:56	1.135
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.74 2004/04/19 16:43:53 matthew Exp $
+# $Id: lonmeta.pm,v 1.135 2005/12/08 02:17:56 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -17,7 +17,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License 
 # along with LON-CAPA; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
@@ -31,9 +31,9 @@ package Apache::lonmeta;
 use strict;
 use LONCAPA::lonmetadata();
 use Apache::Constants qw(:common);
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
-use Apache::lonhtmlcommon();
+use Apache::lonhtmlcommon(); 
 use Apache::lonmsg;
 use Apache::lonpublisher;
 use Apache::lonlocal;
@@ -41,6 +41,87 @@ use Apache::lonmysql;
 use Apache::lonmsg;
 
 
+############################################################
+############################################################
+##
+## &get_dynamic_metadata_from_sql($url)
+## 
+## Queries sql database for dynamic metdata
+## Returns a hash of hashes, with keys of urls which match $url
+## Returned fields are given below.
+##
+## Examples:
+## 
+## %DynamicMetadata = &Apache::lonmeta::get_dynmaic_metadata_from_sql
+##     ('/res/msu/korte/');
+##
+## $DynamicMetadata{'/res/msu/korte/example.problem'}->{$field}
+##
+############################################################
+############################################################
+sub get_dynamic_metadata_from_sql {
+    my ($url) = shift();
+    my ($authordom,$author)=($url=~m:^/res/(\w+)/(\w+)/:);
+    if (! defined($authordom)) {
+        $authordom = shift();
+    }
+    if  (! defined($author)) { 
+        $author = shift();
+    }
+    if (! defined($authordom) || ! defined($author)) {
+        return ();
+    }
+    my @Fields = ('url','count','course',
+                  'goto','goto_list',
+                  'comefrom','comefrom_list',
+                  'sequsage','sequsage_list',
+                  'stdno','stdno_list',
+		  'dependencies',
+                  'avetries','avetries_list',
+                  'difficulty','difficulty_list',
+                  'disc','disc_list',
+                  'clear','technical','correct',
+                  'helpful','depth');
+    #
+    my $query = 'SELECT '.join(',',@Fields).
+        ' FROM metadata WHERE url LIKE "'.$url.'%"';
+    my $server = &Apache::lonnet::homeserver($author,$authordom);
+    my $reply = &Apache::lonnet::metadata_query($query,undef,undef,
+                                                ,[$server]);
+    return () if (! defined($reply) || ref($reply) ne 'HASH');
+    my $filename = $reply->{$server};
+    if (! defined($filename) || $filename =~ /^error/) {
+        return ();
+    }
+    my $max_time = time + 10; # wait 10 seconds for results at most
+    my %ReturnHash;
+    #
+    # Look for results
+    my $finished = 0;
+    while (! $finished && time < $max_time) {
+        my $datafile=$Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/'.$filename;
+        if (! -e "$datafile.end") { next; }
+        my $fh;
+        if (!($fh=Apache::File->new($datafile))) { next; }
+        while (my $result = <$fh>) {
+            chomp($result);
+            next if (! $result);
+            my @Data = 
+                map { 
+                    &Apache::lonnet::unescape($_); 
+                } split(',',$result);
+            my $url = $Data[0];
+            for (my $i=0;$i<=$#Fields;$i++) {
+                $ReturnHash{$url}->{$Fields[$i]}=$Data[$i];
+            }
+        }
+        $finished = 1;
+    }
+    #
+    return %ReturnHash;
+}
+
+
 # Fetch and evaluate dynamic metadata
 sub dynamicmeta {
     my $url=&Apache::lonnet::declutter(shift);
@@ -155,19 +236,25 @@ sub diffgraph {
 
 # The field names
 sub fieldnames {
-    return &Apache::lonlocal::texthash
-        (
-         'title' => 'Title',
+    my $file_type=shift;
+    my %fields = 
+        ('title' => 'Title',
          'author' =>'Author(s)',
          'authorspace' => 'Author Space',
          'modifyinguser' => 'Last Modifying User',
          'subject' => 'Subject',
+         'standards' => 'Standards',
          'keywords' => 'Keyword(s)',
          'notes' => 'Notes',
          'abstract' => 'Abstract',
          'lowestgradelevel' => 'Lowest Grade Level',
          'highestgradelevel' => 'Highest Grade Level',
-         'standards' => 'Standards',
+         'courserestricted' => 'Course Restricting Metadata');
+         
+    if (! defined($file_type) || $file_type ne 'portfolio') {
+        %fields = 
+        (%fields,
+         'domain' => 'Domain',
          'mime' => 'MIME Type',
          'language' => 'Language',
          'creationdate' => 'Creation Date',
@@ -175,6 +262,8 @@ sub fieldnames {
          'owner' => 'Publisher/Owner',
          'copyright' => 'Copyright/Distribution',
          'customdistributionfile' => 'Custom Distribution File',
+         'sourceavail' => 'Source Available',
+         'sourcerights' => 'Source Custom Distribution File',
          'obsolete' => 'Obsolete',
          'obsoletereplacement' => 'Suggested Replacement for Obsolete File',
          'count'      => 'Network-wide number of accesses (hits)',
@@ -195,13 +284,54 @@ sub fieldnames {
          'stdno'      => 'Total number of students who have worked on this problem',
          'difficulty' => 'Degree of difficulty',
          'disc'       => 'Degree of discrimination',
+	     'dependencies' => 'Resources used by this resource',
          );
+    }
+    return &Apache::lonlocal::texthash(%fields);
 }
 
+sub select_course {
+    my ($r)=@_;
+    my %courses;
+    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;
+        }
+    }
+    $r->print('<h3>Course Related Meta-Data</h3><br />');
+    $r->print('<form action="" method="post">');
+    $r->print('Select course restrictions<br />');
+    $r->print('<select name="metacourse" >');
+    my $meta_not_found = 1;
+    foreach my $key (keys (%courses)) {    
+        if ($meta_not_found) {
+            undef($meta_not_found);
+            $r->print('<h3>Portfolio Meta-Data</h3><br />');
+            $r->print('<form action="" method="post">');
+            $r->print('Select your course<br />');
+            $r->print('<select name="metacourse" >');
+        }
+        $key =~ m/(^.+)\.description$/;
+        $r->print('<option value="'.$1.'">');
+        $r->print($courses{$key});
+        $r->print('</option>');
+    }
+    unless ($meta_not_found) {
+        $r->print('</select><br />');
+        $r->print('<input type="submit" value="Assign Portfolio Metadata" />');
+        $r->print('</form>');
+    }
+    return 'ok';
+}
 # Pretty printing of metadata field
 
 sub prettyprint {
-    my ($type,$value)=@_;
+    my ($type,$value,$target,$prefix,$form,$noformat)=@_;
+# $target,$prefix,$form are optional and for filecrumbs only
     if (! defined($value)) { 
         return '&nbsp;'; 
     }
@@ -224,6 +354,10 @@ sub prettyprint {
     if ($type eq 'copyright') {
 	return &Apache::loncommon::copyrightdescription($value);
     }
+    # Copyright
+    if ($type eq 'sourceavail') {
+	return &Apache::loncommon::source_copyrightdescription($value);
+    }
     # MIME
     if ($type eq 'mime') {
         return '<img src="'.&Apache::loncommon::icon($value).'" />&nbsp;'.
@@ -243,7 +377,7 @@ sub prettyprint {
 	return &Apache::loncommon::gradeleveldescription($value);
     }
     # Only for advance users below
-    if (! $ENV{'user.adv'}) { 
+    if (! $env{'user.adv'}) { 
         return '<i>- '.&mt('not displayed').' -</i>';
     }
     # File
@@ -251,8 +385,9 @@ sub prettyprint {
 	($type eq 'obsoletereplacement') ||
 	($type eq 'goto_list') ||
 	($type eq 'comefrom_list') ||
-	($type eq 'sequsage_list')) {
-	return join('<br />',map {
+	($type eq 'sequsage_list') ||
+	($type eq 'dependencies')) {
+	return '<ul><font size="-1">'.join("\n",map {
             my $url = &Apache::lonnet::clutter($_);
             my $title = &Apache::lonnet::gettitle($url);
             if ($title eq '') {
@@ -269,11 +404,10 @@ sub prettyprint {
                     $title .= ' Syllabus';
                 } 
             }
-            $_ = '<b>'.$title.'</b> '.
-                '<a href="'.$url.'" target="preview">'.
-                '<font size="-1">'.$url.'</font>'.
-                '</a>'
-        } split(/\s*\,\s*/,$value));
+            $_ = '<li>'.$title.' '.
+		&Apache::lonhtmlcommon::crumbs($url,$target,$prefix,$form,'-1',$noformat).
+                '</li>'
+	    } split(/\s*\,\s*/,$value)).'</ul></font>';
     }
     # Evaluations
     if (($type eq 'clear') ||
@@ -345,7 +479,70 @@ sub relatedfield {
 
 sub prettyinput {
     my ($type,$value,$fieldname,$formname,
-	$relatedsearchflag,$relatedsep,$relatedvalue,$size)=@_;
+	$relatedsearchflag,$relatedsep,$relatedvalue,$size,$course_key)=@_;
+    if (! defined($size)) {
+        $size = 80;
+    }
+    my $output;
+    if (defined($course_key)) {
+        my $stu_add;
+        my $only_one;
+        my %meta_options;
+        my @cur_values_inst;
+        my $cur_values_stu;
+        my $values = $env{$course_key.'.metadata.'.$type.'.values'};
+        if ($env{$course_key.'.metadata.'.$type.'.options'} =~ m/stuadd/) {
+            $stu_add = 'true';
+        }
+        if ($env{$course_key.'.metadata.'.$type.'.options'} =~ m/onlyone/) {
+            $only_one = 'true';
+        }
+        # need to take instructor values out of list where instructor and student
+        # values may be mixed.
+        if ($values) {
+            foreach my $item (split(/,/,$values)) {
+                $item =~ s/^\s+//;
+                $meta_options{$item} = $item;
+            }
+            foreach my $item (split(/,/,$value)) {
+                $item =~ s/^\s+//;
+                if ($meta_options{$item}) {
+                    push(@cur_values_inst,$item);
+                } else {
+                    $cur_values_stu .= $item.',';
+                }
+            }
+        } else {
+            $cur_values_stu = $value;
+        }
+        if ($type eq 'courserestricted') {
+            return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
+        }
+        if (($type eq 'keywords') || ($type eq 'subject')
+             || ($type eq 'author')||($type eq  'notes')
+             || ($type eq  'abstract')|| ($type eq  'title')|| ($type eq  'standards')) {
+            if ($values) {
+                if ($only_one) {
+                    $output .= (&Apache::loncommon::select_form($cur_values_inst[0],'new_'.$type,%meta_options));
+                } else {
+                    $output .= (&Apache::loncommon::multiple_select_form('new_'.$type,\@cur_values_inst,undef,\%meta_options));
+                }
+            }
+            if ($stu_add) {
+                $output .= '<input type="text" name="'.$fieldname.'" size="'.$size.'" '.
+                'value="'.$cur_values_stu.'" />'.
+                &relatedfield(1,$relatedsearchflag,$relatedsep,$fieldname,
+                      $relatedvalue); 
+            }
+            return ($output);
+        }
+        if (($type eq 'lowestgradelevel') ||
+	    ($type eq 'highestgradelevel')) {
+	    return &Apache::loncommon::select_level_form($value,$fieldname).
+            &relatedfield(0,$relatedsearchflag,$relatedsep); 
+        }
+        return(); 
+    }
     # Language
     if ($type eq 'language') {
 	return &selectbox($fieldname,
@@ -362,6 +559,14 @@ sub prettyinput {
 			  (&Apache::loncommon::copyrightids)).
                               &relatedfield(0,$relatedsearchflag,$relatedsep);
     }
+    # Source Copyright
+    if ($type eq 'sourceavail') {
+	return &selectbox($fieldname,
+			  $value,
+			  \&Apache::loncommon::source_copyrightdescription,
+			  (&Apache::loncommon::source_copyrightids)).
+                              &relatedfield(0,$relatedsearchflag,$relatedsep);
+    }
     # Gradelevels
     if (($type eq 'lowestgradelevel') ||
 	($type eq 'highestgradelevel')) {
@@ -390,6 +595,18 @@ sub prettyinput {
 	    ",'rights')\">".&mt('Select').'</a>'.
             &relatedfield(0,$relatedsearchflag,$relatedsep); 
     }
+    # Source Customdistribution file
+    if ($type eq 'sourcerights') {
+	return '<input type="text" name="'.$fieldname.
+	    '" size="60" value="'.$value.'" /><a href="javascript:openbrowser'.
+	    "('".$formname."','".$fieldname."'".
+	    ",'rights')\">".&mt('Select').'</a>'.
+            &relatedfield(0,$relatedsearchflag,$relatedsep); 
+    }
+    if ($type eq 'courserestricted') {
+            return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
+    }
+
     # Dates
     if (($type eq 'creationdate') ||
 	($type eq 'lastrevisiondate')) {
@@ -401,7 +618,7 @@ sub prettyinput {
     $value=~s/^\s+//gs;
     $value=~s/\s+$//gs;
     $value=~s/\s+/ /gs;
-    $value=~s/\"/\&quod\;/gs;
+    $value=~s/\"/\&quot\;/gs;
     return 
         '<input type="text" name="'.$fieldname.'" size="'.$size.'" '.
         'value="'.$value.'" />'.
@@ -415,33 +632,28 @@ sub handler {
     #
     my $uri=$r->uri;
     #
-    # Check to see if this server is overloaded
-    my $loaderror=&Apache::lonnet::overloaderror($r);
-    if ($loaderror) { 
-        return $loaderror;
-    }
-    #
-    # Check to see if original resource server is overloaded
-    my ($resdomain,$resuser)=
-        (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);
-    $loaderror=&Apache::lonnet::overloaderror
-        ($r,&Apache::lonnet::homeserver($resuser,$resdomain));
-    if ($loaderror) { 
-        return $loaderror;
-    }
-    #
     # Set document type
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
     #
-    $r->print('<html><head><title>'.
+    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'));
         # 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));
+        &present_editable_metadata($r,$uri,'portfolio');
+        &select_course($r);
     } elsif ($uri=~/^\/\~/) { 
         # Construction space
         $r->print(&Apache::loncommon::bodytag
@@ -449,7 +661,7 @@ sub handler {
         &present_editable_metadata($r,$uri);
     } else {
         $r->print(&Apache::loncommon::bodytag
-                  ('Catalog Information','','','',$resdomain));
+		  ('Catalog Information','','','',$resdomain));
         &present_uneditable_metadata($r,$uri);
     }
     $r->print('</body></html>');
@@ -471,6 +683,15 @@ sub report_bombs {
     $r->print('<h1>'.&Apache::lonnet::clutter($uri).'</h1>');
     my ($domain,$author)=($uri=~/^(\w+)\/(\w+)\//);
     if (&Apache::loncacc::constructaccess('/~'.$author.'/',$domain)) {
+	if ($env{'form.clearbombs'}) {
+	    &Apache::lonmsg::clear_author_res_msg($uri);
+	}
+        my $clear=&mt('Clear all Messages in Subdirectory');
+	$r->print(<<ENDCLEAR);
+<form method="post">
+<input type="submit" name="clearbombs" value="$clear" />
+</form>
+ENDCLEAR
         my %brokenurls = 
             &Apache::lonmsg::all_url_author_res_msg($author,$domain);
         foreach (sort(keys(%brokenurls))) {
@@ -525,7 +746,7 @@ sub present_uneditable_metadata {
     # obsolete
     my $obsolete=$content{'obsolete'};
     my $obsoletewarning='';
-    if (($obsolete) && ($ENV{'user.adv'})) {
+    if (($obsolete) && ($env{'user.adv'})) {
         $obsoletewarning='<p><font color="red">'.
             &mt('This resource has been marked obsolete by the author(s)').
             '</font></p>';
@@ -552,7 +773,9 @@ sub present_uneditable_metadata {
              'lastrevisiondate', 
              'owner', 
              'copyright', 
-             'customdistributionfile', 
+             'customdistributionfile',
+             'sourceavail',
+             'sourcerights', 
              'obsolete', 
              'obsoletereplacement') {
         $table.='<tr><td bgcolor="#AAAAAA">'.$lt{$_}.
@@ -568,11 +791,11 @@ $disuri<br />
 $obsoletewarning
 $versiondisplay
 </p>
-<table cellspacing=2 border=0>
+<table cellspacing="2" border="0">
 $table
 </table>
 ENDHEAD
-    if ($ENV{'user.adv'}) {
+    if ($env{'user.adv'}) {
         &print_dynamic_metadata($r,$uri,\%content);
     }
     return;
@@ -590,8 +813,6 @@ sub print_dynamic_metadata {
     $r->rflush();
     my %items=&fieldnames();
     my %dynmeta=&dynamicmeta($uri);
-    &Apache::lonnet::logthis('dynamic metadata keys:'.$/.
-                             join("\n",keys(%dynmeta)));
     #
     # General Access and Usage Statistics
     if (exists($dynmeta{'count'}) ||
@@ -600,7 +821,7 @@ sub print_dynamic_metadata {
         exists($dynmeta{'goto'}) ||
         exists($dynmeta{'course'})) {
         $r->print('<h4>'.&mt('Access and Usage Statistics').'</h4>'.
-                  '<table cellspacing=2 border=0>');
+                  '<table cellspacing="2" border="0">');
         foreach ('count',
                  'sequsage','sequsage_list',
                  'comefrom','comefrom_list',
@@ -625,7 +846,7 @@ sub print_dynamic_metadata {
             $r->print('<h4>'.
                       &mt('Overall Assessment Statistical Data').
                       '</h4>'.
-                      '<table cellspacing=2 border=0>');
+                      '<table cellspacing="2" border="0">');
             $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{'stdno'}.'</td>'.
                       '<td bgcolor="#CCCCCC">'.
                       &prettyprint('stdno',$dynmeta{'stdno'}).
@@ -644,7 +865,7 @@ sub print_dynamic_metadata {
             $r->print('<h4>'.
                       &mt('Detailed Assessment Statistical Data').
                       '</h4>');
-            my $table = '<table cellspacing=2 border=0>'.
+            my $table = '<table cellspacing="2" border="0">'.
                 '<tr>'.
                 '<th>Course</th>'.
                 '<th>Section(s)</th>'.
@@ -704,7 +925,7 @@ sub print_dynamic_metadata {
         exists($dynmeta{'correct'}) || 
         exists($dynmeta{'technical'})){ 
         $r->print('<h4>'.&mt('Evaluation Data').'</h4>'.
-                  '<table cellspacing=2 border=0>');
+                  '<table cellspacing="2" border="0">');
         foreach ('clear','depth','helpful','correct','technical') {
             $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td>'.
                       '<td bgcolor="#CCCCCC">'.
@@ -715,8 +936,8 @@ sub print_dynamic_metadata {
         $r->print('<h4>'.&mt('No Evaluation Data is available for this resource.').'</h4>');
     }
     $uri=~/^\/res\/(\w+)\/(\w+)\//; 
-    if ((($ENV{'user.domain'} eq $1) && ($ENV{'user.name'} eq $2))
-        || ($ENV{'user.role.ca./'.$1.'/'.$2})) {
+    if ((($env{'user.domain'} eq $1) && ($env{'user.name'} eq $2))
+        || ($env{'user.role.ca./'.$1.'/'.$2})) {
         if (exists($dynmeta{'comments'})) {
             $r->print('<h4>'.&mt('Evaluation Comments').' ('.
                       &mt('visible to author and co-authors only').
@@ -738,7 +959,7 @@ sub print_dynamic_metadata {
     # All other stuff
     $r->print('<h3>'.
               &mt('Additional Metadata (non-standard, parameters, exports)').
-              '</h3>');
+              '</h3><table border="0" cellspacing="1">');
     foreach (sort(keys(%content))) {
         my $name=$_;
         if ($name!~/\.display$/) {
@@ -756,16 +977,19 @@ sub print_dynamic_metadata {
                                                   $name.'.'.$_).'; ';
                 }
             }
-            $r->print('<b>'.$display.':</b> '.$content{$name});
+            $r->print('<tr><td bgcolor="#bbccbb"><font size="-1" color="#556655">'.$display.'</font></td><td bgcolor="#ccddcc"><font size="-1" color="#556655">'.$content{$name});
             if ($otherinfo) {
                 $r->print(' ('.$otherinfo.')');
             }
-            $r->print("<br />\n");
+            $r->print("</font></td></tr>\n");
         }
     }
+    $r->print("</table>");
     return;
 }
 
+
+
 #####################################################
 #####################################################
 ###                                               ###
@@ -774,32 +998,54 @@ sub print_dynamic_metadata {
 #####################################################
 #####################################################
 sub present_editable_metadata {
-    my ($r,$uri) = @_;
+    my ($r,$uri, $file_type) = @_;
     # Construction Space Call
     # Header
     my $disuri=$uri;
     my $fn=&Apache::lonnet::filelocation('',$uri);
     $disuri=~s/^\/\~/\/priv\//;
     $disuri=~s/\.meta$//;
+    $disuri=~s|^/editupload||;
     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) {
-        if ($ENV{'form.delmsg'}) {
+        my $showdel=1;
+        if ($env{'form.delmsg'}) {
             if (&Apache::lonmsg::del_url_author_res_msg($target) eq 'ok') {
                 $bombs=&mt('Messages deleted.');
+		$showdel=0;
             } else {
                 $bombs=&mt('Error deleting messages');
             }
         }
-        my $del=&mt('Delete Messages');
+        if ($env{'form.clearmsg'}) {
+	    my $cleardir=$target;
+	    $cleardir=~s/\/[^\/]+$/\//;
+            if (&Apache::lonmsg::clear_author_res_msg($cleardir) eq 'ok') {
+                $bombs=&mt('Messages cleared.');
+		$showdel=0;
+            } else {
+                $bombs=&mt('Error clearing messages');
+            }
+        }
+        my $del=&mt('Delete Messages for this Resource');
+	my $clear=&mt('Clear all Messages in Subdirectory');
+	my $goback=&mt('Back to Source File');
         $r->print(<<ENDBOMBS);
 <h1>$disuri</h1>
 <form method="post" name="defaultmeta">
-<input type="submit" name="delmsg" value="$del" />
-<br />$bombs
 ENDBOMBS
+        if ($showdel) {
+	    $r->print(<<ENDDEL);
+<input type="submit" name="delmsg" value="$del" />
+<input type="submit" name="clearmsg" value="$clear" />
+ENDDEL
+        } else {
+            $r->print('<a href="'.$disuri.'" />'.$goback.'</a>');
+	}
+	$r->print('<br />'.$bombs);
     } else {
         my $displayfile='Catalog Information for '.$disuri;
         if ($disuri=~/\/default$/) {
@@ -809,72 +1055,155 @@ ENDBOMBS
                 &mt('Default Cataloging Information for Directory').' '.
                 $dir;
         }
-        my $bodytag=
-            &Apache::loncommon::bodytag('Edit Catalog Information');
         %Apache::lonpublisher::metadatafields=();
         %Apache::lonpublisher::metadatakeys=();
-        &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile($fn));
+        my $result=&Apache::lonnet::getfile($fn);
+        if ($result == -1){
+            $r->print('Creating new '.$disuri);
+        } else {
+            &Apache::lonpublisher::metaeval($result);
+        }
         $r->print(<<ENDEDIT);
-<html><head><title>Edit Catalog Information</title></head>
-$bodytag
 <h1>$displayfile</h1>
 <form method="post" name="defaultmeta">
 ENDEDIT
         $r->print('<script language="JavaScript">'.
-                  &Apache::loncommon::browser_and_searcher_javascript.
+                  &Apache::loncommon::browser_and_searcher_javascript().
                   '</script>');
-        my %lt=&fieldnames();
-        foreach ('author','title','subject','keywords','abstract','notes',
+        my %lt=&fieldnames($file_type);
+	my $output;
+	my @fields;
+	if ($file_type eq 'portfolio') {
+	    @fields =  ('author','title','subject','keywords','abstract','notes','lowestgradelevel',
+	                'highestgradelevel','standards','courserestricted');
+	} else {
+	    @fields = ('author','title','subject','keywords','abstract','notes',
                  'copyright','customdistributionfile','language',
                  'standards',
-                 'lowestgradelevel','highestgradelevel',
-                 'obsolete','obsoletereplacement') {
-            if (defined($ENV{'form.new_'.$_})) {
-                $Apache::lonpublisher::metadatafields{$_}=
-                    $ENV{'form.new_'.$_};
+                 'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
+                 'obsolete','obsoletereplacement');
+        }
+        my $metacourse;
+        if ($env{'form.metacourse'} ) {
+            $Apache::lonpublisher::metadatafields{'courserestricted'} = $env{'form.metacourse'};
+            $metacourse = $env{'form.metacourse'};
+         } else {
+            if (! $Apache::lonpublisher::metadatafields{'courserestricted'}) {
+                $Apache::lonpublisher::metadatafields{'courserestricted'}=
+                    'none';
+                $metacourse = 'none';
+            } else {
+                $metacourse = $Apache::lonpublisher::metadatafields{'courserestricted'};
             }
-            if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
+        }
+        if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
                 $Apache::lonpublisher::metadatafields{'copyright'}=
-                    'default';
+                'default';
+        }
+        if ($metacourse ne 'none') {
+             $r->print('Using: <strong> '.$env{$metacourse.".description"}."</strong> metadata framework<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 ($metacourse ne 'none') {
+                # handle restrictions here
+                if ($env{$metacourse.'.metadata.'.$field_name.'.options'} =~ m/active/){
+                    $output.=('<p>'.$lt{$field_name}.': '.
+                              &prettyinput($field_name,
+				   $Apache::lonpublisher::metadatafields{$field_name},
+				   'new_'.$field_name,'defaultmeta',undef,undef,undef,undef,$metacourse).'</p>');
+                 } elsif ($field_name eq 'courserestricted') {
+                            $output.=(
+                                &prettyinput($field_name,
+				    $Apache::lonpublisher::metadatafields{$field_name},
+				    'new_'.$field_name,'defaultmeta',undef,undef,undef,undef,$metacourse));
+                 }
+            } else {
+                if ($field_name ne 'courserestricted') {
+                    $output.=('<p>'.$lt{$field_name}.': '.
+                            &prettyinput($field_name,
+				   $Apache::lonpublisher::metadatafields{$field_name},
+				   'new_'.$field_name,'defaultmeta').'</p>');
+	        } else {
+                    $output.=&prettyinput($field_name,
+				   $Apache::lonpublisher::metadatafields{$field_name},
+				   'new_'.$field_name,'defaultmeta');
+                }
             }
-            $r->print('<p>'.$lt{$_}.': '.
-                      &prettyinput
-                      ($_,$Apache::lonpublisher::metadatafields{$_},
-                       'new_'.$_,'defaultmeta').'</p>');
         }
-        if ($ENV{'form.store'}) {
+        if ($env{'form.store'}) {
             my $mfh;
-            if (!  ($mfh=Apache::File->new('>'.$fn))) {
-                $r->print('<p><font color=red>'.
-                          &mt('Could not write metadata').', '.
-                          &mt('FAIL').'</font>');
+            my $formname='store'; 
+            my $file_content;
+            foreach my $meta_field (keys %env) {
+                if (&Apache::loncommon::get_env_multiple('form.new_keywords')) {
+                    $Apache::lonpublisher::metadatafields{'keywords'} = 
+                        join (',', &Apache::loncommon::get_env_multiple('form.new_keywords'));
+                }
+            }
+            foreach (sort keys %Apache::lonpublisher::metadatafields) {
+                next if ($_ =~ /\./);
+                my $unikey=$_;
+                $unikey=~/^([A-Za-z]+)/;
+                my $tag=$1;
+                $tag=~tr/A-Z/a-z/;
+                $file_content.= "\n\<$tag";
+                foreach (split(/\,/,
+                             $Apache::lonpublisher::metadatakeys{$unikey})
+                         ) {
+                    my $value=
+                    $Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
+                    $value=~s/\"/\'\'/g;
+                    $file_content.=' '.$_.'="'.$value.'"' ;
+                    # print $mfh ' '.$_.'="'.$value.'"';
+                }
+                $file_content.= '>'.
+                    &HTML::Entities::encode
+                    ($Apache::lonpublisher::metadatafields{$unikey},
+                     '<>&"').
+                     '</'.$tag.'>';
+            }
+            if ($fn =~ /\/portfolio\//) {
+                $fn =~ /\/portfolio\/(.*)$/;
+                my $new_fn = '/'.$1;
+                $env{'form.'.$formname}=$file_content."\n";
+                $env{'form.'.$formname.'.filename'}=$new_fn;
+                &Apache::lonnet::userfileupload('uploaddoc','',
+	        	 'portfolio'.$env{'form.currentpath'});
+                if (&Apache::lonnet::userfileupload($formname,'','portfolio') eq 'error: no uploaded file') {
+                    $r->print('<p><font color="red">'.
+                      &mt('Could not write metadata').', '.
+                     &mt('FAIL').'</font></p>');
+                } else {
+                    $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
+		  ' '.&Apache::lonlocal::locallocaltime(time).
+		  '</font></p>');
+                }
             } else {
-                foreach (sort keys %Apache::lonpublisher::metadatafields) {
-                    next if ($_ =~ /\./);
-                    my $unikey=$_;
-                    $unikey=~/^([A-Za-z]+)/;
-                    my $tag=$1;
-                    $tag=~tr/A-Z/a-z/;
-                    print $mfh "\n\<$tag";
-                    foreach (split(/\,/,
-                                 $Apache::lonpublisher::metadatakeys{$unikey})
-                             ) {
-                        my $value=
-                         $Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
-                        $value=~s/\"/\'\'/g;
-                        print $mfh ' '.$_.'="'.$value.'"';
-                    }
-                    print $mfh '>'.
-                        &HTML::Entities::encode
-                        ($Apache::lonpublisher::metadatafields{$unikey},
-                         '<>&"').
-                         '</'.$tag.'>';
+                if (!  ($mfh=Apache::File->new('>'.$fn))) {
+                    $r->print('<p><font color="red">'.
+                        &mt('Could not write metadata').', '.
+                        &mt('FAIL').'</font></p>');
+                } else {
+                    print $mfh $file_content;
+		    $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
+			      ' '.&Apache::lonlocal::locallocaltime(time).
+			      '</font></p>');
                 }
-                $r->print('<p>'.&mt('Wrote Metadata'));
             }
         }
-        $r->print('<br /><input type="submit" name="store" value="'.
-                  &mt('Store Catalog Information').'">');
+        my $button_label;
+        if ($fn =~ /\/portfolio\//) {
+            $button_label = 'Store Metadata';
+        } else {
+            $button_label = 'Store Catalog Information';
+        }
+	    $r->print($output.'<br /><input type="submit" name="store" value="'.
+                  &mt($button_label).'">');
     }
     $r->print('</form>');
     return;
@@ -882,3 +1211,5 @@ ENDEDIT
 
 1;
 __END__
+
+