Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv28145/lib/SandWeb
Modified Files:
Browse.pm
Log Message:
* browse now uses accepts module_name, implementation could use
work but I think it's basically correct
* i did some other clean up and managed to break the VCS pulldown.
no big deal, since VCS commands won't work until browse_module_menu
is rewritten to support the new multi-repo stuff anyway.
Index: Browse.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Browse.pm,v
retrieving revision 1.47
retrieving revision 1.48
diff -U2 -r1.47 -r1.48
--- Browse.pm 13 Feb 2002 08:31:09 -0000 1.47
+++ Browse.pm 19 Feb 2002 06:45:10 -0000 1.48
@@ -16,4 +16,5 @@
my $username = $args{'username'};
my $template_dir = $args{'template_dir'};
+ my $module_name = $args{'module_name'};
my $users_dir = $args{'users_dir'};
my $log_obj = $args{'log_obj'};
@@ -22,4 +23,5 @@
'username' => $username,
'template_dir' => $template_dir,
+ 'module_name' => $module_name,
'users_dir' => $users_dir,
'log_obj' => $log_obj,
@@ -32,17 +34,18 @@
sub browse {
my $self = shift;
- my $location = shift;
- my $progname = shift;
- my $vcs_commands = shift;
- my $file_commands = shift;
- my $repo_type = shift;
-
my %args = @_;
+ my $location = $args{'location'};
+ my $progname = $args{'progname'};
+ my $vcs_commands = $args{'vcs_commands'};
+ my $file_commands = $args{'file_commands'};
+ my $repo_type = $args{'repo_type'};
+
my $username = $self->_get_username();
my $users_dir = $self->_get_users_dir();
+ my $module_name = $self->_get_module_name();
my $template_dir = $self->_get_template_dir();
my $log = $self->_get_log_obj;
- my $sandbox = "$users_dir/$username";
+ my $sandbox = "$users_dir/$username/$module_name";
my @vcs_commands = split (/ /, $vcs_commands );
my @file_commands = split (/ /, $file_commands );
@@ -73,6 +76,7 @@
unless ($count) {
my %row_data;
- $row_data{LOCATION_LINK} = "[root]";
+ $row_data{LOCATION_LINK} = "[$module_name]";
$row_data{LOCATION_FULL} = "/";
+ $row_data{MODULE_NAME} = "$module_name";
$row_data{PROGNAME} = "$progname";
push (@loop_data, \%row_data);
@@ -99,4 +103,5 @@
$content->param(
PROGNAME => $progname,
+ MODULE_NAME => $module_name,
LOCATION => $location,
LOCATION_LOOP => \@loop_data,
@@ -207,4 +212,8 @@
my $self = shift;
return $self->{'users_dir'};
+}
+sub _get_module_name {
+ my $self = shift;
+ return $self->{'module_name'};
}
|
