[Sandweb-commit] CVS: sandweb/lib/SandWeb Config.pm,1.21,1.22

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

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

Modified Files:
	Config.pm 
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: Config.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Config.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -U2 -r1.21 -r1.22
--- Config.pm	18 Feb 2002 12:29:58 -0000	1.21
+++ Config.pm	18 Feb 2002 21:43:53 -0000	1.22
@@ -57,19 +57,13 @@
 	foreach my $repo_name ($self->get_repo_list()) {
 		if ( ($self->{'repo'}->{$repo_name}->{'module'}->{'name'}) &&
-			(ref(\$self->{'repo'}->{$repo_name}->{'module'}->{'name'}) eq 'SCALAR')) {
+			(ref(\$self->{'repo'}->{$repo_name}->{'module'}->{'name'}) eq 
+			'SCALAR')) {
 	
 			my %temp = %{$self->{'repo'}->{$repo_name}->{'module'}};
 			%{$self->{'repo'}->{$repo_name}->{'module'}} = ();
-			%{$self->{'repo'}->{$repo_name}->{'module'}->{$temp{'name'}}} = %temp;
+			%{$self->{'repo'}->{$repo_name}->{'module'}->{$temp{'name'}}} = 
+																		%temp;
 		}
 	}
-
-#    foreach my $repo_name ($self->get_repo_list()) {
-#        if (ref(\$self->{'repo'}->{$repo_name}->{'module_list'}) ne 'ARRAY') {
-#            my $temp_module = $self->{'repo'}->{$repo_name}->{'module_list'};
-#            $self->{'repo'}->{$repo_name}->{'module_list'} = [];
-#            push @{$self->{'repo'}->{$repo_name}->{'module_list'}}, $temp_module;
-#        }
-#    }
 }
 
@@ -152,4 +146,5 @@
 	my $name = $args{'name'} || '';
 	my $server = $args{'server'} || '';
+	my $username = $args{'username'} || '';
 	my $connection = $args{'connection'} || '';
 	my $type = $args{'type'} || '';
@@ -162,4 +157,5 @@
 		$self->{'repo'}->{$name}->{'name'} = $name;
 		$self->{'repo'}->{$name}->{'server'} = $server;
+		$self->{'repo'}->{$name}->{'username'} = $username;
 		$self->{'repo'}->{$name}->{'connection'} = $connection;
 		$self->{'repo'}->{$name}->{'type'} = $type;
@@ -172,18 +168,20 @@
 	my $self = shift;
 	my %args = @_;
-	my $name = $args{'repo'};
+	my $name = $args{'name'};
 	my $server = $args{'server'} || '';
+	my $username = $args{'username'} || '';
 	my $connection = $args{'connection'} || '';
 	my $type = $args{'type'} || '';
 	my $root = $args{'root'} || '';
 
-	if (!$self->repository_exists(repo => $name)) {
-		return 0;
-	} else {
+	if ($self->repository_exists(repo => $name)) {
 		$self->{'repo'}->{$name}->{'name'} = $name;
 		$self->{'repo'}->{$name}->{'server'} = $server if ($server);
+		$self->{'repo'}->{$name}->{'username'} = $username if ($username);
 		$self->{'repo'}->{$name}->{'connection'} = $connection if ($connection);
 		$self->{'repo'}->{$name}->{'type'} = $type if ($type);
 		$self->{'repo'}->{$name}->{'root'} = $root if ($root);
+	} else {
+		return 0;
 	}
 }
@@ -351,5 +349,5 @@
 }
 
-sub add_module_entry {
+sub add_module {
 	my $self = shift;
 	my %args = @_;
@@ -360,15 +358,35 @@
 	$log->debug("module_description = '$module_description'\n");
 	if ($self->repository_exists(repo => $repo)) {
-		#if (!$self->module_exists(
-		#					repo => $repo, 
-		#					module => $module)) {
+		if (!$self->module_exists(
+							repo => $repo, 
+							module => $module)) {
 			$self->{'repo'}->{$repo}->{'module'}->{$module}->{'description'} = 
 														$module_description;
 			$self->{'repo'}->{$repo}->{'module'}->{$module}->{'name'} = 
 														$module;
-		#} else {
-		#	$log->debug("module '$module' already exists for repo '$repo'.\n");
-		#	return 0;
-		#}
+		} else {
+			$log->debug("module '$module' already exists for repo '$repo'.\n");
+			return 0;
+		}
+	} else {
+		$log->debug("repo '$repo' does not exist.\n");
+		return 0;
+	}
+	return 1;		
+}
+
+sub update_module {
+	my $self = shift;
+	my %args = @_;
+	my $log = $self->{'log_obj'};
+	my $repo = $args{'repo'} || '';
+	my $module = $args{'module'} || '';
+	my $module_description = $args{'module_description'} || '';
+	$log->debug("module_description = '$module_description'\n");
+	if ($self->repository_exists(repo => $repo)) {
+		$self->{'repo'}->{$repo}->{'module'}->{$module}->{'description'} = 
+													$module_description;
+		$self->{'repo'}->{$repo}->{'module'}->{$module}->{'name'} = 
+													$module;
 	} else {
 		$log->debug("repo '$repo' does not exist.\n");