diff options
| author | Rob Austein <sra@hactrn.net> | 2009-06-03 05:07:04 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2009-06-03 05:07:04 +0000 |
| commit | ef20577491a69792f1692a135c79926b4cad551c (patch) | |
| tree | 51146ebe46c95b49ecbb670933b2ba1fcdc0db68 /rpkid/irdbd.py | |
| parent | e60405db297bc46756fbde275b99fe6ae7c62fb0 (diff) | |
Checkpoint: first step towards cleanup of SQL and left-right protocol.
svn path=/rpkid/doc/Installation; revision=2491
Diffstat (limited to 'rpkid/irdbd.py')
| -rwxr-xr-x | rpkid/irdbd.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rpkid/irdbd.py b/rpkid/irdbd.py index a7c0b8a3..8f86aa38 100755 --- a/rpkid/irdbd.py +++ b/rpkid/irdbd.py @@ -66,7 +66,7 @@ def handler(query, path, cb): cur.execute( """ - SELECT registrant_id, subject_name, valid_until FROM registrant + SELECT registrant_id, registrant_handle, valid_until FROM registrant WHERE registrant.rpki_self_id = %s AND registrant.rpki_child_id = %s """, (q_pdu.self_id, q_pdu.child_id)) @@ -75,8 +75,8 @@ def handler(query, path, cb): "This query should have produced a single exact match, something's messed up (rowcount = %d, self_id = %s, child_id = %s)" \ % (cur.rowcount, q_pdu.self_id, q_pdu.child_id) - registrant_id, subject_name, valid_until = cur.fetchone() - r_pdu.subject_name = subject_name + registrant_id, registrant_handle, valid_until = cur.fetchone() + #r_pdu.registrant_handle = registrant_handle r_pdu.valid_until = valid_until.strftime("%Y-%m-%dT%H:%M:%SZ") r_pdu.asn = rpki.resource_set.resource_set_as.from_sql(cur, "SELECT start_as, end_as FROM asn WHERE registrant_id = %s", (registrant_id,)) r_pdu.ipv4 = rpki.resource_set.resource_set_ipv4.from_sql(cur, "SELECT start_ip, end_ip FROM net WHERE registrant_id = %s AND version = 4", (registrant_id,)) |