[LON-CAPA-cvs] cvs: loncom /interface lonmeta.pm portfolio.pm

[albertel]

albertel		Mon Dec 19 18:19:18 2005 EDT

  Modified files:              
    /loncom/interface	portfolio.pm lonmeta.pm 
  Log:
  - currentpath should already contain a / and not contain portfolio
  
  
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.91 loncom/interface/portfolio.pm:1.92
--- loncom/interface/portfolio.pm:1.91	Mon Dec 19 15:41:45 2005
+++ loncom/interface/portfolio.pm	Mon Dec 19 18:19:18 2005
@@ -132,7 +132,7 @@
         $r->print('<form method="post" action="/adm/portfolio">');
     }
     my $href_location="/uploaded/$env{'user.domain'}/$env{'user.name'}/portfolio$current_path";
-    my $href_edit_location="/editupload/$env{'user.domain'}/$env{'user.name'}/portfolio$current_path/";
+    my $href_edit_location="/editupload/$env{'user.domain'}/$env{'user.name'}/portfolio$current_path";
     foreach my $line (sort 
 		      { 
 			  my ($afile)=split('&',$a,2);
Index: loncom/interface/lonmeta.pm
diff -u loncom/interface/lonmeta.pm:1.147 loncom/interface/lonmeta.pm:1.148
--- loncom/interface/lonmeta.pm:1.147	Mon Dec 19 16:56:07 2005
+++ loncom/interface/lonmeta.pm	Mon Dec 19 18:19:18 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.147 2005/12/19 21:56:07 albertel Exp $
+# $Id: lonmeta.pm,v 1.148 2005/12/19 23:19:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -316,7 +316,7 @@
 	$meta_uri .= '.meta';
     }
 
-    my ($path) = ($res_uri =~ m|(.*)/[^/]*$|);
+    my ($path) = ($res_uri =~ m|^portfolio(.*/)[^/]*$|);
 
     if ($as_links) {
 	$res_uri = &portfolio_linked_path($res_uri);