remove direct call to reading the config file

[dak.git] / db_access.py

diff --git a/db_access.py b/db_access.py
index c62cde950f1867661c94771be2b4510a2d402bc8..2fe45177bce8022a91ddbaf994d1305254c39370 100644 (file)
--- a/db_access.py
+++ b/db_access.py
@@ -1,6 +1,6 @@
 # DB access fucntions
-# Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: db_access.py,v 1.5 2001-01-10 06:08:03 troup Exp $
+# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
+# $Id: db_access.py,v 1.9 2001-11-04 22:34:02 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
@@ -33,12 +33,13 @@ location_id_cache = {};
 maintainer_id_cache = {};
 source_id_cache = {};
 files_id_cache = {};
+maintainer_cache = {}
 
 ############################################################################################
 
 def init (config, sql):
     global Cnf, projectB
-    
+
     Cnf = config;
     projectB = sql;
 
@@ -52,9 +53,9 @@ def get_suite_id (suite):
 
     q = projectB.query("SELECT id FROM suite WHERE suite_name = '%s'" % (suite))
     ql = q.getresult();
-    if ql == []:
-        return -1; 
-    
+    if not ql:
+        return -1;
+
     suite_id = ql[0][0];
     suite_id_cache[suite] = suite_id
 
@@ -68,9 +69,9 @@ def get_section_id (section):
 
     q = projectB.query("SELECT id FROM section WHERE section = '%s'" % (section))
     ql = q.getresult();
-    if ql == []:
-        return -1; 
-    
+    if not ql:
+        return -1;
+
     section_id = ql[0][0];
     section_id_cache[section] = section_id
 
@@ -84,9 +85,9 @@ def get_priority_id (priority):
 
     q = projectB.query("SELECT id FROM priority WHERE priority = '%s'" % (priority))
     ql = q.getresult();
-    if ql == []:
-        return -1; 
-    
+    if not ql:
+        return -1;
+
     priority_id = ql[0][0];
     priority_id_cache[priority] = priority_id
 
@@ -100,9 +101,9 @@ def get_override_type_id (type):
 
     q = projectB.query("SELECT id FROM override_type WHERE type = '%s'" % (type));
     ql = q.getresult();
-    if ql == []:
-        return -1; 
-    
+    if not ql:
+        return -1;
+
     override_type_id = ql[0][0];
     override_type_id_cache[type] = override_type_id;
 
@@ -116,9 +117,9 @@ def get_architecture_id (architecture):
 
     q = projectB.query("SELECT id FROM architecture WHERE arch_string = '%s'" % (architecture))
     ql = q.getresult();
-    if ql == []:
+    if not ql:
         return -1;
-    
+
     architecture_id = ql[0][0];
     architecture_id_cache[architecture] = architecture_id;
 
@@ -131,7 +132,11 @@ def get_archive_id (archive):
         return archive_id_cache[archive]
 
     q = projectB.query("SELECT id FROM archive WHERE name = '%s'" % (archive))
-    archive_id = q.getresult()[0][0]
+    ql = q.getresult();
+    if not ql:
+        return -1;
+
+    archive_id = ql[0][0]
     archive_id_cache[archive] = archive_id
 
     return archive_id
@@ -144,7 +149,7 @@ def get_component_id (component):
 
     q = projectB.query("SELECT id FROM component WHERE lower(name) = '%s'" % (string.lower(component)))
     ql = q.getresult();
-    if ql == []:
+    if not ql:
         return -1;
 
     component_id = ql[0][0];
@@ -166,7 +171,11 @@ def get_location_id (location, component, archive):
             q = projectB.query("SELECT id FROM location WHERE path = '%s' AND component = %d AND archive = %d" % (location, component_id, archive_id))
     else:
         q = projectB.query("SELECT id FROM location WHERE path = '%s' AND archive = %d" % (location, archive_id))
-    location_id = q.getresult()[0][0]
+    ql = q.getresult();
+    if not ql:
+        return -1;
+
+    location_id = ql[0][0]
     location_id_cache[cache_key] = location_id
 
     return location_id
@@ -221,7 +230,7 @@ def get_files_id (filename, size, md5sum, location_id):
     if ql:
         if len(ql) != 1:
             return -1;
-        ql = ql[0]; 
+        ql = ql[0];
         orig_size = int(ql[1]);
         orig_md5sum = ql[2];
         if orig_size != size or orig_md5sum != md5sum:
@@ -240,7 +249,7 @@ def set_files_id (filename, size, md5sum, location_id):
     cache_key = "%s~%d" % (filename, location_id);
 
     #print "INSERT INTO files (filename, size, md5sum, location) VALUES ('%s', %d, '%s', %d)" % (filename, long(size), md5sum, location_id);
-    projectB.query("INSERT INTO files (filename, size, md5sum, location) VALUES ('%s', %d, '%s', %d)" % (filename, long(size), md5sum, location_id)); 
+    projectB.query("INSERT INTO files (filename, size, md5sum, location) VALUES ('%s', %d, '%s', %d)" % (filename, long(size), md5sum, location_id));
     q = projectB.query("SELECT id FROM files WHERE id = currval('files_id_seq')");
     ql = q.getresult()[0];
     files_id_cache[cache_key] = ql[0]
@@ -249,3 +258,13 @@ def set_files_id (filename, size, md5sum, location_id):
 
 ##########################################################################################
 
+def get_maintainer (maintainer_id):
+    global maintainer_cache;
+
+    if not maintainer_cache.has_key(maintainer_id):
+        q = projectB.query("SELECT name FROM maintainer WHERE id = %s" % (maintainer_id));
+        maintainer_cache[maintainer_id] = q.getresult()[0][0];
+
+    return maintainer_cache[maintainer_id];
+
+##########################################################################################