--- loncom/interface/lonmeta.pm	2006/05/31 17:44:14	1.158
+++ loncom/interface/lonmeta.pm	2006/08/04 19:42:55	1.162
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.158 2006/05/31 17:44:14 www Exp $
+# $Id: lonmeta.pm,v 1.162 2006/08/04 19:42:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -287,8 +287,7 @@ sub portfolio_linked_path {
     if ($group) {
 	$start = "groups/$group/".$start;
     }
-    my $result = &Apache::portfolio::make_anchor($port_path,$start,'/',
-						 undef,undef,undef,$group);
+    my $result = &Apache::portfolio::make_anchor($port_path,$start,'/');
     
     my $fullpath = '/';
     my (undef,@tree) = split('/',$path);
@@ -296,8 +295,7 @@ sub portfolio_linked_path {
     foreach my $dir (@tree) {
 	$fullpath .= $dir.'/';
 	$result .= '/';
-	$result .= &Apache::portfolio::make_anchor($port_path,$dir,$fullpath,
-						   undef,undef,undef,$group);
+	$result .= &Apache::portfolio::make_anchor($port_path,$dir,$fullpath);
     }
     $result .= "/$filename";
     return $result;
@@ -316,6 +314,9 @@ sub get_port_path_and_group {
     } else {
 	$port_path = '/adm/portfolio';
     }
+    if ($env{'form.group'} ne $group) {
+	$env{'form.group'} = $group;
+    }
     return ($port_path,$group);
 }
 
@@ -715,14 +716,13 @@ sub handler {
     #
     my ($resdomain,$resuser)=
         (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);
-
     if ($uri=~m:/adm/bombs/(.*)$:) {
         $r->print(&Apache::loncommon::start_page('Error Messages'));
         # Looking for all bombs?
         &report_bombs($r,$uri);
-    } elsif ($uri=~/\/portfolio\//) {
+    } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/portfolio/|) {
 	    ($resdomain,$resuser)=
-	    (&Apache::lonnet::declutter($uri)=~m|^(\w+)/(\w+)/portfolio|);
+		(&Apache::lonnet::declutter($uri)=~m|^(\w+)/(\w+)/portfolio|);
         $r->print(&Apache::loncommon::start_page('Edit Portfolio File Catalog Information',
 						 undef,
 						 {'domain' => $resdomain,}));
@@ -731,7 +731,7 @@ sub handler {
         } else {
             &pre_select_course($r,$uri);
         }
-    } elsif ($uri=~/^\/\~/) { 
+    } elsif ($uri=~m|^/~|) { 
         # Construction space
         $r->print(&Apache::loncommon::start_page('Edit Catalog nformation',
 						 undef,
@@ -797,6 +797,7 @@ ENDCLEAR
 sub present_uneditable_metadata {
     my ($r,$uri) = @_;
     #
+    my $uploaded = ($uri =~ m|/uploaded/|);
     my %content=();
     # Read file
     foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {
@@ -809,16 +810,18 @@ sub present_uneditable_metadata {
     my $disuri=&Apache::lonnet::clutter($uri);
     $disuri=~s/^\/adm\/wrapper//;
     # version
-    my $currentversion=&Apache::lonnet::getversion($disuri);
     my $versiondisplay='';
-    if ($thisversion) {
-        $versiondisplay=&mt('Version').': '.$thisversion.
-            ' ('.&mt('most recent version').': '.
-            ($currentversion>0 ? 
-             $currentversion   :
-             &mt('information not available')).')';
-    } else {
-        $versiondisplay='Version: '.$currentversion;
+    if (!$uploaded) {
+	my $currentversion=&Apache::lonnet::getversion($disuri);
+	if ($thisversion) {
+	    $versiondisplay=&mt('Version').': '.$thisversion.
+		' ('.&mt('most recent version').': '.
+		($currentversion>0 ? 
+		 $currentversion   :
+		 &mt('information not available')).')';
+	} else {
+	    $versiondisplay='Version: '.$currentversion;
+	}
     }
     # crumbify displayed URL               uri     target prefix form  size
     $disuri=&Apache::lonhtmlcommon::crumbs($disuri,undef, undef, undef,'+1');
@@ -875,7 +878,7 @@ $versiondisplay
 $table
 </table>
 ENDHEAD
-    if ($env{'user.adv'}) {
+    if (!$uploaded && $env{'user.adv'}) {
         &print_dynamic_metadata($r,$uri,\%content);
     }
     return;
@@ -1247,22 +1250,13 @@ ENDEDIT
 		     '<>&"').
 		     '</'.$tag.'>';
 	    }
-	    if ($fn =~ m|/portfolio/|) {
+	    if ($fn =~ m|^$Apache::lonnet::perlvar{'lonDocRoot'}/userfiles/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(&store_portfolio_metadata($formname,$file_content,$path,
+                                                    $new_fn));    
+            } elsif ($fn =~  m|^$Apache::lonnet::perlvar{'lonDocRoot'}/userfiles/groups/\w+/portfolio/|) {
+                my ($path, $new_fn) = ($fn =~ m|/(groups/\w+/portfolio.*)/([^/]*)$|);
+                $r->print(&store_portfolio_metadata($formname,$file_content,$path,$new_fn));
 	    } else {
 		if (!  ($mfh=Apache::File->new('>'.$fn))) {
 		    $r->print('<p><font color="red">'.
@@ -1282,6 +1276,9 @@ ENDEDIT
 
 	if ($file_type eq 'portfolio') {
 	    my ($port_path,$group) = &get_port_path_and_group($uri);
+            if ($group) {
+                $r->print('<input type="hidden" name="group" value="'.$group.'" />');
+            }
 	    $r->print('</form>
                <br /><br /><form method="POST" action="'.$port_path.'">'.
 		      '<input type="hidden" name="group" value="'.$group.'" />'.
@@ -1295,7 +1292,21 @@ ENDEDIT
     return;
 }
 
+sub store_portfolio_metadata {
+    my ($formname,$content,$path,$new_fn) = @_;
+    $env{'form.'.$formname}=$content."\n";
+    $env{'form.'.$formname.'.filename'}=$new_fn;
+    my $result =&Apache::lonnet::userfileupload($formname,'',$path);
+    if ($result =~ /(error|notfound)/) {
+        return '<p><font color="red">'.
+                  &mt('Could not write metadata').', '.
+                  &mt('FAIL').'</font></p>';
+    } else {
+        return '<p><font color="blue">'.&mt('Wrote Metadata').
+                  ' '.&Apache::lonlocal::locallocaltime(time).'</font></p>';
+    }
+}
+
 1;
 __END__
 
-