--- loncom/interface/lonmeta.pm	2006/05/20 06:34:50	1.155
+++ loncom/interface/lonmeta.pm	2006/05/30 12:46:09	1.157
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.155 2006/05/20 06:34:50 albertel Exp $
+# $Id: lonmeta.pm,v 1.157 2006/05/30 12:46:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,6 +39,8 @@ use Apache::lonpublisher;
 use Apache::lonlocal;
 use Apache::lonmysql;
 use Apache::lonmsg;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 
 ############################################################
@@ -108,7 +110,7 @@ sub get_dynamic_metadata_from_sql {
             next if (! $result);
             my @Data = 
                 map { 
-                    &Apache::lonnet::unescape($_); 
+                    &unescape($_); 
                 } split(',',$result);
             my $url = $Data[0];
             for (my $i=0;$i<=$#Fields;$i++) {
@@ -318,10 +320,12 @@ sub portfolio_linked_path {
     return $result;
 }
 
-sub portfolio_display_uri {
-    my ($uri,$as_links)=@_;
+sub get_port_path_and_group {
+    my ($uri)=@_;
+
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+
     my ($port_path,$group);
     if ($uri =~ m{^/editupload/\Q$cdom\E/\Q$cnum\E/groups/}) {
 	$group = (split('/',$uri))[5];
@@ -329,6 +333,14 @@ sub portfolio_display_uri {
     } else {
 	$port_path = '/adm/portfolio';
     }
+    return ($port_path,$group);
+}
+
+sub portfolio_display_uri {
+    my ($uri,$as_links)=@_;
+
+    my ($port_path,$group) = &get_port_path_and_group($uri);
+
     $uri =~ s|.*/(portfolio/.*)$|$1|;
     my ($res_uri,$meta_uri) = ($uri,$uri);
     if ($uri =~ /\.meta$/) {
@@ -365,8 +377,10 @@ sub pre_select_course {
                   &mt('Associate Resource With Selected Course').'">');
     $r->print('</form>');
     
-    $r->print('<br /><br /><form method="POST" action="/adm/portfolio">'.
+    my ($port_path,$group) = &get_port_path_and_group($uri);
+    $r->print('<br /><br /><form method="POST" action="'.$port_path.'">'.
               '<input type="hidden" name="currentpath" value="'.$path.'" />'.
+	      '<input type="hidden" name="group" value="'.$group.'" />'.
 	      '<input type="submit" name="cancel" value="'.&mt('Cancel').'">'.
 	      '</form>');
 
@@ -1284,8 +1298,10 @@ ENDEDIT
                   &mt('Store Catalog Information').'">');
 
 	if ($file_type eq 'portfolio') {
+	    my ($port_path,$group) = &get_port_path_and_group($uri);
 	    $r->print('</form>
-               <br /><br /><form method="POST" action="/adm/portfolio">'.
+               <br /><br /><form method="POST" action="'.$port_path.'">'.
+		      '<input type="hidden" name="group" value="'.$group.'" />'.
 		      '<input type="hidden" name="currentpath" value="'.$path.'" />'.
 		      '<input type="submit" name="cancel" value="'.&mt('Discard Edits and Return to Portfolio').'">');
 	}