[Maposmatic-dev] [[PATCH maposmatic] 1/2] Fixes in gisdb.py

[Maxime Petazzoni]

Fixed missing logger, added copyright notice and followed Python
variable naming convention for the module-global _DB variable.

Signed-off-by: Maxime Petazzoni <address@hidden>
---
 www/maposmatic/gisdb.py |   45 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/www/maposmatic/gisdb.py b/www/maposmatic/gisdb.py
index e631b18..8f9921d 100644
--- a/www/maposmatic/gisdb.py
+++ b/www/maposmatic/gisdb.py
@@ -1,15 +1,46 @@
+# coding: utf-8
+
+# maposmatic, the web front-end of the MapOSMatic city map generation system
+# Copyright (C) 2012  David Decotigny
+# Copyright (C) 2012  Frédéric Lehobey
+# Copyright (C) 2012  David Mentré
+# Copyright (C) 2012  Maxime Petazzoni
+# Copyright (C) 2012  Thomas Petazzoni
+# Copyright (C) 2012  Gaël Utard
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Nominatim parsing + json export
+# Note: we query nominatim in XML format because otherwise we cannot
+# access the osm_id tag. Then we format it as json back to the
+# javascript routines
+
+import logging
 import psycopg2
 import www.settings
 
-db = None
+l = logging.getLogger('maposmatic')
+_DB = None
 
 def get():
-    global db
-    if db:
-        return db
+    global _DB
+
+    if _DB:
+        return _DB
 
     try:
-        db = psycopg2.connect("dbname='%s' user='%s' host='%s' password='%s' 
port='%s'" %
+        _DB = psycopg2.connect("dbname='%s' user='%s' host='%s' password='%s' 
port='%s'" %
                                 (www.settings.GIS_DATABASE_NAME,
                                  www.settings.GIS_DATABASE_USER,
                                  www.settings.GIS_DATABASE_HOST,
@@ -18,6 +49,6 @@ def get():
     except psycopg2.OperationalError, e:
         l.warning("Could not connect to the PostGIS database: %s" %
                   str(e)[:-1])
-        return None
+        _DB = None
 
-    return db
+    return _DB
-- 
1.7.8.3