sandweb-commit Mailing List for SandWeb (Page 37)

Brought to you by: formnull, njennings

sandweb-commit — CVS activity

You can subscribe to this list here.

2001	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct (28)	_Nov (58)	_Dec (85)
2002	_Jan (125)	_Feb (222)	_Mar (274)	_Apr (51)	_May (22)	_Jun (50)	_Jul (15)	_Aug (33)	_Sep (11)	_Oct (29)	_Nov (17)	_Dec (1)
2003	_Jan (100)	_Feb (21)	_Mar (7)	_Apr (45)	_May	_Jun (43)	_Jul (27)	_Aug (24)	_Sep	_Oct	_Nov	_Dec
2004	_Jan (1)	_Feb	_Mar (13)	_Apr	_May (1)	_Jun	_Jul	_Aug (7)	_Sep	_Oct	_Nov	_Dec (4)
2005	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec (1)

Flat | Threaded

<< < 1 .. 35 36 37 38 39 .. 53 > >> (Page 37 of 53)

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

From: Rob H. <for...@us...> - 2002-02-20 04:49:52

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

Modified Files:
	Repository.pm 
Log Message:
hmm, "watchers" wasn't implemented. odd, it used to be there.


Index: Repository.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -U2 -r1.21 -r1.22
--- Repository.pm	19 Feb 2002 09:09:13 -0000	1.21
+++ Repository.pm	20 Feb 2002 04:49:49 -0000	1.22
@@ -566,4 +566,30 @@
 }
 
+sub watchers {
+	my $self = shift;
+	my %args = @_;
+
+	my $recurse = $args{'recurse'};
+	my $set = $args{'set'};
+	my $notify = $args{'notify'};
+	my $file = $args{'file'};
+	my $repo_type = $self->get_repo_type();
+	my $root = $self->get_root();
+	my $sandbox = $self->get_sandbox();
+	my %return = {};
+	my $vcs = SandWeb::Repository::CVS->new(root => $root,
+						sandbox => $sandbox);
+
+	if ($repo_type eq 'CVS') {
+	%return = $vcs->watchers(recurse => $recurse,
+				 date => $date,
+				 set => $set,
+				 notify => $notify,
+				 file => $file );
+	} 
+
+	return %return;
+}
+
 sub get_repo_type {
 	my $self = shift;

[Sandweb-commit] CVS: sandweb/lib/SandWeb Browse.pm,1.52,1.53

From: Rob H. <for...@us...> - 2002-02-20 04:46:58

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

Modified Files:
	Browse.pm 
Log Message:
file commands behaving more sanely now; took out "current location" from
everywhere but browse_module_menu, it's broken now and also the implemention
was a hack.


Index: Browse.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Browse.pm,v
retrieving revision 1.52
retrieving revision 1.53
diff -U2 -r1.52 -r1.53
--- Browse.pm	19 Feb 2002 09:09:13 -0000	1.52
+++ Browse.pm	20 Feb 2002 04:46:55 -0000	1.53
@@ -70,5 +70,5 @@
 		$location =~ s:\.\./::g;
 	} else {
-		$location = '/';
+		$location = '';
 	}
 	my @location_link;

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.191,1.192

From: Rob H. <for...@us...> - 2002-02-20 04:46:58

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

Modified Files:
	sandweb.cgi 
Log Message:
file commands behaving more sanely now; took out "current location" from
everywhere but browse_module_menu, it's broken now and also the implemention
was a hack.


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.191
retrieving revision 1.192
diff -U2 -r1.191 -r1.192
--- sandweb.cgi	19 Feb 2002 09:35:29 -0000	1.191
+++ sandweb.cgi	20 Feb 2002 04:46:55 -0000	1.192
@@ -826,4 +826,5 @@
 				ck_auth => $ck_auth,
 				location => $location,
+				module_name => $module_name,
 			);
 		}
@@ -835,5 +836,5 @@
 				'log_obj' => $log,
 				'filename' => $entry,
-				'location' => "$users_dir/$username$location$module_name",
+				'location' => "$users_dir/$username/$module_name$location",
 			);
 
@@ -883,5 +884,5 @@
 			'log_obj' => $log,
 			'filename' => $filename,
-			'location' => "$users_dir/$username$location$module_name",
+			'location' => "$users_dir/$username/$module_name$location",
 		);
 	}
@@ -941,5 +942,5 @@
 			$log->debug("saving edited file : $filename");
 
-			$log->debug("editing $users_dir/$username$location/$filename");
+			$log->debug("editing $users_dir/$username/$module_name$location/$filename");
 			$file->file_write(
 				'location' => "$location",
@@ -967,9 +968,9 @@
 			);
 		}
-		$log->debug("reading $users_dir/$username/$location/$filename");
+		$log->debug("reading $users_dir/$username/$module_name$location/$filename");
 
 		my $content = $file->file_read();
 
-		$log->debug("closing $users_dir/$username/$location/$filename");
+		$log->debug("closing $users_dir/$username/$module_name$location/$filename");
 		$content = $ui->get_menu( 
 			MENU => 'edit_file',
@@ -999,13 +1000,14 @@
 			browse_module_menu( 
 				ck_auth => $ck_auth,
-				location => "$location$module_name",
-		 	);
+				location => $location,
+				module_name => $module_name,
+			);
 			exit 0;
 		}
 		my $content = $ui->get_menu( 
 			MENU => 'create_file',
-			MODULE_NAME => $module_name,
 			PROGNAME => $progname,
 			LOCATION => $location,
+			MODULE_NAME => $module_name,
 		);
 
@@ -1024,10 +1026,11 @@
 		if ($file) {
 			$file->create_folder();
-			browse_module_menu( 
-				ck_auth => $ck_auth,
-				location => $location,
-		 	);
 			exit 0;
 		}
+		browse_module_menu( 
+			ck_auth => $ck_auth,
+			location => $location,
+			module_name => $module_name,
+		);
 
 		my $content = $ui->get_menu( 
@@ -1058,5 +1061,5 @@
 				'log_obj' => $log,
 				'filename' => $filename,
-				'location' => "$users_dir/$username$location$module_name",
+				'location' => "$users_dir/$username/$module_name$location",
 			);
 			$file->upload( 
@@ -1064,7 +1067,8 @@
 			); 
 
-			browse_module_menu(
+			browse_module_menu( 
 				ck_auth => $ck_auth,
 				location => $location,
+				module_name => $module_name,
 			);
 		}
@@ -1095,4 +1099,5 @@
 			ck_auth => $ck_auth,
 			location => $location,
+			module_name => $module_name,
 		);
 	}

[Sandweb-commit] CVS: sandweb/templates create_file.html,1.12,1.13 create_folder.html,1.10,1.11 edit_file.html,1.24,1.25 upload_file.html,1.11,1.12 vcs_output.html,1.13,1.14 view_file.html,1.32,1.33

From: Rob H. <for...@us...> - 2002-02-20 04:26:39

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv16014/templates

Modified Files:
	create_file.html create_folder.html edit_file.html 
	upload_file.html vcs_output.html view_file.html 
Log Message:
view_file works, edit_file does not


Index: create_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/create_file.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- create_file.html	19 Feb 2002 09:35:29 -0000	1.12
+++ create_file.html	20 Feb 2002 04:26:36 -0000	1.13
@@ -6,7 +6,4 @@
 <input name="location" value="<TMPL_VAR NAME=LOCATION>" type="hidden" />
 <input name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" type="hidden" />
-Current location: 
-<a href="<TMPL_VAR NAME=PROGNAME>?action=browse_module&location=<TMPL_VAR NAME=LOCATION>"><TMPL_VAR NAME=LOCATION></a><br />
-&nbsp;<br />
 Enter filename :
 &nbsp;<br />

Index: create_folder.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/create_folder.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- create_folder.html	19 Feb 2002 09:35:29 -0000	1.10
+++ create_folder.html	20 Feb 2002 04:26:36 -0000	1.11
@@ -7,6 +7,4 @@
 <input name="fullpath" value="<TMPL_VAR NAME=FULLPATH>" type="hidden" />
 <input name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" type="hidden" />
-Current location: 
-<a href="<TMPL_VAR NAME=PROGNAME>?action=browse_module&location=<TMPL_VAR NAME=LOCATION>"><TMPL_VAR NAME=LOCATION></a><br />&nbsp;<br />
 Enter foldername:<br />
 <input name="filename" type="text" /><br />

Index: edit_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/edit_file.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -U2 -r1.24 -r1.25
--- edit_file.html	19 Feb 2002 09:35:29 -0000	1.24
+++ edit_file.html	20 Feb 2002 04:26:36 -0000	1.25
@@ -1,8 +1,4 @@
 <tr>
  <td width="100%">
-  Current location : <a href="<TMPL_VAR NAME=PROGNAME>?action=browse_module&location=<TMPL_VAR NAME=LOCATION>"><TMPL_VAR NAME=LOCATION></a>
-  <br />
-  Current filename : <TMPL_VAR NAME=FILENAME>
-  <br />
   <form submit="<TMPL_VAR NAME=PROGNAME>" method="POST">
     <input name="action" value="browse_file" type="hidden" />

Index: upload_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/upload_file.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- upload_file.html	19 Feb 2002 09:35:29 -0000	1.11
+++ upload_file.html	20 Feb 2002 04:26:36 -0000	1.12
@@ -8,6 +8,4 @@
 <input name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" type="hidden" />
 <input name="filename" value="<TMPL_VAR NAME=FILENAME>" type="hidden" />
-Current location : 
-<a href="<TMPL_VAR NAME=PROGNAME>?action=browse_module&location=<TMPL_VAR NAME=LOCATION>"><TMPL_VAR NAME=LOCATION></a><br />&nbsp;<br />
 Enter a file to upload:<br />
 <TMPL_VAR NAME=ERROR>

Index: vcs_output.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/vcs_output.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- vcs_output.html	13 Feb 2002 05:42:01 -0000	1.13
+++ vcs_output.html	20 Feb 2002 04:26:36 -0000	1.14
@@ -1,6 +1,4 @@
 <tr>
  <td width="100%">
-  Current location : <a href="<TMPL_VAR NAME=PROGNAME>?action=browse_module&location=/<TMPL_VAR NAME=LOCATION>">/<TMPL_VAR NAME=LOCATION></a>
-  <br />
   Current filename : <TMPL_VAR NAME=FILENAME>
   <br />

Index: view_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/view_file.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -U2 -r1.32 -r1.33
--- view_file.html	13 Feb 2002 06:16:07 -0000	1.32
+++ view_file.html	20 Feb 2002 04:26:36 -0000	1.33
@@ -2,16 +2,11 @@
 <input type="hidden" name="filename" value="<TMPL_VAR NAME=FILENAME>" />
 <input type="hidden" name="location" value="<TMPL_VAR NAME=LOCATION>" />
- <tr>
-  <td width="50%">
-   Current location : <a href="<TMPL_VAR NAME=PROGNAME>?action=browse_module&location=<TMPL_VAR NAME=LOCATION>"><TMPL_VAR NAME=LOCATION></a>
-   <br />
-  </td>
- </tr>
+<input type="hidden" name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" />
  <tr>
   <td width="100%" align="right">
    <input type="hidden" name="action" value="browse_file" />
-   <a href="<TMPL_VAR NAME=PROGNAME>/<TMPL_VAR NAME=FILENAME>?action=browse_file&file_command=download&location=<TMPL_VAR NAME=LOCATION>&filename=<TMPL_VAR NAME=FILENAME>">download</a>
+   <a href="<TMPL_VAR NAME=PROGNAME>/<TMPL_VAR NAME=FILENAME>?action=browse_file&file_command=download&location=<TMPL_VAR NAME=LOCATION>&filename=<TMPL_VAR NAME=FILENAME>&module_name=<TMPL_VAR NAME=MODULE_NAME>">download</a>
    <TMPL_IF NAME=EDIT>
-    <a href="<TMPL_VAR NAME=PROGNAME>/<TMPL_VAR NAME=FILENAME>?action=browse_file&file_command=edit&location=<TMPL_VAR NAME=LOCATION>&filename=<TMPL_VAR NAME=FILENAME>">edit</a>
+    <a href="<TMPL_VAR NAME=PROGNAME>/<TMPL_VAR NAME=FILENAME>?action=browse_file&file_command=edit&location=<TMPL_VAR NAME=LOCATION>&filename=<TMPL_VAR NAME=FILENAME>&module_name=<TMPL_VAR NAME=MODULE_NAME>">edit</a>
    </TMPL_IF>
    <TMPL_VAR NAME=ERROR>

[Sandweb-commit] CVS: sandweb/templates create_file.html,1.11,1.12 create_folder.html,1.9,1.10 edit_file.html,1.23,1.24 upload_file.html,1.10,1.11

From: Rob H. <for...@us...> - 2002-02-19 09:35:32

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv7762/templates

Modified Files:
	create_file.html create_folder.html edit_file.html 
	upload_file.html 
Log Message:
* file commands are mostly working multi-repo, but it seems to
  return to the wrong place. Looks related to the "current location"
  bugs, basically browse_module has changed dramatically and these
  need to be rewritten somewhat


Index: create_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/create_file.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- create_file.html	13 Feb 2002 05:42:01 -0000	1.11
+++ create_file.html	19 Feb 2002 09:35:29 -0000	1.12
@@ -5,4 +5,5 @@
 <input name="file_command" value="create_file" type="hidden" />
 <input name="location" value="<TMPL_VAR NAME=LOCATION>" type="hidden" />
+<input name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" type="hidden" />
 Current location: 
 <a href="<TMPL_VAR NAME=PROGNAME>?action=browse_module&location=<TMPL_VAR NAME=LOCATION>"><TMPL_VAR NAME=LOCATION></a><br />

Index: create_folder.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/create_folder.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- create_folder.html	13 Feb 2002 05:42:01 -0000	1.9
+++ create_folder.html	19 Feb 2002 09:35:29 -0000	1.10
@@ -6,4 +6,5 @@
 <input name="location" value="<TMPL_VAR NAME=LOCATION>" type="hidden" />
 <input name="fullpath" value="<TMPL_VAR NAME=FULLPATH>" type="hidden" />
+<input name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" type="hidden" />
 Current location: 
 <a href="<TMPL_VAR NAME=PROGNAME>?action=browse_module&location=<TMPL_VAR NAME=LOCATION>"><TMPL_VAR NAME=LOCATION></a><br />&nbsp;<br />

Index: edit_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/edit_file.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -U2 -r1.23 -r1.24
--- edit_file.html	13 Feb 2002 06:16:07 -0000	1.23
+++ edit_file.html	19 Feb 2002 09:35:29 -0000	1.24
@@ -9,4 +9,5 @@
     <input name="file_command" value="edit" type="hidden" />
     <input name="location" value="<TMPL_VAR NAME=LOCATION>" type="hidden" />
+    <input name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" type="hidden" />
     <input name="filename" value="<TMPL_VAR NAME=FILENAME>" type="hidden" />
     <input type="submit" name="Submit" value="Save" />

Index: upload_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/upload_file.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- upload_file.html	13 Feb 2002 05:42:01 -0000	1.10
+++ upload_file.html	19 Feb 2002 09:35:29 -0000	1.11
@@ -6,4 +6,5 @@
 <input name="file_command" value="upload" type="hidden" />
 <input name="location" value="<TMPL_VAR NAME=LOCATION>" type="hidden" />
+<input name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" type="hidden" />
 <input name="filename" value="<TMPL_VAR NAME=FILENAME>" type="hidden" />
 Current location :

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.190,1.191

From: Rob H. <for...@us...> - 2002-02-19 09:35:32

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

Modified Files:
	sandweb.cgi 
Log Message:
* file commands are mostly working multi-repo, but it seems to
  return to the wrong place. Looks related to the "current location"
  bugs, basically browse_module has changed dramatically and these
  need to be rewritten somewhat


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.190
retrieving revision 1.191
diff -U2 -r1.190 -r1.191
--- sandweb.cgi	19 Feb 2002 09:09:12 -0000	1.190
+++ sandweb.cgi	19 Feb 2002 09:35:29 -0000	1.191
@@ -68,5 +68,6 @@
 	# catch file-specific actions
 	if ( CGI::param('action_file') ) {
-		$action = 'browse_file_commit';
+		$action = 'browse_file';
+		my $submit = 1;
 	}
 
@@ -853,5 +854,6 @@
 		browse_module_menu( 
 			ck_auth => $ck_auth,
-			location => $location,
+			repo_name => $repo_name,
+			module_name => $module_name,
 		);
 	}
@@ -911,4 +913,5 @@
 			MENU => 'view_file',
 			PROGNAME => "$progname",
+			MODULE_NAME => $module_name,
 			FILENAME => "$filename",
 			LOCATION => "$location",
@@ -972,4 +975,5 @@
 			MENU => 'edit_file',
 			PROGNAME => $progname,
+			MODULE_NAME => $module_name,
 			CONTENT => "$content",
 			LOCATION => $location,
@@ -995,5 +999,5 @@
 			browse_module_menu( 
 				ck_auth => $ck_auth,
-				location => $location,
+				location => "$location$module_name",
 		 	);
 			exit 0;
@@ -1001,4 +1005,5 @@
 		my $content = $ui->get_menu( 
 			MENU => 'create_file',
+			MODULE_NAME => $module_name,
 			PROGNAME => $progname,
 			LOCATION => $location,
@@ -1029,4 +1034,5 @@
 			MENU => 'create_folder',
 			PROGNAME => $progname,
+			MODULE_NAME => $module_name,
 			LOCATION => $location,
 		);
@@ -1067,4 +1073,5 @@
 			LOCATION => $location,
 			PROGNAME => $progname,
+			MODULE_NAME => $module_name,
 			FILENAME => $filename,
 		);

[Sandweb-commit] CVS: sandweb/templates browse_module.html,1.15,1.16 sandbox.html,1.8,1.9

From: Rob H. <for...@us...> - 2002-02-19 09:09:18

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv2109/templates

Modified Files:
	browse_module.html sandbox.html 
Log Message:
* VCS commands now ( appear to ) work with the multi-repo setup
* there are known bugs with "current location" and edit_file
* everything but the basics have not been tested, just the groundwork
  is in place


Index: browse_module.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/browse_module.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- browse_module.html	19 Feb 2002 06:53:17 -0000	1.15
+++ browse_module.html	19 Feb 2002 09:09:14 -0000	1.16
@@ -13,4 +13,5 @@
  <form method="get" submit="<TMPL_VAR NAME=PROGNAME>" name="browse">
  <input type="hidden" name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" />
+ <input type="hidden" name="repo_name" value="<TMPL_VAR NAME=REPO_NAME>" />
  <input type="hidden" name="location" value="<TMPL_VAR NAME=LOCATION>" />
  
@@ -51,5 +52,5 @@
 				Current location : 
 				<TMPL_LOOP NAME="LOCATION_LOOP">
-				<a href="<TMPL_VAR NAME=PROGNAME>?action=browse_module&location=<TMPL_VAR NAME=LOCATION_FULL>&module_name=<TMPL_VAR NAME=MODULE_NAME>"><TMPL_VAR NAME=LOCATION_LINK></a>
+				<a href="<TMPL_VAR NAME=PROGNAME>?action=browse_module&location=<TMPL_VAR NAME=LOCATION_FULL>&module_name=<TMPL_VAR NAME=MODULE_NAME>&repo_name=<TMPL_VAR NAME=REPO_NAME>"><TMPL_VAR NAME=LOCATION_LINK></a>
 				</TMPL_LOOP>
 			</font>
@@ -93,5 +94,5 @@
 						<a name="<TMPL_VAR NAME=ENTRY>">
 					</input>
-					<a href="<TMPL_VAR NAME=PROGNAME>?<TMPL_VAR NAME=LINK>&file_command=view&location=<TMPL_VAR NAME=LOCATION>&module_name=<TMPL_VAR NAME=MODULE_NAME>">
+					<a href="<TMPL_VAR NAME=PROGNAME>?<TMPL_VAR NAME=LINK>&file_command=view&location=<TMPL_VAR NAME=LOCATION>&module_name=<TMPL_VAR NAME=MODULE_NAME>&repo_name=<TMPL_VAR NAME=REPO_NAME>">
 						<img src="/icons/<TMPL_VAR NAME=FILETYPE>.gif" 
 						     alt="" border=0 width=20 height=22>

Index: sandbox.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/sandbox.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- sandbox.html	13 Feb 2002 05:42:01 -0000	1.8
+++ sandbox.html	19 Feb 2002 09:09:14 -0000	1.9
@@ -29,5 +29,5 @@
      <tr>
       <td width="20%" align="left">
-       &nbsp; <a href="<TMPL_VAR NAME=PROGNAME>?action=browse_module&module_name=<TMPL_VAR NAME="MODULE_NAME">"><TMPL_VAR NAME="MODULE_NAME"></a>
+       &nbsp; <a href="<TMPL_VAR NAME=PROGNAME>?action=browse_module&repo_name=<TMPL_VAR NAME=REPO_NAME>&module_name=<TMPL_VAR NAME="MODULE_NAME">"><TMPL_VAR NAME="MODULE_NAME"></a>
      </td>
      <td width="40%" align="left">

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.189,1.190

From: Rob H. <for...@us...> - 2002-02-19 09:09:16

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

Modified Files:
	sandweb.cgi 
Log Message:
* VCS commands now ( appear to ) work with the multi-repo setup
* there are known bugs with "current location" and edit_file
* everything but the basics have not been tested, just the groundwork
  is in place


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.189
retrieving revision 1.190
diff -U2 -r1.189 -r1.190
--- sandweb.cgi	19 Feb 2002 07:12:29 -0000	1.189
+++ sandweb.cgi	19 Feb 2002 09:09:12 -0000	1.190
@@ -175,4 +175,5 @@
 					location => $location,
 					module_name => $module_name,
+					repo_name => $repo_name,
 				);
 			}
@@ -209,4 +210,6 @@
 					vcs_command => CGI::param('vcs_command'),
 					location => CGI::param('location'),
+					module_name => $module_name,
+					repo_name => $repo_name,
 					filename => \@filename,
 				);
@@ -369,4 +372,5 @@
 				my %entry;
 				$entry{'MODULE_NAME'} = $module_name;
+				$entry{'REPO_NAME'} = $repo_name;
 				$entry{'MODULE_DESC'} = $user->get_module_description(
 												repo => $repo_name, 
@@ -422,24 +426,27 @@
 		preferences_menu( ck_auth => $ck_auth );
 	}
-	#XXX - not accessing $user->{'repo'}->{$repo_name}*
+
 	my $username = $auth->get_username() || '';
 	my $template_dir = $config->{'paths'}->{'template_dir'} || '';
 	my $module_name = $args{'module_name'} || '';
 	my $users_dir = $config->{'paths'}->{'users_dir'} || '';
-	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 $sandbox = $user->{'paths'}->{'users_dir'} || '';
-	my $vcsroot = '';
+	my $repo_name = $args{'repo_name'};
+
+	my $repo_server = $user->get_repo_server(repo => $repo_name);
+        my $repo_username = $user->get_repo_username(repo => $repo_name);
+        my $repo_type = $user->get_repo_type(repo => $repo_name);
+        my $repo_connection = $user->get_repo_connection(repo => $repo_name);
+        my $repo_root = $user->get_repo_root(repo => $repo_name);
+
+	my $vcsroot;
 
 	if ( $repo_type eq 'CVS' ) {
 		$log->debug("repo_type is 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";
 		}
 	}
@@ -486,4 +493,5 @@
 		'vcs_commands' => \@vcs_commands,
 		'repo_type' => $repo_type,
+		'repo_name' => $repo_name,
 	);
 
@@ -799,11 +807,12 @@
 	my $template_dir = $config->{'paths'}->{'template_dir'} || '';
 	my $users_dir = $config->{'paths'}->{'users_dir'} || '';
-	#XXX - not accessing $user->{'repo'}->{$repo_name}*
-	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 $sandbox = $user->{'paths'}->{'users_dir'} || '';
+	my $repo_name = $args{'repo_name'};
+
+	my $repo_server = $user->get_repo_server(repo => $repo_name);
+        my $repo_username = $user->get_repo_username(repo => $repo_name);
+        my $repo_type = $user->get_repo_type(repo => $repo_name);
+        my $repo_connection = $user->get_repo_connection(repo => $repo_name);
+        my $repo_root = $user->get_repo_root(repo => $repo_name);
 	my $vcsroot;
 
@@ -853,8 +862,8 @@
 	if ( $repo_type eq 'CVS' ) {
 		$log->debug("repo type is CVS, setting up CVSROOT");
-		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";
 		}
 	}
@@ -948,5 +957,5 @@
 			$log->debug("User wants to edit non-text file : $filename");
 			set_error("This does not appear to be a text file.");
-			file(
+			browse_file_commit(
 				ck_auth => $ck_auth,
 				file_command => "view",
@@ -1116,4 +1125,5 @@
 		$count++;
 	}
+	my $module_name = $args{'module_name'};
 	my $location = $args{'location'};
 	my $message = CGI::param('message');
@@ -1121,12 +1131,15 @@
 	my $template_dir = $config->{'paths'}->{'template_dir'};
 	my $users_dir = $config->{'paths'}->{'users_dir'};
+	my $repo_name = $args{'repo_name'};
 	my %return;
-	#XXX - not accessing $user->{'repo'}->{$repo_name}*
-	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 $sandbox = $user->{'paths'}->{'users_dir'};
+
+	my $repo_server = $user->get_repo_server(repo => $repo_name);
+        my $repo_username = $user->get_repo_username(repo => $repo_name);
+        my $repo_type = $user->get_repo_type(repo => $repo_name);
+        my $repo_connection = $user->get_repo_connection(repo => $repo_name);
+        my $repo_root = $user->get_repo_root(repo => $repo_name);
+
+	my $sandbox = $user->{'paths'}->{'users_dir'} || '';
+
 	my @vcs_output = ();
 	my @vcs_error = ();
@@ -1134,23 +1147,25 @@
 
 	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";
 		}
 	}
 
 	my $repository = SandWeb::Repository->new(
-		root => $vcsroot,
+		root => $repo_root,
 		repo_type => $repo_type,
-		sandbox => "$users_dir/$username",
+		sandbox => "$users_dir/$username/$module_name",
 	);
+
 	if ( $vcs_command eq 'commit' ) {
 		if ($message) {
 			# can't give the leading / to the VCS
 			$location =~ s/\///;
+
 			foreach my $file (@filename) {
 				%return = $repository->commit( 
-					file => "$location/$file",
+					file => "$file",
 					message => "$message",
 				);
@@ -1201,5 +1216,5 @@
 		foreach my $file (@filename) {
 			%return = $repository->$vcs_command( 
-				file => "$location/$file",
+				file => "$file",
 			);
 			push (@vcs_output, "$return{'output'}\n");

[Sandweb-commit] CVS: sandweb/lib/SandWeb Browse.pm,1.51,1.52 Repository.pm,1.20,1.21

From: Rob H. <for...@us...> - 2002-02-19 09:09:16

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

Modified Files:
	Browse.pm Repository.pm 
Log Message:
* VCS commands now ( appear to ) work with the multi-repo setup
* there are known bugs with "current location" and edit_file
* everything but the basics have not been tested, just the groundwork
  is in place


Index: Browse.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Browse.pm,v
retrieving revision 1.51
retrieving revision 1.52
diff -U2 -r1.51 -r1.52
--- Browse.pm	19 Feb 2002 07:12:30 -0000	1.51
+++ Browse.pm	19 Feb 2002 09:09:13 -0000	1.52
@@ -46,4 +46,5 @@
 
 	my $repo_type = $args{'repo_type'};
+	my $repo_name = $args{'repo_name'};
 
 	my $username = $self->_get_username();
@@ -74,5 +75,5 @@
 	push (@location_link, split( /\//, $location ));
 	my @loop_data = ();
-	my $count = 0;
+	$count = 0;
 	my @location_full = ();
 
@@ -82,4 +83,5 @@
 		$row_data{LOCATION_FULL} = "/";
 		$row_data{MODULE_NAME} = "$module_name";
+		$row_data{REPO_NAME} = "$repo_name";
 		$row_data{PROGNAME} = "$progname";
 		push (@loop_data, \%row_data);
@@ -100,4 +102,5 @@
 		$row_data{LOCATION_FULL} = "$data";
 		$row_data{MODULE_NAME} = "$module_name";
+		$row_data{REPO_NAME} = "$repo_name";
 		$row_data{PROGNAME} = "$progname";
 		push (@loop_data, \%row_data);
@@ -110,4 +113,5 @@
 		LOCATION => $location,
 		LOCATION_LOOP => \@loop_data,
+		REPO_NAME => $repo_name,
 	);
 
@@ -184,4 +188,5 @@
 			$row_data{LOCATION} = $location;
 			$row_data{MODULE_NAME} = "$module_name";
+			$row_data{REPO_NAME} = "$repo_name";
 			$row_data{PROGNAME} = $progname;
 			push(@loop_data, \%row_data);

Index: Repository.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -U2 -r1.20 -r1.21
--- Repository.pm	18 Feb 2002 12:15:33 -0000	1.20
+++ Repository.pm	19 Feb 2002 09:09:13 -0000	1.21
@@ -433,9 +433,11 @@
 	my $root = $self->get_root();
 	my $sandbox = $self->get_sandbox();
-	my %return = {};
+	my %return;
+
 	my $vcs = SandWeb::Repository::CVS->new(
 		root => $root,
 		sandbox => $sandbox,
 	);
+
 	if ($repo_type eq 'CVS') {
 		%return = $vcs->status(

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.188,1.189

From: Rob H. <for...@us...> - 2002-02-19 07:12:32

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

Modified Files:
	sandweb.cgi 
Log Message:
* fixing vcs_commands pulldown


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.188
retrieving revision 1.189
diff -U2 -r1.188 -r1.189
--- sandweb.cgi	19 Feb 2002 07:00:25 -0000	1.188
+++ sandweb.cgi	19 Feb 2002 07:12:29 -0000	1.189
@@ -485,5 +485,4 @@
 		'progname' => $progname,
 		'vcs_commands' => \@vcs_commands,
-		'file_commands' => \@file_commands,
 		'repo_type' => $repo_type,
 	);

[Sandweb-commit] CVS: sandweb/lib/SandWeb Browse.pm,1.50,1.51

From: Rob H. <for...@us...> - 2002-02-19 07:12:32

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

Modified Files:
	Browse.pm 
Log Message:
* fixing vcs_commands pulldown


Index: Browse.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Browse.pm,v
retrieving revision 1.50
retrieving revision 1.51
diff -U2 -r1.50 -r1.51
--- Browse.pm	19 Feb 2002 07:00:25 -0000	1.50
+++ Browse.pm	19 Feb 2002 07:12:30 -0000	1.51
@@ -38,6 +38,11 @@
 	my $location = $args{'location'};
 	my $progname = $args{'progname'};
-	my $vcs_commands = $args{'vcs_commands'};
-	my $file_commands = $args{'file_commands'};
+	my @vcs_commands;
+	my $count = 0;
+	while ( $args{'vcs_commands'}->[$count] ) {
+                push (@vcs_commands, $args{'vcs_commands'}->[$count]);
+                $count++;
+        }
+
 	my $repo_type = $args{'repo_type'};
 
@@ -48,6 +53,4 @@
 	my $log = $self->_get_log_obj;
 	my $sandbox = "$users_dir/$username/$module_name";
-	my @vcs_commands = split (/ /, $vcs_commands );
-	my @file_commands = split (/ /, $file_commands );
 
 	if (! $sandbox) {

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.187,1.188

From: Rob H. <for...@us...> - 2002-02-19 07:00:28

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

Modified Files:
	sandweb.cgi 
Log Message:
* file viewer supports module_name


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.187
retrieving revision 1.188
diff -U2 -r1.187 -r1.188
--- sandweb.cgi	19 Feb 2002 06:53:17 -0000	1.187
+++ sandweb.cgi	19 Feb 2002 07:00:25 -0000	1.188
@@ -191,4 +191,5 @@
 					file_command => $file_command,
 					filename => \@filename,
+					module_name => $module_name,
 					location => CGI::param('location'),
 				);
@@ -785,4 +786,5 @@
 	$log->debug("file command is : $file_command");
 	my $location = $args{'location'};
+	my $module_name = $args{'module_name'};
 	$log->debug("location is : $location");
 	my @filename = ();
@@ -824,5 +826,5 @@
 				'log_obj' => $log,
 				'filename' => $entry,
-				'location' => "$users_dir/$username$location",
+				'location' => "$users_dir/$username$location$module_name",
 			);
 
@@ -871,5 +873,5 @@
 			'log_obj' => $log,
 			'filename' => $filename,
-			'location' => "$users_dir/$username$location",
+			'location' => "$users_dir/$username$location$module_name",
 		);
 	}
@@ -1042,5 +1044,5 @@
 				'log_obj' => $log,
 				'filename' => $filename,
-				'location' => "$users_dir/$username$location",
+				'location' => "$users_dir/$username$location$module_name",
 			);
 			$file->upload(

[Sandweb-commit] CVS: sandweb/lib/SandWeb Browse.pm,1.49,1.50

From: Rob H. <for...@us...> - 2002-02-19 07:00:28

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

Modified Files:
	Browse.pm 
Log Message:
* file viewer supports module_name


Index: Browse.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Browse.pm,v
retrieving revision 1.49
retrieving revision 1.50
diff -U2 -r1.49 -r1.50
--- Browse.pm	19 Feb 2002 06:53:17 -0000	1.49
+++ Browse.pm	19 Feb 2002 07:00:25 -0000	1.50
@@ -132,4 +132,5 @@
 		$row_data{ENTRY} = shift @return;
 		my $entryname = $row_data{ENTRY};
+
 		my $file = SandWeb::File->new(
 			location => "$sandbox/$location",

[Sandweb-commit] CVS: sandweb/templates browse_module.html,1.14,1.15

From: Rob H. <for...@us...> - 2002-02-19 06:53:20

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv29827/templates

Modified Files:
	browse_module.html 
Log Message:
* module_name implemented


Index: browse_module.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/browse_module.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- browse_module.html	13 Feb 2002 06:16:07 -0000	1.14
+++ browse_module.html	19 Feb 2002 06:53:17 -0000	1.15
@@ -12,5 +12,5 @@
 </script>
  <form method="get" submit="<TMPL_VAR NAME=PROGNAME>" name="browse">
- <input type="hidden" name="module" value="<TMPL_VAR NAME=MODULE>" />
+ <input type="hidden" name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" />
  <input type="hidden" name="location" value="<TMPL_VAR NAME=LOCATION>" />
  
@@ -51,5 +51,5 @@
 				Current location : 
 				<TMPL_LOOP NAME="LOCATION_LOOP">
-				<a href="<TMPL_VAR NAME="PROGNAME">?action=browse_module&location=<TMPL_VAR NAME="LOCATION_FULL">"><TMPL_VAR NAME="LOCATION_LINK"></a>
+				<a href="<TMPL_VAR NAME=PROGNAME>?action=browse_module&location=<TMPL_VAR NAME=LOCATION_FULL>&module_name=<TMPL_VAR NAME=MODULE_NAME>"><TMPL_VAR NAME=LOCATION_LINK></a>
 				</TMPL_LOOP>
 			</font>
@@ -93,5 +93,5 @@
 						<a name="<TMPL_VAR NAME=ENTRY>">
 					</input>
-					<a href="<TMPL_VAR NAME=PROGNAME>?<TMPL_VAR NAME=LINK>&file_command=view&location=<TMPL_VAR NAME=LOCATION>">
+					<a href="<TMPL_VAR NAME=PROGNAME>?<TMPL_VAR NAME=LINK>&file_command=view&location=<TMPL_VAR NAME=LOCATION>&module_name=<TMPL_VAR NAME=MODULE_NAME>">
 						<img src="/icons/<TMPL_VAR NAME=FILETYPE>.gif" 
 						     alt="" border=0 width=20 height=22>

[Sandweb-commit] CVS: sandweb/lib/SandWeb Browse.pm,1.48,1.49

From: Rob H. <for...@us...> - 2002-02-19 06:53:20

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

Modified Files:
	Browse.pm 
Log Message:
* module_name implemented


Index: Browse.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Browse.pm,v
retrieving revision 1.48
retrieving revision 1.49
diff -U2 -r1.48 -r1.49
--- Browse.pm	19 Feb 2002 06:45:10 -0000	1.48
+++ Browse.pm	19 Feb 2002 06:53:17 -0000	1.49
@@ -96,4 +96,5 @@
 		}
 		$row_data{LOCATION_FULL} = "$data";
+		$row_data{MODULE_NAME} = "$module_name";
 		$row_data{PROGNAME} = "$progname";
 		push (@loop_data, \%row_data);
@@ -178,4 +179,5 @@
 			}
 			$row_data{LOCATION} = $location;
+			$row_data{MODULE_NAME} = "$module_name";
 			$row_data{PROGNAME} = $progname;
 			push(@loop_data, \%row_data);

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.186,1.187

From: Rob H. <for...@us...> - 2002-02-19 06:53:20

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

Modified Files:
	sandweb.cgi 
Log Message:
* module_name implemented


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.186
retrieving revision 1.187
diff -U2 -r1.186 -r1.187
--- sandweb.cgi	19 Feb 2002 06:31:38 -0000	1.186
+++ sandweb.cgi	19 Feb 2002 06:53:17 -0000	1.187
@@ -796,13 +796,13 @@
 	my $save = CGI::param('save');
 	my $username = $auth->get_username();
-	my $template_dir = $config->{'paths'}->{'template_dir'};
-	my $users_dir = $config->{'paths'}->{'users_dir'};
+	my $template_dir = $config->{'paths'}->{'template_dir'} || '';
+	my $users_dir = $config->{'paths'}->{'users_dir'} || '';
 	#XXX - not accessing $user->{'repo'}->{$repo_name}*
-	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 $sandbox = $user->{'paths'}->{'users_dir'};
+	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 $sandbox = $user->{'paths'}->{'users_dir'} || '';
 	my $vcsroot;

[Sandweb-commit] CVS: sandweb/lib/SandWeb Browse.pm,1.47,1.48

From: Rob H. <for...@us...> - 2002-02-19 06:45:13

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'};
 }

[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.185,1.186

From: Rob H. <for...@us...> - 2002-02-19 06:31:41

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

Modified Files:
	sandweb.cgi 
Log Message:
fixed a couple warnings


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.185
retrieving revision 1.186
diff -U2 -r1.185 -r1.186
--- sandweb.cgi	19 Feb 2002 06:23:42 -0000	1.185
+++ sandweb.cgi	19 Feb 2002 06:31:38 -0000	1.186
@@ -422,15 +422,15 @@
 	}
 	#XXX - not accessing $user->{'repo'}->{$repo_name}*
-	my $username = $auth->get_username();
-	my $template_dir = $config->{'paths'}->{'template_dir'};
-	my $module_name = $args{'module_name'};
-	my $users_dir = $config->{'paths'}->{'users_dir'};
-	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 $sandbox = $user->{'paths'}->{'users_dir'};
-	my $vcsroot;
+	my $username = $auth->get_username() || '';
+	my $template_dir = $config->{'paths'}->{'template_dir'} || '';
+	my $module_name = $args{'module_name'} || '';
+	my $users_dir = $config->{'paths'}->{'users_dir'} || '';
+	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 $sandbox = $user->{'paths'}->{'users_dir'} || '';
+	my $vcsroot = '';
 
 	if ( $repo_type eq 'CVS' ) {
@@ -452,16 +452,16 @@
 	$log->debug("creating Repository object");
 	my $repository = SandWeb::Repository->new( 
-						'root' => "$vcsroot",
-						'repo_type' => $repo_type,
-						'sandbox' => $sandbox,
+		'root' => "$vcsroot",
+		'repo_type' => $repo_type,
+		'sandbox' => $sandbox,
 	);
 
 	$log->debug("creating Browse object");
 	my $browse = SandWeb::Browse->new( 
-					'username' => $username,
-					'template_dir' => $template_dir,
-					'module_name' => $module_name,
-					'users_dir' => $users_dir,
-					'log_obj' => $log,
+		'username' => $username,
+		'template_dir' => $template_dir,
+		'module_name' => $module_name,
+		'users_dir' => $users_dir,
+		'log_obj' => $log,
 	);
 
@@ -483,6 +483,6 @@
 		'location' => $location,
 		'progname' => $progname,
-		'vcs_commands' => @vcs_commands,
-		'file_commands' => @file_commands,
+		'vcs_commands' => \@vcs_commands,
+		'file_commands' => \@file_commands,
 		'repo_type' => $repo_type,
 	);

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

From: Rob H. <for...@us...> - 2002-02-19 06:23:45

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

Modified Files:
	sandweb.cgi 
Log Message:
* adding support for module_name to browse_menu
* general cleanup on the browse_menu subroutine

this needs changes in Browse.pm ( which i'm not done with ) and browse.html
to work, this checkin breaks the CVS version


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.184
retrieving revision 1.185
diff -U2 -r1.184 -r1.185
--- sandweb.cgi	18 Feb 2002 21:43:52 -0000	1.184
+++ sandweb.cgi	19 Feb 2002 06:23:42 -0000	1.185
@@ -174,4 +174,5 @@
 					ck_auth => $ck_auth,
 					location => $location,
+					module_name => $module_name,
 				);
 			}
@@ -423,4 +424,5 @@
 	my $username = $auth->get_username();
 	my $template_dir = $config->{'paths'}->{'template_dir'};
+	my $module_name = $args{'module_name'};
 	my $users_dir = $config->{'paths'}->{'users_dir'};
 	my $server = $user->{'repository'}->{'server'};
@@ -459,4 +461,5 @@
 					'username' => $username,
 					'template_dir' => $template_dir,
+					'module_name' => $module_name,
 					'users_dir' => $users_dir,
 					'log_obj' => $log,
@@ -477,5 +480,11 @@
 
 	# use the browse object to show user's sandbox
-	my $content = $browse->browse("$location", "$progname", "@vcs_commands", "@file_commands", $repo_type);
+	my $content = $browse->browse(
+		'location' => $location,
+		'progname' => $progname,
+		'vcs_commands' => @vcs_commands,
+		'file_commands' => @file_commands,
+		'repo_type' => $repo_type,
+	);
 
 	print CGI::header( -cookie => $ck_auth );

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

From: Nick J. <nje...@us...> - 2002-02-18 21:43:58

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");

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

From: Nick J. <nje...@us...> - 2002-02-18 21:43:57

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();

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

From: Nick J. <nje...@us...> - 2002-02-18 12:30:03

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

Modified Files:
	Config.pm 
Log Message:
* added description support


Index: Config.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Config.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -U2 -r1.20 -r1.21
--- Config.pm	18 Feb 2002 12:15:33 -0000	1.20
+++ Config.pm	18 Feb 2002 12:29:58 -0000	1.21
@@ -357,17 +357,18 @@
 	my $repo = $args{'repo'} || '';
 	my $module = $args{'module'} || '';
-	my $module_desc = $args{'module_desc'} || '';
+	my $module_description = $args{'module_description'} || '';
+	$log->debug("module_description = '$module_description'\n");
 	if ($self->repository_exists(repo => $repo)) {
-		if (!$self->module_exists(
-							repo => $repo, 
-							module => $module)) {
-			$self->{'repo'}->{$repo}->{'module'}->{$module}->{'desc'} = 
-																$module_desc;
+		#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;
-		}
+														$module;
+		#} else {
+		#	$log->debug("module '$module' already exists for repo '$repo'.\n");
+		#	return 0;
+		#}
 	} else {
 		$log->debug("repo '$repo' does not exist.\n");
@@ -377,5 +378,5 @@
 }
 
-sub get_module_desc {
+sub get_module_description {
 	my $self = shift;
 	my %args = @_;
@@ -388,5 +389,5 @@
 							repo => $repo,
 							module => $module )) {
-			return $self->{'repo'}->{$repo}->{'module'}->{$module}->{'module_desc'} || '';
+			return $self->{'repo'}->{$repo}->{'module'}->{$module}->{'description'} || '';
 		} else {
 			$log->debug("module '$module' does not exist for repo '$repo'.\n");

[Sandweb-commit] CVS: sandweb/templates checkout.html,1.12,1.13

From: Nick J. <nje...@us...> - 2002-02-18 12:30:02

Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv3612/templates

Modified Files:
	checkout.html 
Log Message:
* added description support


Index: checkout.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/checkout.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- checkout.html	13 Feb 2002 07:00:16 -0000	1.12
+++ checkout.html	18 Feb 2002 12:29:59 -0000	1.13
@@ -11,4 +11,6 @@
   Enter module name to checkout: <input type="text" name="module_name" size="12" maxlength="24" />
   <br />&nbsp;<br />
+  Enter brief description of module: <input type="text" name="module_description" size="20" maxlength="30" />
+  <br />&nbsp;<br />
   <input type="submit" name="Submit" value="Checkout" />
  </td>

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

From: Nick J. <nje...@us...> - 2002-02-18 12:30:02

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

Modified Files:
	sandweb.cgi 
Log Message:
* added description support


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.182
retrieving revision 1.183
diff -U2 -r1.182 -r1.183
--- sandweb.cgi	18 Feb 2002 12:15:32 -0000	1.182
+++ sandweb.cgi	18 Feb 2002 12:29:58 -0000	1.183
@@ -112,6 +112,8 @@
 		my $vcs_command = CGI::param('vcs_command') || '';
 		my $module_name = CGI::param('module_name') || '';
+		my $module_description = CGI::param('module_description') || '';
 
 		$log->debug("action: $action submit: $submit");
+		$log->debug("module_description: $module_description\n");
 
 		#######################################################
@@ -215,4 +217,5 @@
 						repo_name => $repo_name,
 						module_name => $module_name,
+						module_description => $module_description,
 					);
 				} else {
@@ -364,5 +367,5 @@
 				my %entry;
 				$entry{'MODULE_NAME'} = $module_name;
-				$entry{'MODULE_DESC'} = $user->get_module_desc(
+				$entry{'MODULE_DESC'} = $user->get_module_description(
 												repo => $repo_name, 
 												module => $module_name
@@ -1231,4 +1234,5 @@
 	my $module_name = $args{'module_name'};
 	my $repo_name = $args{'repo_name'};
+	my $module_description = $args{'module_description'};
 
 	my $repo_server = $user->get_repo_server(repo => $repo_name);
@@ -1237,24 +1241,14 @@
 	my $repo_connection = $user->get_repo_connection(repo => $repo_name);
 	my $repo_root = $user->get_repo_root(repo => $repo_name);
-	my $module_desc = 'blah';
 	
 	my @module_list =  $user->get_module_list(repo => $repo_name ); 
 
 	my $exist = 0;
-	foreach my $module_entry (@module_list) {
-		if ($module_name eq $module_entry) {
-			$exist = 1;
-		}
-	}
-	if (!$exist) {
-		push @module_list, $module_name;
-		#push @{$user->{'repo'}->{$repo_name}->{'module_list'}}, $module_name; 
-		$user->add_module_entry(repo => $repo_name,
-								module => $module_name,
-								module_desc => $module_desc,
-		);
-								
-	}
-
+	push @module_list, $module_name;
+	$user->add_module_entry(repo => $repo_name,
+							module => $module_name,
+							module_description => $module_description,
+	);
+							
 	my $username = $auth->get_username();
 	my $template_dir = $config->{'paths'}->{'template_dir'};

[Sandweb-commit] CVS: sandweb/lib/SandWeb Config.pm,1.19,1.20 Repository.pm,1.19,1.20

From: Nick J. <nje...@us...> - 2002-02-18 12:15:36

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

Modified Files:
	Config.pm Repository.pm 
Log Message:
* checkout now works (maintains data structure).
* all (most) data accessing is now encapsulation in CGI
* fixed misc. bugs in Config and Repository


Index: Config.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Config.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -U2 -r1.19 -r1.20
--- Config.pm	18 Feb 2002 11:16:16 -0000	1.19
+++ Config.pm	18 Feb 2002 12:15:33 -0000	1.20
@@ -20,4 +20,5 @@
 	my $self = bless { %{$cfg}, %args, }, $class;
 
+	$self->manage_data_structure();
 	return $self;
 }
@@ -43,4 +44,34 @@
 }
 
+sub manage_data_structure {
+	my $self = shift;
+    # make sure data structure containing repositories is consistent
+    if ( ($self->{'repo'}->{'type'}) &&
+        (ref(\$self->{'repo'}->{'type'}) eq 'SCALAR')) {
+
+        my %temp = %{$self->{'repo'}};
+        %{$self->{'repo'}} = ();
+        %{$self->{'repo'}->{$temp{'name'}}} = %temp;
+    }
+
+	foreach my $repo_name ($self->get_repo_list()) {
+		if ( ($self->{'repo'}->{$repo_name}->{'module'}->{'name'}) &&
+			(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;
+		}
+	}
+
+#    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;
+#        }
+#    }
+}
+
 
 #############################################################################
@@ -104,5 +135,6 @@
 	my $self = shift;
 	my %args = @_;
-	my $repo_name = $args{'repo'};
+	my $log = $self->{'log_obj'};
+	my $repo_name = $args{'repo'} || '';
 	my @repo_list = $self->get_repo_list();
 	foreach my $repo (@repo_list) {
@@ -118,5 +150,5 @@
 	my $self = shift;
 	my %args = @_;
-	my $name = $args{'repo'};
+	my $name = $args{'name'} || '';
 	my $server = $args{'server'} || '';
 	my $connection = $args{'connection'} || '';
@@ -124,12 +156,13 @@
 	my $root = $args{'root'} || '';
 
+	return 0 if (!$name);
 	if ($self->repository_exists(repo => $name)) {
 		return 0;
 	} else {
-		$user->{'repo'}->{$name}->{'name'} = $name;
-		$user->{'repo'}->{$name}->{'server'} = $server;
-		$user->{'repo'}->{$name}->{'connection'} = $connection;
-		$user->{'repo'}->{$name}->{'type'} = $type;
-		$user->{'repo'}->{$name}->{'root'} = $root;
+		$self->{'repo'}->{$name}->{'name'} = $name;
+		$self->{'repo'}->{$name}->{'server'} = $server;
+		$self->{'repo'}->{$name}->{'connection'} = $connection;
+		$self->{'repo'}->{$name}->{'type'} = $type;
+		$self->{'repo'}->{$name}->{'root'} = $root;
 	}
 }
@@ -148,9 +181,9 @@
 		return 0;
 	} else {
-		$user->{'repo'}->{$name}->{'name'} = $name;
-		$user->{'repo'}->{$name}->{'server'} = $server if ($server);
-		$user->{'repo'}->{$name}->{'connection'} = $connection if ($connection);
-		$user->{'repo'}->{$name}->{'type'} = $type if ($type);
-		$user->{'repo'}->{$name}->{'root'} = $root if ($root);
+		$self->{'repo'}->{$name}->{'name'} = $name;
+		$self->{'repo'}->{$name}->{'server'} = $server if ($server);
+		$self->{'repo'}->{$name}->{'connection'} = $connection if ($connection);
+		$self->{'repo'}->{$name}->{'type'} = $type if ($type);
+		$self->{'repo'}->{$name}->{'root'} = $root if ($root);
 	}
 }
@@ -291,7 +324,9 @@
 	my $self = shift;
 	my %args = @_;
-	my $repo_name = $args{'repo'};
-	return '' if (!$repo_name);
-	return sort keys %{$self->{'repo'}->{$repo_name}->{'module'}};
+	my $repo = $args{'repo'};
+	return '' if (!$repo);
+
+	# verify module structure
+	return sort keys %{$self->{'repo'}->{$repo}->{'module'}};
 }
 
@@ -304,6 +339,8 @@
 	my $self = shift;
 	my %args = @_;
-	my $module_name = $args{'module_name'};
-	my @module_list = $self->get_module_list();
+	my $repo = $args{'repo'} || '';
+	my $module_name = $args{'module'} || '';
+	my @module_list = $self->get_module_list( repo => $repo );
+	
 	foreach my $module (@module_list) {
 		if ($module eq $module_name) {
@@ -317,11 +354,12 @@
 	my $self = shift;
 	my %args = @_;
-	my $repo = $args{'repo'};
-	my $module = $args{'module'};
+	my $log = $self->{'log_obj'};
+	my $repo = $args{'repo'} || '';
+	my $module = $args{'module'} || '';
 	my $module_desc = $args{'module_desc'} || '';
-	if ($self->repository_exists(repo => $repo_name)) {
+	if ($self->repository_exists(repo => $repo)) {
 		if (!$self->module_exists(
-							repo => $repo_name, 
-							module => $module_name)) {
+							repo => $repo, 
+							module => $module)) {
 			$self->{'repo'}->{$repo}->{'module'}->{$module}->{'desc'} = 
 																$module_desc;
@@ -329,9 +367,9 @@
 																$module;
 		} else {
-			$self->{'log_obj'}->("module '$module' already exists for repo '$repo'.\n");
+			$log->debug("module '$module' already exists for repo '$repo'.\n");
 			return 0;
 		}
 	} else {
-		$self->{'log_obj'}->("repo '$repo' already exists.\n");
+		$log->debug("repo '$repo' does not exist.\n");
 		return 0;
 	}
@@ -342,4 +380,5 @@
 	my $self = shift;
 	my %args = @_;
+	my $log = $self->{'log_obj'};
 	my $repo = $args{'repo'};
 	my $module = $args{'module'};
@@ -347,13 +386,13 @@
 	if (!$self->repository_exists(repo => $repo_name)) {
 		if ($self->module_exists(
-							repo => $repo_name,
+							repo => $repo,
 							module => $module )) {
 			return $self->{'repo'}->{$repo}->{'module'}->{$module}->{'module_desc'} || '';
 		} else {
-			$self->{'log_obj'}->("module '$module' does not exist for repo '$repo'.\n");
+			$log->debug("module '$module' does not exist for repo '$repo'.\n");
 			return '';
 		}
 	} else {
-		$self->{'log_obj'}->("repo '$repo' does not exist.\n");
+		$log->debug("repo '$repo' does not exist.\n");
 		return '';
 	}

Index: Repository.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -U2 -r1.19 -r1.20
--- Repository.pm	13 Feb 2002 07:42:34 -0000	1.19
+++ Repository.pm	18 Feb 2002 12:15:33 -0000	1.20
@@ -135,5 +135,5 @@
 	my $root = $self->get_root();
 	my $sandbox = $self->get_sandbox();
-	my %return = {};
+	my %return;
 	my $vcs = SandWeb::Repository::CVS->new(
 		root => $root,

3 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 35 36 37 38 39 .. 53 > >> (Page 37 of 53)

2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (28)	Nov (58)	Dec (85)
2002	Jan (125)	Feb (222)	Mar (274)	Apr (51)	May (22)	Jun (50)	Jul (15)	Aug (33)	Sep (11)	Oct (29)	Nov (17)	Dec (1)
2003	Jan (100)	Feb (21)	Mar (7)	Apr (45)	May	Jun (43)	Jul (27)	Aug (24)	Sep	Oct	Nov	Dec
2004	Jan (1)	Feb	Mar (13)	Apr	May (1)	Jun	Jul	Aug (7)	Sep	Oct	Nov	Dec (4)
2005	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)