added support for GeoIP City

tjmather · tjmather · commit c0ee78c915be · 2003-05-09T03:10:15.000Z
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,7 @@
-1.1.0
+1.2.0	2003-05-08
+	* Added support for GeoIP City
+
+1.1.0	2003-03-18
 	* Added support for GeoIP ISP and Organization
 
 0.2.0	2002-06-25
diff --git a/README b/README
@@ -6,11 +6,13 @@ To Install:
 	python setup.py install
 
 Usage:
-	See test.py for example usage
+	See test.py for example usage with GeoIP Country
+	See test_org.py for example usage with GeoIP ISP and Organization
+	See test_city.py for example usage with GeoIP City
 
 License:
 
-Copyright (c) 2003 MaxMind.com.
+Copyright (c) 2003 MaxMind LLC
 
 All rights reserved.  This package is free software; it is licensed
 under the GPL.
diff --git a/py_GeoIP.c b/py_GeoIP.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
 /* py_GeoIP.c
  *
- * Copyright (C) 2002 MaxMind.com
+ * Copyright (C) 2003 MaxMind LLC
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
@@ -20,6 +20,7 @@
 
 #include <Python.h>
 #include "GeoIP.h"
+#include "GeoIPCity.h"
 
 staticforward PyTypeObject GeoIP_GeoIPType;
 
@@ -143,13 +144,41 @@ static PyObject * GeoIP_org_by_name_Py(PyObject *self, PyObject *args) {
   return Py_BuildValue("s", retval);
 }
 
+static PyObject * GeoIP_populate_dict(GeoIPRecord *gir) {
+	PyObject * retval;
+	retval = PyDict_New();
+	PyDict_SetItem(retval,Py_BuildValue("s","country_code"),Py_BuildValue("s",gir->country_code));
+	PyDict_SetItem(retval,Py_BuildValue("s","country_code3"),Py_BuildValue("s",gir->country_code3));
+	PyDict_SetItem(retval,Py_BuildValue("s","country_name"),Py_BuildValue("s",gir->country_name));
+	PyDict_SetItem(retval,Py_BuildValue("s","region"),Py_BuildValue("s",gir->region));
+	PyDict_SetItem(retval,Py_BuildValue("s","city"),Py_BuildValue("s",gir->city));
+	PyDict_SetItem(retval,Py_BuildValue("s","postal_code"),Py_BuildValue("s",gir->postal_code));
+	PyDict_SetItem(retval,Py_BuildValue("s","latitude"),Py_BuildValue("f",gir->latitude));
+	PyDict_SetItem(retval,Py_BuildValue("s","longitude"),Py_BuildValue("f",gir->longitude));
+	PyDict_SetItem(retval,Py_BuildValue("s","dma_code"),Py_BuildValue("i",gir->dma_code));
+	PyDict_SetItem(retval,Py_BuildValue("s","area_code"),Py_BuildValue("i",gir->area_code));
+	return retval;
+}
+
+static PyObject * GeoIP_record_by_addr_Py(PyObject *self, PyObject *args) {
+  char * addr;
+  GeoIPRecord * gir;
+  GeoIP_GeoIPObject* GeoIP = (GeoIP_GeoIPObject*)self;
+  if (!PyArg_ParseTuple(args, "s", &addr)) {
+    return NULL;
+  }
+  gir = GeoIP_record_by_addr(GeoIP->gi, addr);
+	return GeoIP_populate_dict(gir);
+}
+
 static PyMethodDef GeoIP_Object_methods[] = {
   {"country_code_by_name", GeoIP_country_code_by_name_Py, 1, "Lookup Country Code By Name"},
   {"country_name_by_name", GeoIP_country_name_by_name_Py, 1, "Lookup Country Name By Name"},
   {"country_code_by_addr", GeoIP_country_code_by_addr_Py, 1, "Lookup Country Code By IP Address"},
   {"country_name_by_addr", GeoIP_country_name_by_addr_Py, 1, "Lookup Country Name By IP Address"},
   {"org_by_addr", GeoIP_org_by_addr_Py, 1, "Lookup Organization or ISP By IP Address"},
   {"org_by_name", GeoIP_org_by_name_Py, 1, "Lookup Organization or ISP By Name"},
+  {"record_by_addr", GeoIP_record_by_addr_Py, 1, "Lookup City Region By IP Address"},
   {NULL, NULL, 0, NULL}
 };
 
diff --git a/setup.py b/setup.py
@@ -5,6 +5,6 @@
 	sources = ['py_GeoIP.c'])
 
 setup (name = 'GeoIP-Python',
-	version = '0.2.0',
+	version = '1.2.0',
 	description = 'This is a python wrapper to GeoIP',
 	ext_modules = [module1])
diff --git a/test_city.py b/test_city.py
@@ -0,0 +1,14 @@
+#!/usr/bin/python
+
+import GeoIP
+import GeoIPRecord
+
+gi = GeoIP.open("/usr/local/share/GeoIP/GeoIPCity.dat",GeoIP.GEOIP_STANDARD)
+
+gir = gi.record_by_addr("24.24.24.24")
+
+print gir['country_code'] + '\t' + gir['country_code3'] + '\t' + gir['country_name'] + '\t' + gir['region'] + '\t' + gir['city'] + '\t' + gir['postal_code']
+print gir['latitude']
+print gir['longitude']
+print gir['dma_code']
+print gir['area_code'];
