X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=db_access.py;h=a4d0e736b910ba9dfcd242a36d35862b1901850d;hb=4a37809c0bcc3a451d3d51b29e3fcc3cfe805097;hp=a9fd1d1a2866de514b274e682e89dbffda4632a4;hpb=07241fcd65bb2808804fe2a6e53807997ee9025b;p=dak.git

diff --git a/db_access.py b/db_access.py
index a9fd1d1a..a4d0e736 100644
--- 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.1.1.1 2000-11-24 00:20:09 troup Exp $
+# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
+# $Id: db_access.py,v 1.7 2001-04-03 10:01:27 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
@@ -18,16 +18,24 @@
 
 import pg, string
 
-Cnf = None
-projectB = None
-suite_id_cache = {}
-architecture_id_cache = {}
-archive_id_cache = {}
-component_id_cache = {}
-location_id_cache = {}
-maintainer_id_cache = {}
-source_id_cache = {}
-files_id_cache = {}
+############################################################################################
+
+Cnf = None;
+projectB = None;
+suite_id_cache = {};
+section_id_cache = {};
+priority_id_cache = {};
+override_type_id_cache = {};
+architecture_id_cache = {};
+archive_id_cache = {};
+component_id_cache = {};
+location_id_cache = {};
+maintainer_id_cache = {};
+source_id_cache = {};
+files_id_cache = {};
+maintainer_cache = {}
+
+############################################################################################
 
 def init (config, sql):
     global Cnf, projectB
@@ -44,22 +52,78 @@ def get_suite_id (suite):
         return suite_id_cache[suite]
 
     q = projectB.query("SELECT id FROM suite WHERE suite_name = '%s'" % (suite))
-    suite_id = q.getresult()[0][0]
+    ql = q.getresult();
+    if ql == []:
+        return -1; 
+    
+    suite_id = ql[0][0];
     suite_id_cache[suite] = suite_id
 
     return suite_id
 
+def get_section_id (section):
+    global section_id_cache
+
+    if section_id_cache.has_key(section):
+        return section_id_cache[section]
+
+    q = projectB.query("SELECT id FROM section WHERE section = '%s'" % (section))
+    ql = q.getresult();
+    if ql == []:
+        return -1; 
+    
+    section_id = ql[0][0];
+    section_id_cache[section] = section_id
+
+    return section_id
+
+def get_priority_id (priority):
+    global priority_id_cache
+
+    if priority_id_cache.has_key(priority):
+        return priority_id_cache[priority]
+
+    q = projectB.query("SELECT id FROM priority WHERE priority = '%s'" % (priority))
+    ql = q.getresult();
+    if ql == []:
+        return -1; 
+    
+    priority_id = ql[0][0];
+    priority_id_cache[priority] = priority_id
+
+    return priority_id
+
+def get_override_type_id (type):
+    global override_type_id_cache;
+
+    if override_type_id_cache.has_key(type):
+        return override_type_id_cache[type];
+
+    q = projectB.query("SELECT id FROM override_type WHERE type = '%s'" % (type));
+    ql = q.getresult();
+    if ql == []:
+        return -1; 
+    
+    override_type_id = ql[0][0];
+    override_type_id_cache[type] = override_type_id;
+
+    return override_type_id;
+
 def get_architecture_id (architecture):
-    global architecture_id_cache
+    global architecture_id_cache;
 
     if architecture_id_cache.has_key(architecture):
-        return architecture_id_cache[architecture]
+        return architecture_id_cache[architecture];
 
     q = projectB.query("SELECT id FROM architecture WHERE arch_string = '%s'" % (architecture))
-    architecture_id = q.getresult()[0][0]
-    architecture_id_cache[architecture] = architecture_id
+    ql = q.getresult();
+    if ql == []:
+        return -1;
+    
+    architecture_id = ql[0][0];
+    architecture_id_cache[architecture] = architecture_id;
 
-    return architecture_id
+    return architecture_id;
 
 def get_archive_id (archive):
     global archive_id_cache
@@ -84,7 +148,7 @@ def get_component_id (component):
     if ql == []:
         return -1;
 
-    component_id = ql[0][0]
+    component_id = ql[0][0];
     component_id_cache[component] = component_id
 
     return component_id
@@ -150,19 +214,20 @@ def get_files_id (filename, size, md5sum, location_id):
     cache_key = "%s~%d" % (filename, location_id);
 
     if files_id_cache.has_key(cache_key):
-        return files_id_cache[files]
+        return files_id_cache[cache_key]
 
+    size = int(size);
     q = projectB.query("SELECT id, size, md5sum FROM files WHERE filename = '%s' AND location = %d" % (filename, location_id));
     ql = q.getresult();
     if ql:
         if len(ql) != 1:
             return -1;
-        ql = ql[0] 
-        orig_size = ql[1];
+        ql = ql[0]; 
+        orig_size = int(ql[1]);
         orig_md5sum = ql[2];
         if orig_size != size or orig_md5sum != md5sum:
             return -2;
-        files_id_cache[cache_key] = ql[0]
+        files_id_cache[cache_key] = ql[0];
         return files_id_cache[cache_key]
     else:
         return None
@@ -185,3 +250,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];
+
+##########################################################################################