From 63ff461e0ef83cbec17f926d1bd86f3dc094076e Mon Sep 17 00:00:00 2001
From: Brian Moe <bmoe@gravity.phys.uwm.edu>
Date: Tue, 4 Aug 2009 12:30:42 -0500
Subject: [PATCH] Replaced hardcoded/fake db user/password with values from
Django settings
---
gracedb/translator.py | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/gracedb/translator.py b/gracedb/translator.py
index 57ff12f94..45ff6b71e 100644
--- a/gracedb/translator.py
+++ b/gracedb/translator.py
@@ -4,6 +4,8 @@ import os, sys
from models import EventLog
from subprocess import Popen, PIPE
+from django.conf import settings
+
import glue, glue.ligolw.utils
from glue.gracedb.utils import InspiralCoincDef
from glue.gracedb.utils import BurstCoincDef
@@ -29,7 +31,12 @@ def insert_ligolw_tables(xml_filename):
ppath = ppath.split(':')
ppath = ppath + sys.path
e['PYTHONPATH'] = ':'.join(ppath)
- p = Popen( (prog, "root", "", "gracedb", xml_filename), stdout=PIPE, stderr=PIPE, env=e)
+ p = Popen( (prog,
+ settings.DATABASE_USER,
+ settings.DATABASE_PASSWORD,
+ settings.DATABASE_NAME,
+ xml_filename),
+ stdout=PIPE, stderr=PIPE, env=e)
out = p.stdout.read()
err = p.stderr.read()
p.wait()
@@ -154,7 +161,7 @@ def handle_uploaded_data(event, datafilename,
event.likelihood = coinc_table[0].likelihood
xml_filename = os.path.join(output_dir, coinc_table_filename)
- event.coinc_id = insert_ligolw_tables(xml_filename)
+ event.coincEvent_id = insert_ligolw_tables(xml_filename)
event.save()
@@ -204,7 +211,7 @@ def handle_uploaded_data(event, datafilename,
event.likelihood = coinc_table[0].likelihood
xml_filename = os.path.join(output_dir, coinc_table_filename)
- event.coinc_id = insert_ligolw_tables(xml_filename)
+ event.coincEvent_id = insert_ligolw_tables(xml_filename)
event.save()
else:
--
GitLab