Use parse_args()

[dak.git] / madison

diff --git a/madison b/madison
index 6961f818f0e67906558db2d5a80edbd10f69c0c0..39a389dc847bfd92e0e0cc23d583c9f7ae5200b7 100755 (executable)
--- a/madison
+++ b/madison
@@ -2,7 +2,7 @@
 
 # Display information about package(s) (suite, version, etc.)
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: madison,v 1.19 2002-06-05 00:20:16 troup Exp $
+# $Id: madison,v 1.20 2002-07-14 15:02:07 troup Exp $
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -72,11 +72,13 @@ def main ():
     Cnf = utils.get_conf()
 
     Arguments = [('a', "architecture", "Madison::Options::Architecture", "HasArg"),
+                 ('c', "component", "Madison::Options::Component", "HasArg"),
                  ('r', "regex", "Madison::Options::Regex"),
                  ('s', "suite", "Madison::Options::Suite", "HasArg"),
                  ('S', "source-and-binary", "Madison::Options::Source-And-Binary"),
                  ('h', "help", "Madison::Options::Help")];
-    for i in ["architecture", "regex", "suite", "source-and-binary", "help" ]:
+    for i in [ "architecture", "component", "regex", "suite",
+               "source-and-binary", "help" ]:
        if not Cnf.has_key("Madison::Options::%s" % (i)):
            Cnf["Madison::Options::%s" % (i)] = "";
 
@@ -91,45 +93,15 @@ def main ():
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
 
+    # Parse -a/--architecture, -s/--suite
+    (con_suites, con_architectures, con_components, check_source) = \
+                 utils.parse_args(Options);
+
     if Options["Regex"]:
         comparison_operator = "~";
     else:
         comparison_operator = "=";
 
-    if Options["Suite"]:
-        suite_ids_list = [];
-        for suite in string.split(Options["Suite"]):
-            suite_id = db_access.get_suite_id(suite);
-            if suite_id == -1:
-                utils.warn("suite '%s' not recognised." % (suite));
-            else:
-                suite_ids_list.append(suite_id);
-        if suite_ids_list:
-            con_suites = "AND su.id IN (%s)" % string.join(map(str, suite_ids_list), ", ");
-        else:
-            utils.fubar("No correct suite given.");
-    else:
-        con_suites = "";
-
-    if Options["Architecture"]:
-        arch_ids_list = [];
-        check_source = 0;
-        for architecture in string.split(Options["Architecture"]):
-            if architecture == "source":
-                check_source = 1;
-            architecture_id = db_access.get_architecture_id(architecture);
-            if architecture_id == -1:
-                utils.warn("architecture '%s' not recognised." % (architecture));
-            else:
-                arch_ids_list.append(architecture_id);
-        if arch_ids_list:
-            con_architectures = "AND a.id IN (%s)" % string.join(map(str, arch_ids_list), ", ");
-        else:
-            utils.fubar("No correct architecture given.");
-    else:
-        con_architectures = "";
-        check_source = 1;
-
     if Options["Source-And-Binary"]:
         new_packages = [];
         for package in packages: