[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.168,1.169

[Nick J. <nje...@us...>]

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

Modified Files:
	sandweb.cgi 
Log Message:
* fixed up the checkout_commit() menu. It still doesn't actually checkout
  anything, however it does execute sucessfully, and most code for it
  is in place. Need to figure out how to use the javascript popup window
  for the VCS output, and also how to do the checkout at all. :)


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.168
retrieving revision 1.169
diff -U2 -r1.168 -r1.169
--- sandweb.cgi	13 Feb 2002 05:50:34 -0000	1.168
+++ sandweb.cgi	13 Feb 2002 06:44:13 -0000	1.169
@@ -1239,5 +1239,6 @@
 # args:
 # 	ck_auth		- the sessions cookie
-#	module		- module name to checkout
+#	module_name	- module name to checkout
+#	repo_name	- name of repository module is in
 ###############################################################################
 
@@ -1249,15 +1250,14 @@
 		exit 0;
 	}
-	# this is where the Repository object is used
-	my $server = $user->{'repository'}->{'server'};
-	my $vcs_username = $user->{'repository'}->{'username'};
-	my $repo_type = $user->{'repository'}->{'repo_type'};
-	my $connection = $user->{'repository'}->{'connection'};
-	my $root = $user->{'repository'}->{'root'};
+	my $module = $args{'module_name'};
+	my $repo_name = $args{'repo_name'};
 
-	my $sandbox = $user->{'paths'}->{'users_dir'};
-	my @vcs_output = ();
-	my @vcs_error = ();
-	my $vcsroot;
+	my $repo_server = $user->{'repo'}->{'server'};
+	my $repo_username = $user->{'repo'}->{$repo_name}->{'username'};
+	my $repo_type = $user->{'repo'}->{$repo_name}->{'type'};
+	my $repo_connection = $user->{'repo'}->{$repo_name}->{'connection'};
+	my $repo_root = $user->{'repo'}->{$repo_name}->{'root'};
+	
+	my @module_list = @{$user->{'repo'}->{$repo_name}->{'module_list'}};
 
 	my $username = $auth->get_userinfo('username');
@@ -1265,9 +1265,13 @@
 	my $users_dir = $config->{'paths'}->{'users_dir'};
 
+	my $vcsroot;
+	my @vcs_output = ();
+	my @vcs_error = ();
 	if ( $repo_type eq 'CVS' ) {
-		if ( $connection eq 'local' ) {
-			$vcsroot = "$root";
+		if ( $repo_connection eq 'local' ) {
+			$vcsroot = "$repo_root";
 		} else {
-			$vcsroot = ":$connection:$vcs_username\@$server:$root";
+			$vcsroot = 
+				":$repo_connection:$repo_username\@$repo_server:$repo_root";
 		}
 	}
@@ -1286,5 +1290,5 @@
 #		sandbox => "$users_dir/$username",
 #	);
-#
+
 #	my $content = $ui->get_menu(
 #		MENU => 'vcs_output',
@@ -1304,5 +1308,5 @@
 #		ERROR => $error,
 #	);
-#	exit 0;
+	exit 0;
 }