diff options
| author | Christian Pointner <equinox@helsinki.at> | 2014-09-20 02:54:46 (GMT) |
|---|---|---|
| committer | Christian Pointner <equinox@helsinki.at> | 2014-09-20 02:54:46 (GMT) |
| commit | 7f61a203869c8ae2d436a86a963fae34e8eee8d9 (patch) | |
| tree | 399d7500c2fdc759dd0e06d643b8bf720883fb5b | |
| parent | 53967167a2255704e8ed5111abeec9cdc6321dc3 (diff) | |
including low and high cart for group @ listdropboxes
| -rwxr-xr-x | lib/rddb.pm | 6 | ||||
| -rwxr-xr-x | listdropboxes.cgi | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/rddb.pm b/lib/rddb.pm index 966b29f..e4f7972 100755 --- a/lib/rddb.pm +++ b/lib/rddb.pm @@ -101,7 +101,7 @@ sub get_dropboxes { my ($dbh, $username) = @_; - my $sql = qq{select USER_PERMS.GROUP_NAME,DROPBOXES.PATH,DROPBOXES.TO_CART,DROPBOXES.LOG_PATH,DROPBOXES.NORMALIZATION_LEVEL,DROPBOXES.AUTOTRIM_LEVEL,DROPBOXES.SET_USER_DEFINED,GROUPS.DESCRIPTION from USER_PERMS, DROPBOXES, GROUPS where USER_PERMS.USER_NAME= ? and DROPBOXES.GROUP_NAME=USER_PERMS.GROUP_NAME and DROPBOXES.GROUP_NAME=GROUPS.NAME;}; + my $sql = qq{select USER_PERMS.GROUP_NAME,DROPBOXES.PATH,DROPBOXES.TO_CART,DROPBOXES.LOG_PATH,DROPBOXES.NORMALIZATION_LEVEL,DROPBOXES.AUTOTRIM_LEVEL,DROPBOXES.SET_USER_DEFINED,GROUPS.DEFAULT_LOW_CART,GROUPS.DEFAULT_HIGH_CART,GROUPS.DESCRIPTION from USER_PERMS, DROPBOXES, GROUPS where USER_PERMS.USER_NAME= ? and DROPBOXES.GROUP_NAME=USER_PERMS.GROUP_NAME and DROPBOXES.GROUP_NAME=GROUPS.NAME;}; my $sth = $dbh->prepare($sql) or return (undef, 'ERROR', "Database Error: " . $dbh->errstr); @@ -110,11 +110,13 @@ sub get_dropboxes or return (undef, 'ERROR', "Database Error: " . $sth->errstr); my @allowed_dbs; - while(my ($group, $type, $showid, $log, $normlevel, $trimlevel, $params, $groupdesc) = $sth->fetchrow_array()) { + while(my ($group, $type, $showid, $log, $normlevel, $trimlevel, $params, $lowcart, $highcart, $groupdesc) = $sth->fetchrow_array()) { my $entry = {}; $entry->{'GROUP'} = $group; $entry->{'GROUPDESC'} = $groupdesc; + $entry->{'GROUPLOWCART'} = $lowcart; + $entry->{'GROUPHIGHCART'} = $highcart; $entry->{'TYPE'} = $type; $entry->{'SHOWID'} = -1; $entry->{'LOG'} = $log; diff --git a/listdropboxes.cgi b/listdropboxes.cgi index 0bc0dbd..0d50928 100755 --- a/listdropboxes.cgi +++ b/listdropboxes.cgi @@ -48,6 +48,8 @@ if($responsecode != 200) { print " <dropbox>\n"; print " <group>" . $href->{'GROUP'} . "</group>\n"; print " <group-description>" . $href->{'GROUPDESC'} . "</group-description>\n"; + print " <group-low-cart>" . $href->{'GROUPLOWCART'} . "</group-low-cart>\n"; + print " <group-high-cart>" . $href->{'GROUPHIGHCART'} . "</group-high-cart>\n"; print " <type>" . $href->{'TYPE'} . "</type>\n"; print " <showid>" . $href->{'SHOWID'} . "</showid>\n"; print " <log>" . $href->{'LOG'} . "</log>\n"; |