--- loncom/interface/lonmeta.pm	2005/11/22 23:20:40	1.133
+++ loncom/interface/lonmeta.pm	2005/12/13 11:52:37	1.137
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.133 2005/11/22 23:20:40 banghart Exp $
+# $Id: lonmeta.pm,v 1.137 2005/12/13 11:52:37 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -291,8 +291,8 @@ sub fieldnames {
 }
 
 sub select_course {
-    my ($r)=@_;
     my %courses;
+    my $output;
     foreach my $key (keys (%env)) { 
         if ($key =~ m/\.metadata\./) {
             $key =~ m/^course\.(.+)(\.metadata.+$)/;
@@ -302,30 +302,30 @@ sub select_course {
             $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" >');
+    $output = '<h3>Associate resource with a course</h3><br />';
+    $output .= '<form action="" method="post">';
+    $output .= 'Select course <br />';
+    $output .= '<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" >');
+            $output .= '<h3>Portfolio Meta-Data</h3><br />';
+            $output .= '<form action="" method="post">';
+            $output .= 'Select your course<br />';
+            $output .= '<select name="metacourse" >';
         }
         $key =~ m/(^.+)\.description$/;
-        $r->print('<option value="'.$1.'">');
-        $r->print($courses{$key});
-        $r->print('</option>');
+        $output .= '<option value="'.$1.'">';
+        $output .= $courses{$key};
+        $output .= '</option>';
     }
     unless ($meta_not_found) {
-        $r->print('</select><br />');
-        $r->print('<input type="submit" value="Assign Portfolio Metadata" />');
-        $r->print('</form>');
+        $output .= '</select><br />';
+        $output .= '<input type="submit" value="Associate" />';
+        $output .= '</form>';
     }
-    return 'ok';
+    return ($output);
 }
 # Pretty printing of metadata field
 
@@ -523,7 +523,7 @@ sub prettyinput {
              || ($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')) {
@@ -649,7 +653,6 @@ sub handler {
         $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
@@ -999,6 +1002,7 @@ sub present_editable_metadata {
     # Header
     my $disuri=$uri;
     my $fn=&Apache::lonnet::filelocation('',$uri);
+    my $metacourse;
     $disuri=~s/^\/\~/\/priv\//;
     $disuri=~s/\.meta$//;
     $disuri=~s|^/editupload||;
@@ -1079,7 +1083,6 @@ ENDEDIT
                  'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
                  'obsolete','obsoletereplacement');
         }
-        my $metacourse;
         if ($env{'form.metacourse'} ) {
             $Apache::lonpublisher::metadatafields{'courserestricted'} = $env{'form.metacourse'};
             $metacourse = $env{'form.metacourse'};
@@ -1097,7 +1100,10 @@ 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 />");
+        } else {
+            $r->print("This resources is not associated with a metadata framework<br />");
         }
         foreach my $field_name(@fields) {
 
@@ -1131,6 +1137,7 @@ ENDEDIT
                 }
             }
         }
+
         if ($env{'form.store'}) {
             my $mfh;
             my $formname='store'; 
@@ -1152,7 +1159,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 +1173,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'});
@@ -1192,10 +1199,14 @@ 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').'">');
+        
     }
     $r->print('</form>');
+    if ($metacourse eq 'none') {
+        $r->print(&select_course());
+    }
     return;
 }