--- loncom/interface/lonmeta.pm	2005/12/13 11:52:37	1.137
+++ loncom/interface/lonmeta.pm	2005/12/19 21:17:25	1.144
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.137 2005/12/13 11:52:37 banghart Exp $
+# $Id: lonmeta.pm,v 1.144 2005/12/19 21:17:25 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -290,9 +290,44 @@ sub fieldnames {
     return &Apache::lonlocal::texthash(%fields);
 }
 
+sub portfolio_display_uri {
+    my ($uri)=@_;
+    $uri =~ s|.*/(portfolio/.*)$|$1|;
+    my ($res_uri,$meta_uri) = ($uri,$uri);
+
+    if ($uri =~ /\.meta$/) {
+	$res_uri =~ s/\.meta//;
+    } else {
+	$meta_uri .= '.meta';
+    }
+    return ($res_uri,$meta_uri);
+}
+
+sub pre_select_course {
+    my ($r,$uri) = @_;
+    my $output;
+    my $fn=&Apache::lonnet::filelocation('',$uri);
+    my ($res_uri,$meta_uri) = &portfolio_display_uri($uri);
+    %Apache::lonpublisher::metadatafields=();
+    %Apache::lonpublisher::metadatakeys=();
+    my $result=&Apache::lonnet::getfile($fn);
+    if ($result == -1){
+        $r->print(&mt('Creating new file [_1]'),$meta_uri);
+    } else {
+        &Apache::lonpublisher::metaeval($result);
+    }
+    $r->print('<hr /><form method="post" action="" >');
+    $r->print('<p>'.&mt('If you would like to associate this resource ([_1]) with a current or previous course, please select one from the list below, otherwise select, \'None\'','<tt>'.$res_uri.'</tt>').'</p>');
+    $output = &select_course();
+    $r->print($output.'<br /><input type="submit" name="store" value="'.
+                  &mt('Associate Resource With Selected Course').'">');
+    $r->print('</form>');
+    return;
+}
 sub select_course {
     my %courses;
     my $output;
+    my $selected;
     foreach my $key (keys (%env)) { 
         if ($key =~ m/\.metadata\./) {
             $key =~ m/^course\.(.+)(\.metadata.+$)/;
@@ -302,29 +337,27 @@ sub select_course {
             $courses{$coursekey} = $value;
         }
     }
-    $output = '<h3>Associate resource with a course</h3><br />';
-    $output .= '<form action="" method="post">';
-    $output .= 'Select course <br />';
-    $output .= '<select name="metacourse" >';
+    &Apache::lonnet::logthis('the restricted is'.$Apache::lonpublisher::metadatafields{'courserestricted'});
     my $meta_not_found = 1;
+    if ($Apache::lonpublisher::metadatafields{'courserestricted'} eq 'none') {
+        $selected = ' SELECTED ';
+    } else {
+        $selected = '';
+    }
+    $output .= '<select name="new_courserestricted" >';
+    $output .= '<option value="none" '.$selected.'>None</option>';
     foreach my $key (keys (%courses)) {    
-        if ($meta_not_found) {
-            undef($meta_not_found);
-            $output .= '<h3>Portfolio Meta-Data</h3><br />';
-            $output .= '<form action="" method="post">';
-            $output .= 'Select your course<br />';
-            $output .= '<select name="metacourse" >';
-        }
         $key =~ m/(^.+)\.description$/;
-        $output .= '<option value="'.$1.'">';
+        if ($Apache::lonpublisher::metadatafields{'courserestricted'} eq $1) {
+            $selected = ' SELECTED ';
+        } else {
+            $selected = '';
+        }
+        $output .= '<option value="'.$1.'"'.$selected.'>';
         $output .= $courses{$key};
         $output .= '</option>';
     }
-    unless ($meta_not_found) {
-        $output .= '</select><br />';
-        $output .= '<input type="submit" value="Associate" />';
-        $output .= '</form>';
-    }
+    $output .= '</select><br />';
     return ($output);
 }
 # Pretty printing of metadata field
@@ -516,7 +549,8 @@ sub prettyinput {
             $cur_values_stu = $value;
         }
         if ($type eq 'courserestricted') {
-            return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
+            return (&select_course());
+            # return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
         }
         if (($type eq 'keywords') || ($type eq 'subject')
              || ($type eq 'author')||($type eq  'notes')
@@ -604,7 +638,8 @@ sub prettyinput {
             &relatedfield(0,$relatedsearchflag,$relatedsep); 
     }
     if ($type eq 'courserestricted') {
-            return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
+        return (&select_course());
+        #return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
     }
 
     # Dates
@@ -648,11 +683,15 @@ sub handler {
         # Looking for all bombs?
         &report_bombs($r,$uri);
     } elsif ($uri=~/\/portfolio\//) {
-	($resdomain,$resuser)=
+	    ($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');
+        if ($env{'form.store'}) {
+            &present_editable_metadata($r,$uri,'portfolio');
+        } else {
+            &pre_select_course($r,$uri);
+        }
     } elsif ($uri=~/^\/\~/) { 
         # Construction space
         $r->print(&Apache::loncommon::bodytag
@@ -1002,10 +1041,12 @@ 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||;
+    my $meta_uri = $disuri;
+    if ($disuri =~ m|/portfolio/|) {
+	($disuri, $meta_uri) =  &portfolio_display_uri($disuri);
+    }
     my $target=$uri;
     $target=~s/^\/\~/\/res\/$env{'request.role.domain'}\//;
     $target=~s/\.meta$//;
@@ -1059,7 +1100,7 @@ ENDDEL
         %Apache::lonpublisher::metadatakeys=();
         my $result=&Apache::lonnet::getfile($fn);
         if ($result == -1){
-            $r->print('Creating new '.$disuri);
+	    $r->print(&mt('Creating new file [_1]'),$meta_uri);
         } else {
             &Apache::lonpublisher::metaeval($result);
         }
@@ -1075,7 +1116,7 @@ ENDEDIT
 	my @fields;
 	if ($file_type eq 'portfolio') {
 	    @fields =  ('author','title','subject','keywords','abstract','notes','lowestgradelevel',
-	                'highestgradelevel','standards','courserestricted');
+	                'highestgradelevel','standards');
 	} else {
 	    @fields = ('author','title','subject','keywords','abstract','notes',
                  'copyright','customdistributionfile','language',
@@ -1083,130 +1124,118 @@ ENDEDIT
                  'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
                  'obsolete','obsoletereplacement');
         }
-        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{'courserestricted'}) &&
+                (! $env{'form.new_courserestricted'})) {
+            $Apache::lonpublisher::metadatafields{'courserestricted'}=
+                'none';
+        } elsif ($env{'form.new_courserestricted'}) {
+            $Apache::lonpublisher::metadatafields{'courserestricted'}=
+                $env{'form.new_courserestricted'}; 
+        }           
         if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
                 $Apache::lonpublisher::metadatafields{'copyright'}=
                 'default';
         }
-        if ($metacourse ne 'none') {
-            $r->print('Using: <strong> '.$env{$metacourse.".description"}.
-                        "</strong> metadata framework<br />");
+        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 resources is not associated with a metadata framework<br />");
+            $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})) {
                 $Apache::lonpublisher::metadatafields{$field_name}=
                     join(',',&Apache::loncommon::get_env_multiple('form.new_'.$field_name));
             }
-            if ($metacourse ne 'none') {
+            if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
                 # handle restrictions here
-                if ($env{$metacourse.'.metadata.'.$field_name.'.options'} =~ m/active/){
-                    $output.=('<p>'.$lt{$field_name}.': '.
+                if (($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/active/) ||
+                    ($field_name eq 'courserestricted')){
+                    $output.=("\n".'<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));
+				                    'new_'.$field_name,'defaultmeta',
+				                    undef,undef,undef,undef,
+				                    $Apache::lonpublisher::metadatafields{'courserestricted'}).'</p>'."\n");
                  }
             } 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');
-                }
+               
             }
         }
-
-        if ($env{'form.store'}) {
-            my $mfh;
-            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 {
-                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;
+	if ($env{'form.store'}) {
+	    my $mfh;
+	    my $formname='store'; 
+	    my $file_content;
+	    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.'>';
+	    }
+	    &Apache::lonnet::logthis(" file ".$file_content);
+	    if ($fn =~ m|/portfolio/|) {
+		my ($path, $new_fn) = ($fn =~ m|/(portfolio.*)/([^/]*)$|);
+		$env{'form.'.$formname}=$file_content."\n";
+		$env{'form.'.$formname.'.filename'}=$new_fn;
+		my $result =&Apache::lonnet::userfileupload($formname,'',
+							    $path);
+		
+		if ($result =~ /(error|notfound)/) {
+		    $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>');
-                }
-            }
-        }
-	    $r->print($output.'<br /><input type="submit" name="store" value="'.
+		}
+	    } else {
+		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($output.'<br /><input type="submit" name="store" value="'.
                   &mt('Store Catalog Information').'">');
         
     }
     $r->print('</form>');
-    if ($metacourse eq 'none') {
-        $r->print(&select_course());
-    }
+
     return;
 }