X-Git-Url: https://git.infodrom.org/?p=infodrom.org%2Fservice.infodrom.org;a=blobdiff_plain;f=src%2FInfoCon%2Fbuch%2Finfocon;h=c10413b7a5fb262a77af79b92d00570aa6e322be;hp=b0d69612d1493d73f24d8420b978271fdb4ac7bb;hb=65cb3d52b45296e9a5f6a5d06fdb5d7f4d99d749;hpb=e79022b521c19f61a21730e44129bdcceba03fbf;ds=sidebyside

diff --git a/src/InfoCon/buch/infocon b/src/InfoCon/buch/infocon
index b0d6961..c10413b 100755
--- a/src/InfoCon/buch/infocon
+++ b/src/InfoCon/buch/infocon
@@ -168,6 +168,11 @@ sub sales_list
 	$where .= sprintf("year = %d", $opt_year);
     }
 
+    if (defined $data{category} && length $data{category}) {
+	$where .= " AND " if $where;
+	$where .= sprintf("category = %s", $dbh->quote($data{category}));
+    }
+
     if ($opt_direction) {
 	if ($opt_direction eq "in") {
 	    $d = "price >= 0"
@@ -587,9 +592,9 @@ my %options = (
     'verbose' => \$opt_verbose,
     'help' => \&usage,
     'dm' => sub {$table = "sales_dm"},
-    'buchung-input|bi' => \$data{'buchung-input'},
-    'buchung-unpaid|bu' => \$data{'buchung-unpaid'},
-    'buchung-hidden|bh' => \$data{'buchung-hidden'},
+    'buchung-input|bi' => \&buchung_input,
+    'buchung-unpaid|bu' => \&buchung_unpaid,
+    'buchung-hidden|bh' => \&buchung_hidden,
     'list-categories|lc' => \$data{'list-categories'},
     );
 
@@ -618,18 +623,8 @@ if (defined $data{mailto}) {
 }
 
 if (defined $data{category}) {
-    if (length($data{category})) {
-	sales_list("category = '".$data{category}."'");
-    } else {
-	sales_list;
-    }
+    sales_list;
     exit;
-} elsif (defined $data{'buchung-input'}) {
-    buchung_input;
-} elsif (defined $data{'buchung-unpaid'}) {
-    buchung_unpaid;
-} elsif (defined $data{'buchung-hidden'}) {
-    buchung_hidden;
 } elsif (defined $data{'list-categories'}) {
     list_categories;
 } elsif (defined $data{pay}) {