Add new methods last_netmask, charset and set_charset. Add attributes GeoIP.GEOIP_CHARSET_ISO_8859_1 and GeoIP.GEOIP_CHARSET_UTF8 and the example script test_city_charset.py ( Boris Zentner )

borisz · borisz · commit c80df2da54c4 · 2008-11-16T14:44:50.000Z
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+
+	* Add charset and set_charset methods , as well as 
+		the new attributes GeoIP.GEOIP_CHARSET_ISO_8859_1 and
+		GeoIP.GEOIP_CHARSET_UTF8 ( Boris Zentner )
+	* Add test_city_charset.py script showing howto use
+		charset and set_charset ( Boris Zentner )
+	* Add last_netmask ( Boris Zentner )
+	* Fix compile warnings ( Boris Zentner )
 1.2.4	
 	* fix small memoryleak in database_info, org_by_name and org_by_addr (	Boris Zentner )
 	* fix version number in setup.py ( Boris Zentner )
diff --git a/py_GeoIP.c b/py_GeoIP.c
@@ -129,7 +129,7 @@ static PyObject * GeoIP_country_name_by_addr_Py(PyObject *self, PyObject *args)
 
 static PyObject * GeoIP_org_by_addr_Py(PyObject *self, PyObject *args) {
   char       * name;
-  const char * org;
+  char * org;
   PyObject   * ret;
   GeoIP_GeoIPObject* GeoIP = (GeoIP_GeoIPObject*)self;
   if (!PyArg_ParseTuple(args, "s", &name)) {
@@ -143,7 +143,7 @@ static PyObject * GeoIP_org_by_addr_Py(PyObject *self, PyObject *args) {
 
 static PyObject * GeoIP_org_by_name_Py(PyObject *self, PyObject *args) {
   char       * name;
-  const char * org;
+  char * org;
   PyObject   * ret;
   GeoIP_GeoIPObject* GeoIP = (GeoIP_GeoIPObject*)self;
   if (!PyArg_ParseTuple(args, "s", &name)) {
@@ -308,6 +308,26 @@ static PyObject * GeoIP_range_by_ip_Py(PyObject *self, PyObject *args) {
   return retval;
 }
 
+static PyObject * GeoIP_charset_Py(PyObject *self, PyObject * args) {
+  GeoIP_GeoIPObject* GeoIP = (GeoIP_GeoIPObject*)self;
+  return Py_BuildValue("i", GeoIP_charset(GeoIP->gi) );
+}
+
+static PyObject * GeoIP_set_charset_Py(PyObject *self, PyObject * args) {
+  GeoIP_GeoIPObject* GeoIP = (GeoIP_GeoIPObject*)self;
+  int charset;
+  if (!PyArg_ParseTuple(args, "i", &charset)) {
+    return NULL;
+  }
+  return Py_BuildValue("i", GeoIP_set_charset(GeoIP->gi, charset));
+
+}
+	
+static PyObject * GeoIP_last_netmask_Py(PyObject *self, PyObject * args) {
+  GeoIP_GeoIPObject* GeoIP = (GeoIP_GeoIPObject*)self;
+  return Py_BuildValue("i", GeoIP_last_netmask(GeoIP->gi) );
+}
+
 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"},
@@ -320,6 +340,9 @@ static PyMethodDef GeoIP_Object_methods[] = {
   {"record_by_addr", GeoIP_record_by_addr_Py, 1, "Lookup City Region By IP Address"},
   {"record_by_name", GeoIP_record_by_name_Py, 1, "Lookup City Region By Name"},
   {"range_by_ip", GeoIP_range_by_ip_Py, 1, "Lookup start and end IP's for a given IP"},
+  {"charset", GeoIP_charset_Py, 1, "Return the current charset ( either GEOIP_CHARSET_ISO_8859_1 or GEOIP_CHARSET_UTF8 )"},
+  {"set_charset", GeoIP_set_charset_Py, 1, "Set the charset for city records"},
+  {"last_netmask", GeoIP_last_netmask_Py, 1, "return the netmask depth of the last lookup"},
   {NULL, NULL, 0, NULL}
 };
 
@@ -421,4 +444,13 @@ initGeoIP(void)
   tmp = PyInt_FromLong(GEOIP_INDEX_CACHE);
   PyDict_SetItemString(d, "GEOIP_INDEX_CACHE", tmp);
   Py_DECREF(tmp);
+
+  tmp = PyInt_FromLong(GEOIP_CHARSET_ISO_8859_1);
+  PyDict_SetItemString(d, "GEOIP_CHARSET_ISO_8859_1", tmp);
+  Py_DECREF(tmp);
+
+  tmp = PyInt_FromLong(GEOIP_CHARSET_UTF8);
+  PyDict_SetItemString(d, "GEOIP_CHARSET_UTF8", tmp);
+  Py_DECREF(tmp);
+
 }
diff --git a/test.py b/test.py
@@ -7,6 +7,7 @@
 #gi = GeoIP.open("/usr/local/share/GeoIP/GeoIP.data",GeoIP.GEOIP_STANDARD)
 
 print gi.country_code_by_name("yahoo.com")
+print gi.last_netmask()
 print gi.country_name_by_name("www.bundestag.de")
 print gi.country_code_by_addr("24.24.24.24")
 print gi.country_name_by_addr("24.24.24.24")
diff --git a/test_city_charset.py b/test_city_charset.py
@@ -0,0 +1,35 @@
+#!/usr/bin/python
+
+import GeoIP
+
+# open the citydatabase. All cities return in iso-8859-1 by default
+gi = GeoIP.open("/usr/local/share/GeoIP/GeoIPCity.dat",GeoIP.GEOIP_STANDARD)
+
+# lookup a record, where cityname contains chars > 127 ( eg != ascii )
+gir = gi.record_by_name("www.osnabrueck.de")
+
+# print the cityname with iso-8859-1 charset
+print gir['city'];
+
+# print the cityname transformed to utf8
+print unicode(gir['city'], 'iso-8859-1')
+
+# however, at your option GeoIP can return the cityname in utf8
+# just put GeoIP into utf8 mode
+#
+# from now on all records returns in UTF8 until you change the charset again
+# Notice, that all previous records return in the previous charset
+gi.set_charset(GeoIP.GEOIP_CHARSET_UTF8);
+
+# get a new record, now in utf8
+gir2 = gi.record_by_name("www.osnabrueck.de")
+
+# and print it ( should be the same output as on line 2 )
+print gir2['city']
+
+## Some more charset examples
+# current_charset = gi.charset()
+# old_charset = gi.set_charset(GeoIP.GEOIP_CHARSET_ISO_8859_1);
+
+
+
