From b56586ed414e1a5754c852cde78473ef87c2128a Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 4 May 2010 11:10:51 +0000 Subject: added group description to pool names diff --git a/rhimport.pm b/rhimport.pm index 7ecc2fe..2c3130b 100644 --- a/rhimport.pm +++ b/rhimport.pm @@ -47,11 +47,11 @@ sub get_dropboxes { my ($dbh, $user) = @_; - my $sql = qq{select USER_PERMS.GROUP_NAME,DROPBOXES.PATH,DROPBOXES.TO_CART from USER_PERMS, DROPBOXES where USER_PERMS.USER_NAME='$user' and DROPBOXES.GROUP_NAME=USER_PERMS.GROUP_NAME;}; + my $sql = qq{select USER_PERMS.GROUP_NAME,DROPBOXES.PATH,DROPBOXES.TO_CART,GROUPS.DESCRIPTION from USER_PERMS, DROPBOXES, GROUPS where USER_PERMS.USER_NAME='$user' and DROPBOXES.GROUP_NAME=USER_PERMS.GROUP_NAME and DROPBOXES.GROUP_NAME=GROUPS.NAME;}; my $sth = $dbh->prepare($sql); $sth->execute(); my @allowed_dbs; - while(my ($group, $path, $to_cart) = $sth->fetchrow_array()) { + while(my ($group, $path, $to_cart, $desc) = $sth->fetchrow_array()) { $path =~ s/\/\*$//; my $name = $path; $name =~ s/^\/programm\///; @@ -65,7 +65,7 @@ sub get_dropboxes $name = "Jingles - $1"; } elsif($name =~ /^pool\/pool(.*)$/) { - $name = "Pool - $1"; + $name = "Pool $1 - $desc"; } elsif($name =~ /^pool\/(.*)$/) { $name = "Pool - $1"; -- cgit v0.10.2