[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.183,1.184

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

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

Modified Files:
	sandweb.cgi 
Log Message:
* forgot about saving repo_username (done)
* split add_module_entry into add_module & update module
* cleaned up some code
* fixed bug in add/update repo


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.183
retrieving revision 1.184
diff -U2 -r1.183 -r1.184
--- sandweb.cgi	18 Feb 2002 12:29:58 -0000	1.183
+++ sandweb.cgi	18 Feb 2002 21:43:52 -0000	1.184
@@ -1244,10 +1244,20 @@
 	my @module_list =  $user->get_module_list(repo => $repo_name ); 
 
-	my $exist = 0;
 	push @module_list, $module_name;
-	$user->add_module_entry(repo => $repo_name,
-							module => $module_name,
-							module_description => $module_description,
-	);
+	if ($user->module_exists(repo => $repo_name)) {
+		# update module
+		$user->update_module(
+					repo => $repo_name,
+					module => $module_name,
+					module_description => $module_description,
+		);
+	} else {
+		# add module
+		$user->add_module(	
+					repo => $repo_name,
+					module => $module_name,
+					module_description => $module_description,
+		);
+	}
 							
 	my $username = $auth->get_username();
@@ -1376,7 +1386,9 @@
     # commit data to file
 	if ($user->repository_exists(repo => $repo_name)) {
+		$log->debug("updating: username '$repo_username'\n");
 		$user->update_repo(
 			name => $repo_name, 
 			server => $repo_server,
+			username => $repo_username,
 			connection => $repo_connection,
 			type => $repo_type,
@@ -1387,4 +1399,5 @@
 			name => $repo_name, 
 			server => $repo_server,
+			username => $repo_username,
 			connection => $repo_connection,
 			type => $repo_type,
@@ -1392,13 +1405,4 @@
 		);
 	}
-
-#    my $username = $auth->get_username();
-#    # write config data into the .$user_cfg file in the users directory
-#	$log->debug("pre-write\n");
-#    $log->debug('dump', $user);
-#    my ($return, $msg) = $user->write_preferences_config(
-#        'config_dir' => $config->{'paths'}->{'users_dir'} . "/$username",
-#        'config_file' => ".$user_cfg",
-#    );
 
 	my $return = write_config();