--- loncom/interface/portfolio.pm	2004/06/08 18:34:20	1.1
+++ loncom/interface/portfolio.pm	2004/06/18 20:42:16	1.2
@@ -1,55 +1,43 @@
 package Apache::portfolio;
 use strict;
 use Apache::Constants qw(:common :http);
-# use Apache::loncommon;
+use Apache::loncommon;
 use Apache::lonnet;
-# use Apache::lontexconvert;
-# use Apache::lonfeedback;
-# use Apache::lonlocal;
+use Apache::lontexconvert;
+use Apache::lonfeedback;
+use Apache::lonlocal;
 
 sub handler {
 	my $r=@_[0];
 	$r->content_type('text/html');
 	$r->send_http_header;
 	return OK if $r->header_only;
-	$r->print("the portfolio handler is in use by $ENV{'user.name'} looking for "
-		.$r->uri."<br />");
 	my $file=&Apache::lonnet::filelocation("",$r->uri);	
 	my $contents=&Apache::lonnet::getfile($file);
-#	$r->print($contents);
+	$r->print ('<br />Current contents of your portfolio directory: <br />');
+	$r->print (&Apache::lonnet::portfoliolist($r->uri, $ENV{'user.domain'}, $ENV{'user.name'}, udef ));
+	$r->print ('<br /> call to dirlist precedes <br />');
+	if ($ENV{'form.uploaddoc.filename'}){
+		$r->print ('<br /> call to userfileupload follows <br />');
+		$r->print (&Apache::lonnet::userfileupload('uploaddoc',undef,'portfolio').'<br />');	
+		$r->print ('<br /> call to userfileupload precedes <br />');
+	}
+
+	$r->print ($ENV{'form.uploaddoc.filename'}.'<br />');
+	$r->print ($ENV{'form.storeupl'}.'<br />');
+	$r->print ($ENV{'form.saywhat'}.'<br />');
 
 	$r->print("here's the form<br />");
-	$r->print('<form method=post enctype="multipart/form-data" action="'.$r->uri.'">');
-	$r->print('<input type=submit value="upload">');
-	$r->print('<input name="saywhat" type="file">');
+	# file upload form 
+	$r->print('<form method="post" enctype="multipart/form-data">');
+	$r->print('<input name="uploaddoc" type="file">'.
+	
+		'<input type="submit" name="storeupl" value="Upload">'
+		);
 	$r->print('</form>');
 	return OK;
-#	my $something = "this is something<br />";
-#	my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
-# Is this even a user?
-#    if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
-#	$r->print('</head><body>'.
-#		  &mt('No user information available').'</body></html>');
-#       return OK;
-#    }
-
 
-
-#	$r->print($something);
-#	$r->print($r);
-#	$r->print($ENV{'user.name'});
-#	$r->print("<br />should have printed username above<br />");
-#	my $key = "";
-#	foreach my $key (sort(keys(%ENV))) {
-#		$r->print("$key is $ENV{$key} <br />\n");
-#	}
-#
-#	my @envkeys = keys(%ENV);	
-#	my $i = 0;
-#	for ($i = 0; $i < 30; $i++){
-#		$r->print("Key $i is $envkeys[$i] <br />");
-#	}
-#	return OK;
 }
+
 1;
 __END__
