--- loncom/interface/lonmeta.pm	2005/12/19 20:07:13	1.141
+++ loncom/interface/lonmeta.pm	2005/12/19 23:19:18	1.148
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.141 2005/12/19 20:07:13 albertel Exp $
+# $Id: lonmeta.pm,v 1.148 2005/12/19 23:19:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -290,9 +290,24 @@ sub fieldnames {
     return &Apache::lonlocal::texthash(%fields);
 }
 
+sub portfolio_linked_path {
+    my ($path) = @_;
+    my $result = &Apache::portfolio::make_anchor('portfolio','/');
+    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 .= "/$filename";
+    return $result;
+}
+
 sub portfolio_display_uri {
-    my ($uri)=@_;
-    $uri =~ s|.*/portfolio(/.*)$|$1|;
+    my ($uri,$as_links)=@_;
+    $uri =~ s|.*/(portfolio/.*)$|$1|;
     my ($res_uri,$meta_uri) = ($uri,$uri);
 
     if ($uri =~ /\.meta$/) {
@@ -300,14 +315,21 @@ sub portfolio_display_uri {
     } else {
 	$meta_uri .= '.meta';
     }
-    return ($res_uri,$meta_uri);
+
+    my ($path) = ($res_uri =~ m|^portfolio(.*/)[^/]*$|);
+
+    if ($as_links) {
+	$res_uri = &portfolio_linked_path($res_uri);
+	$meta_uri = &portfolio_linked_path($meta_uri);
+    }
+    return ($res_uri,$meta_uri,$path);
 }
 
 sub pre_select_course {
     my ($r,$uri) = @_;
     my $output;
     my $fn=&Apache::lonnet::filelocation('',$uri);
-    my ($res_uri,$meta_uri) = &portfolio_display_uri($uri);
+    my ($res_uri,$meta_uri,$path) = &portfolio_display_uri($uri);
     %Apache::lonpublisher::metadatafields=();
     %Apache::lonpublisher::metadatakeys=();
     my $result=&Apache::lonnet::getfile($fn);
@@ -322,13 +344,19 @@ sub pre_select_course {
     $r->print($output.'<br /><input type="submit" name="store" value="'.
                   &mt('Associate Resource With Selected Course').'">');
     $r->print('</form>');
+    
+    $r->print('<br /><br /><form method="POST" action="/adm/portfolio">'.
+              '<input type="hidden" name="currentpath" value="'.$path.'" />'.
+	      '<input type="submit" name="cancel" value="'.&mt('Cancel').'">'.
+	      '</form>');
+
     return;
 }
 sub select_course {
     my %courses;
     my $output;
     my $selected;
-    foreach my $key (keys (%env)) { 
+    foreach my $key (keys(%env)) { 
         if ($key =~ m/\.metadata\./) {
             $key =~ m/^course\.(.+)(\.metadata.+$)/;
             my $course = $1;
@@ -337,7 +365,6 @@ sub select_course {
             $courses{$coursekey} = $value;
         }
     }
-    &Apache::lonnet::logthis('the restricted is'.$Apache::lonpublisher::metadatafields{'courserestricted'});
     my $meta_not_found = 1;
     if ($Apache::lonpublisher::metadatafields{'courserestricted'} eq 'none') {
         $selected = ' SELECTED ';
@@ -1044,8 +1071,9 @@ sub present_editable_metadata {
     $disuri=~s/^\/\~/\/priv\//;
     $disuri=~s/\.meta$//;
     my $meta_uri = $disuri;
+    my $path;
     if ($disuri =~ m|/portfolio/|) {
-	($disuri, $meta_uri) =  &portfolio_display_uri($disuri);
+	($disuri, $meta_uri, $path) =  &portfolio_display_uri($disuri,1);
     }
     my $target=$uri;
     $target=~s/^\/\~/\/res\/$env{'request.role.domain'}\//;
@@ -1142,7 +1170,7 @@ ENDEDIT
         } else {
             $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}=
@@ -1152,12 +1180,12 @@ ENDEDIT
                 # handle restrictions here
                 if (($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/active/) ||
                     ($field_name eq 'courserestricted')){
-                    $output.=('<p>'.$lt{$field_name}.': '.
+                    $output.=("\n".'<p>'.$lt{$field_name}.': '.
                               &prettyinput($field_name,
 				   $Apache::lonpublisher::metadatafields{$field_name},
 				                    'new_'.$field_name,'defaultmeta',
 				                    undef,undef,undef,undef,
-				                    $Apache::lonpublisher::metadatafields{'courserestricted'}).'</p>');
+				                    $Apache::lonpublisher::metadatafields{'courserestricted'}).'</p>'."\n");
                  }
             } else {
 
@@ -1168,73 +1196,78 @@ ENDEDIT
                
             }
         }
-
-	    $r->print($output.'<br /><input type="submit" name="store" value="'.
-                  &mt('Store Catalog Information').'">');
-        
-    }
-    $r->print('</form>');
-            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.'>';
+	    }
+	    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>');
-                }
-            }
-        }
+		}
+	    } 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>
+               <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').'">');
+
+    }
+    $r->print('</form>');
+
     return;
 }