[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.103,1.104

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv31315/bin

Modified Files:
	sandweb.cgi 
Log Message:

made mime.types location and filename configurable in sandweb.cfg



Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.103
retrieving revision 1.104
diff -U2 -r1.103 -r1.104
--- sandweb.cgi	2001/12/20 23:31:31	1.103
+++ sandweb.cgi	2001/12/21 01:12:47	1.104
@@ -439,11 +439,4 @@
         }
 
-	$log->debug("creating Repository object");
-	my $repository = SandWeb::Repository->new(
-		root => $vcsroot,
-		repo_type => $repo_type,
-		sandbox => "$users_dir/$username/$location",
-	);
-
 	my $group;
 	my $permissions;
@@ -454,4 +447,5 @@
 		$log->debug("creating file object");
 		$file = SandWeb::File->new(
+			'config_obj' => $config,
 			'log_obj' => $log,
         	       	'filename' => $filename,
@@ -459,32 +453,6 @@
 		);
 	}
-
-	if ( $file_command eq 'info' ) {
-		$log->debug("calling file info routine");
-		# can't give the leading / to the VCS
-		$filename =~ s/\///;
 
-		my %return = $repository->log( file => "$filename" );
-		my $content = $ui->get_menu(
-			MENU => 'file_info',
-                       	PROGNAME => $progname,
-                       	LOCATION => $location,
-                       	FULLPATH => "$users_dir/$username/$location",
-			VCS_OUTPUT => $return{'output'},
-                       	VCS_ERROR => $return{'error'},
-                );
-
-		print header( -cookie => $cookie );
-		$ui->print_screen(
-                	TITLE=> 'SandWeb : File Info',
-                        MENU_TITLE => 'SandWeb',
-                        SUBMENU_TITLE => 'file info',
-                        FOOTER => '',
-                        CONTENT => $content,
-                        ERROR => $error,
-               	);
-               	exit 0;
-	}
-	elsif ( $file_command eq 'view' ) {
+	if ( $file_command eq 'view' ) {
 		$log->debug("viewing file : $filename");