--- loncom/interface/lonmeta.pm	2005/11/22 19:43:53	1.132
+++ loncom/interface/lonmeta.pm	2005/12/09 23:49:45	1.136
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.132 2005/11/22 19:43:53 banghart Exp $
+# $Id: lonmeta.pm,v 1.136 2005/12/09 23:49:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -243,6 +243,7 @@ sub fieldnames {
          'authorspace' => 'Author Space',
          'modifyinguser' => 'Last Modifying User',
          'subject' => 'Subject',
+         'standards' => 'Standards',
          'keywords' => 'Keyword(s)',
          'notes' => 'Notes',
          'abstract' => 'Abstract',
@@ -254,7 +255,6 @@ sub fieldnames {
         %fields = 
         (%fields,
          'domain' => 'Domain',
-         'standards' => 'Standards',
          'mime' => 'MIME Type',
          'language' => 'Language',
          'creationdate' => 'Creation Date',
@@ -284,7 +284,7 @@ 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',
+	     'dependencies' => 'Resources used by this resource',
          );
     }
     return &Apache::lonlocal::texthash(%fields);
@@ -302,9 +302,9 @@ sub select_course {
             $courses{$coursekey} = $value;
         }
     }
-    $r->print('<h3>Course Related Meta-Data</h3><br />');
+    $r->print('<h3>Associate resource with a course</h3><br />');
     $r->print('<form action="" method="post">');
-    $r->print('Select course restrictions<br />');
+    $r->print('Select course <br />');
     $r->print('<select name="metacourse" >');
     my $meta_not_found = 1;
     foreach my $key (keys (%courses)) {    
@@ -322,7 +322,7 @@ sub select_course {
     }
     unless ($meta_not_found) {
         $r->print('</select><br />');
-        $r->print('<input type="submit" value="Assign Portfolio Metadata" />');
+        $r->print('<input type="submit" value="Associate" />');
         $r->print('</form>');
     }
     return 'ok';
@@ -499,10 +499,10 @@ sub prettyinput {
         }
         # need to take instructor values out of list where instructor and student
         # values may be mixed.
-        if ($values && $stu_add) {
+        if ($values) {
             foreach my $item (split(/,/,$values)) {
                 $item =~ s/^\s+//;
-                $meta_options{$item} = $type;
+                $meta_options{$item} = $item;
             }
             foreach my $item (split(/,/,$value)) {
                 $item =~ s/^\s+//;
@@ -520,10 +520,10 @@ sub prettyinput {
         }
         if (($type eq 'keywords') || ($type eq 'subject')
              || ($type eq 'author')||($type eq  'notes')
-             || ($type eq  'abstract')|| ($type eq  'title')) {
+             || ($type eq  'abstract')|| ($type eq  'title')|| ($type eq  'standards')) {
             if ($values) {
                 if ($only_one) {
-                    $output .= (&Apache::loncommon::select_form($value,'new_'.$type,%meta_options));
+                    $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));
                 }
@@ -603,6 +603,10 @@ sub prettyinput {
 	    ",'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')) {
@@ -1071,7 +1075,7 @@ ENDEDIT
 	my @fields;
 	if ($file_type eq 'portfolio') {
 	    @fields =  ('author','title','subject','keywords','abstract','notes','lowestgradelevel',
-	                'highestgradelevel','courserestricted');
+	                'highestgradelevel','standards','courserestricted');
 	} else {
 	    @fields = ('author','title','subject','keywords','abstract','notes',
                  'copyright','customdistributionfile','language',
@@ -1097,7 +1101,7 @@ ENDEDIT
                 'default';
         }
         if ($metacourse ne 'none') {
-             $r->print('Document metadata restricted by :<strong> '.$env{$metacourse.".description"}."</strong><br />");
+             $r->print('Using: <strong> '.$env{$metacourse.".description"}."</strong> metadata framework<br />");
         }
         foreach my $field_name(@fields) {
 
@@ -1152,7 +1156,7 @@ ENDEDIT
                              $Apache::lonpublisher::metadatakeys{$unikey})
                          ) {
                     my $value=
-                     $Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
+                    $Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
                     $value=~s/\"/\'\'/g;
                     $file_content.=' '.$_.'="'.$value.'"' ;
                     # print $mfh ' '.$_.'="'.$value.'"';
@@ -1166,7 +1170,7 @@ ENDEDIT
             if ($fn =~ /\/portfolio\//) {
                 $fn =~ /\/portfolio\/(.*)$/;
                 my $new_fn = '/'.$1;
-                $env{'form.'.$formname}=$file_content;
+                $env{'form.'.$formname}=$file_content."\n";
                 $env{'form.'.$formname.'.filename'}=$new_fn;
                 &Apache::lonnet::userfileupload('uploaddoc','',
 	        	 'portfolio'.$env{'form.currentpath'});