From f6aef0cbb8cb2464854a23566ccb72526c145f55 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 20 Sep 2014 01:14:51 +0000 Subject: also exporting log name of dropboxes diff --git a/index.html b/index.html index 7d31438..d6febed 100644 --- a/index.html +++ b/index.html @@ -78,6 +78,7 @@ starttime: $(this).find('show-starttime').text(), length: $(this).find('show-length').text(), group: $(this).find('group').text(), + log: $(this).find('log').text(), normlevel: $(this).find('normalization-level').text(), trimlevel: $(this).find('autotrim-level').text(), } diff --git a/lib/rddb.pm b/lib/rddb.pm index b78f4d1..966b29f 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.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.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,13 +110,14 @@ sub get_dropboxes or return (undef, 'ERROR', "Database Error: " . $sth->errstr); my @allowed_dbs; - while(my ($group, $type, $showid, $normlevel, $trimlevel, $params, $groupdesc) = $sth->fetchrow_array()) { + while(my ($group, $type, $showid, $log, $normlevel, $trimlevel, $params, $groupdesc) = $sth->fetchrow_array()) { my $entry = {}; $entry->{'GROUP'} = $group; $entry->{'GROUPDESC'} = $groupdesc; $entry->{'TYPE'} = $type; $entry->{'SHOWID'} = -1; + $entry->{'LOG'} = $log; $entry->{'NORMLEVEL'} = $normlevel; $entry->{'TRIMLEVEL'} = $trimlevel; $entry->{'PARAM'} = $params; diff --git a/listshows.cgi b/listshows.cgi index 7ef0bcf..0bc0dbd 100755 --- a/listshows.cgi +++ b/listshows.cgi @@ -50,6 +50,7 @@ if($responsecode != 200) { print " " . $href->{'GROUPDESC'} . "\n"; print " " . $href->{'TYPE'} . "\n"; print " " . $href->{'SHOWID'} . "\n"; + print " " . $href->{'LOG'} . "\n"; print " " . $href->{'NORMLEVEL'} . "\n"; print " " . $href->{'TRIMLEVEL'} . "\n"; print " " . $href->{'PARAM'} . "\n"; -- cgit v0.10.2