[Sandweb-commit] CVS: sandweb/lib/SandWeb Config.pm,1.17,1.18

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

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

Modified Files:
	Config.pm 
Log Message:
* added all methods for getting repository info & updated CGI
* fixed bug in Config (missing params in newly created method).



Index: Config.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Config.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -U2 -r1.17 -r1.18
--- Config.pm	18 Feb 2002 10:41:06 -0000	1.17
+++ Config.pm	18 Feb 2002 10:55:32 -0000	1.18
@@ -115,4 +115,58 @@
 
 
+sub get_repo_server {
+	my $self = shift;
+	my %args = @_;
+	my $repo_name = $args{'repo'};
+	if ($self->repository_exists(repo => $repo_name)) {
+		return $self->{'repo'}->{$repo_name}->{'server'} || ''
+	} else {
+		return '';
+	}
+}
+sub get_repo_username {
+	my $self = shift;
+	my %args = @_;
+	my $repo_name = $args{'repo'};
+	if ($self->repository_exists(repo => $repo_name)) {
+		return $self->{'repo'}->{$repo_name}->{'username'} || ''
+	} else {
+		return '';
+	}
+}
+sub get_repo_connection {
+	my $self = shift;
+	my %args = @_;
+	my $repo_name = $args{'repo'};
+	if ($self->repository_exists(repo => $repo_name)) {
+		return $self->{'repo'}->{$repo_name}->{'connection'} || ''
+	} else {
+		return '';
+	}
+}
+sub get_repo_type {
+	my $self = shift;
+	my %args = @_;
+	my $repo_name = $args{'repo'};
+	if ($self->repository_exists(repo => $repo_name)) {
+		return $self->{'repo'}->{$repo_name}->{'type'} || ''
+	} else {
+		return '';
+	}
+}
+sub get_repo_root {
+	my $self = shift;
+	my %args = @_;
+	my $repo_name = $args{'repo'};
+	if ($self->repository_exists(repo => $repo_name)) {
+		return $self->{'repo'}->{$repo_name}->{'root'} || ''
+	} else {
+		return '';
+	}
+}
+
+
+
+
 #############################################################################
 #############################################################################
@@ -158,15 +212,19 @@
 	my $repo = $args{'repo'};
 	my $module = $args{'module'};
-	my $module_desc = $args{'module_desc'};
-	if ($self->repository_exists()) {
-		if (!$self->module_exists()) {
-			$self->{'repo'}->{$repo}->{'module'}->{$module}->{'desc'} = $module_desc;
-			$self->{'repo'}->{$repo}->{'module'}->{$module}->{'name'} = $module;
+	my $module_desc = $args{'module_desc'} || '';
+	if ($self->repository_exists(repo => $repo_name)) {
+		if (!$self->module_exists(
+							repo => $repo_name, 
+							module => $module_name)) {
+			$self->{'repo'}->{$repo}->{'module'}->{$module}->{'desc'} = 
+																$module_desc;
+			$self->{'repo'}->{$repo}->{'module'}->{$module}->{'name'} = 
+																$module;
 		} else {
-			$self->{'log_obj'}->("module '$module' already exists for repository '$repo'.\n");
+			$self->{'log_obj'}->("module '$module' already exists for repo '$repo'.\n");
 			return 0;
 		}
 	} else {
-		$self->{'log_obj'}->("repository '$repo' already exists.\n");
+		$self->{'log_obj'}->("repo '$repo' already exists.\n");
 		return 0;
 	}
@@ -180,13 +238,15 @@
 	my $module = $args{'module'};
 
-	if (!$self->repository_exists()) {
-		if ($self->module_exists()) {
-			return $self->{'repo'}->{$repo}->{'module'}->{$module}->{'module_desc'};
+	if (!$self->repository_exists(repo => $repo_name)) {
+		if ($self->module_exists(
+							repo => $repo_name,
+							module => $module )) {
+			return $self->{'repo'}->{$repo}->{'module'}->{$module}->{'module_desc'} || '';
 		} else {
-			$self->{'log_obj'}->("module '$module' does not exist for repository '$repo'.\n");
+			$self->{'log_obj'}->("module '$module' does not exist for repo '$repo'.\n");
 			return '';
 		}
 	} else {
-		$self->{'log_obj'}->("repository '$repo' does not exist.\n");
+		$self->{'log_obj'}->("repo '$repo' does not exist.\n");
 		return '';
 	}