Only in ip2cc-new: .DS_Store
diff -crB ip2cc/README.txt ip2cc-new/README.txt
*** ip2cc/README.txt	2009-03-30 22:48:25.000000000 +0100
--- ip2cc-new/README.txt	2011-09-30 13:44:09.000000000 +0100
***************
*** 12,19 ****
  - Autonomous Number
  
  Note: This 'work' uses the IP-to-Country Database
!       provided by WebHosting.Info (http://www.webhosting.info),
!       available from http://ip-to-country.webhosting.info.
  
        All flags are provided by AWStats.
        http://ip-to-country.webhosting.info/flag/awstatsflags.zip
--- 12,19 ----
  - Autonomous Number
  
  Note: This 'work' uses the IP-to-Country Database
!       provided by http://Software77.net (A Webnet77 Company),
!       available from http://software77.net/geo-ip/.
  
        All flags are provided by AWStats.
        http://ip-to-country.webhosting.info/flag/awstatsflags.zip
***************
*** 44,49 ****
--- 44,50 ----
  
  Written by: Sugree Phatanapherom (http://www.howforge.com)
  Developed by: Tom Kirkpatrick (mrfelton) - http://www.kirkdesigns.co.uk
+ Updated to use new IP2cc source by: Adam Cowell - http://www.lurch.org.uk
  
  If you use this module, find it useful, and want to send the author
  a thank you note, then use the Feedback/Contact page at the URL above.
diff -crB ip2cc/fetchdb.sh ip2cc-new/fetchdb.sh
*** ip2cc/fetchdb.sh	2009-05-04 11:23:30.000000000 +0100
--- ip2cc-new/fetchdb.sh	2011-09-30 14:11:09.000000000 +0100
***************
*** 1,11 ****
  #!/bin/sh
  
  OUTFILE=ipdb.mysql
! URL=http://ip-to-country.webhosting.info/downloads/ip-to-country.csv.zip
  
! #if [ ! -e ip-to-country.csv ] ; then
! 	wget $URL
! 	unzip ip-to-country.csv.zip
!   chmod +r ip-to-country.csv
! 	rm ip-to-country.csv.zip
  #fi
--- 1,11 ----
  #!/bin/sh
  
  OUTFILE=ipdb.mysql
! URL=http://software77.net/geo-ip/?DL=2
  
! #if [ ! -e IpToCountry.csv ] ; then
! 	wget $URL -O ./IpToCountry.csv.zip
! 	unzip IpToCountry.csv.zip
!   chmod +r IpToCountry.csv
! 	rm IpToCountry.csv.zip
  #fi
Only in ip2cc-new: ip-to-country.csv
diff -crB ip2cc/ip2cc.inc ip2cc-new/ip2cc.inc
*** ip2cc/ip2cc.inc	2009-09-27 10:55:28.000000000 +0100
--- ip2cc-new/ip2cc.inc	2011-09-30 14:45:42.000000000 +0100
***************
*** 12,18 ****
  }
  
  function _ip2cc_batch_insert() {
!   $file = drupal_get_path('module', 'ip2cc') .'/ip-to-country.csv';
    if (!$file || !file_exists($file)) {
      drupal_set_message(t("The ip2cc database file @file is missing. ", array('@file' => $file)));
      return FALSE;
--- 12,18 ----
  }
  
  function _ip2cc_batch_insert() {
!   $file = drupal_get_path('module', 'ip2cc') .'/IpToCountry.csv';
    if (!$file || !file_exists($file)) {
      drupal_set_message(t("The ip2cc database file @file is missing. ", array('@file' => $file)));
      return FALSE;
***************
*** 22,30 ****
      db_query("DELETE FROM {ip2cc}");
      $count = 0;
      while ($line = fgets($fd)) {
!       if (preg_match('/^"([0-9]+)","([0-9]+)","(.{2})","(.{3})","(.*)"$/', trim($line), $matches)) {
!         db_query("INSERT INTO {ip2cc} VALUES('%s', '%s', '%s', 'Unknown', 0)", $matches[1], $matches[2], $matches[3]);
          $count++;
        }
      }
      fclose($fd);
--- 22,33 ----
      db_query("DELETE FROM {ip2cc}");
      $count = 0;
      while ($line = fgets($fd)) {
!     if  (preg_match('/^"([0-9]+)","([0-9]+)","(.*)","([0-9]+)","(.{2})","(.{3})","(.*)"$/', trim($line), $matches)) {
!         db_query("INSERT INTO {ip2cc} VALUES('%s', '%s', '%s', 'Unknown', 0)", $matches[1], $matches[2], $matches[5]);
          $count++;
+     if (preg_match('/^#/', $str)) {
+        $count++; 
+        }
        }
      }
      fclose($fd);
diff -crB ip2cc/ip2cc.module ip2cc-new/ip2cc.module
*** ip2cc/ip2cc.module	2009-09-27 10:55:28.000000000 +0100
--- ip2cc-new/ip2cc.module	2011-09-30 14:08:43.000000000 +0100
***************
*** 6,16 ****
   * Provide APIs for converting IP to Country.
   *
   * This module uses the IP-to-Country Database
!  * provided by WebHosting.Info (http://www.webhosting.info),
!  * available from http://ip-to-country.webhosting.info.
   *
   * @author Sugree Phatanapherom (http://www.howforge.com)
   * @author Tom Kirkpatrick (mrfelton), www.kirkdesigns.co.uk
   */
  
  include_once(drupal_get_path('module', 'ip2cc') .'/ip2cc.inc');
--- 6,17 ----
   * Provide APIs for converting IP to Country.
   *
   * This module uses the IP-to-Country Database
!  * provided by http://Software77.net (A Webnet77 Company),
!  * available from http://software77.net/geo-ip/.
   *
   * @author Sugree Phatanapherom (http://www.howforge.com)
   * @author Tom Kirkpatrick (mrfelton), www.kirkdesigns.co.uk
+  * @author Adam Cowell, www.lurch.org.uk
   */
  
  include_once(drupal_get_path('module', 'ip2cc') .'/ip2cc.inc');
***************
*** 31,42 ****
      case 'admin/help#ip2cc':
        $output .= '<p>'. t('IP to Country provives a simple API for retrieving country related information from a given IP address. As well as providing an API that other modules can use for their purpose, ip2cc is also able to hook into nodes and comments to provide additional information about the poster, such as country code, country flag (icon), network name, and autonomous system number.') .'</p>';
        $output .= '<p>'. t('Additional data such as Country name, number and iso2 and iso3 country codes are available if the <a href="@countries_api">countries_api</a> module is installed.', array('@countries_api' => url('http://drupal.org/project/countries_api'))) .'</p>';
!       $output .= '<p>'. t("The IP to Country database is provided by <a href='@webhostinginfo'>webhostinginfo</a> and is updated aproximately once a month. To update your ip2cc database, please visit the <a href='@update_page'>ip2cc database update</a> page.", array('@webhostinginfo' => url('http://ip-to-country.webhosting.info'), '@update_page' => url('admin/settings/ip2cc/update'))) .'</p>';
        return $output;
      case 'admin/settings/ip2cc':
!       $output = '<p>'. t("The IP to Country database is provided by <a href='@webhostinginfo'>webhostinginfo</a> and is updated aproximately once a month. To update your ip2cc database, follow the following steps:", array('@webhostinginfo' => url('http://ip-to-country.webhosting.info'))) .'</p>';
!       $output .= '<ul><li>'. t('<a href="@download_url">download</a> the ip2cc database', array('@download_url' => url('http://ip-to-country.webhosting.info/downloads/ip-to-country.csv.zip'))) .'</li>';
!       $output .= '<li>'. t('Unzip the file to @module_dir', array('@module_dir' => drupal_get_path('module', 'ip2cc') .'/ip-to-country.csv')) .'</li>';
        $output .= '<li>'. t('Click the update button below') .'</li>';
        $output .= '<li>'. t("Wait - the import process can take several minutes.") .'</li></ul>';
        $output .= '<p><em>'. t("Note: If you are on a UNIX platform, you may run the 'fetch.sh' script provided in the ip2cc module directory which will download and extract unzip the IP to Country database for you.") .'</em></p>';
--- 32,43 ----
      case 'admin/help#ip2cc':
        $output .= '<p>'. t('IP to Country provives a simple API for retrieving country related information from a given IP address. As well as providing an API that other modules can use for their purpose, ip2cc is also able to hook into nodes and comments to provide additional information about the poster, such as country code, country flag (icon), network name, and autonomous system number.') .'</p>';
        $output .= '<p>'. t('Additional data such as Country name, number and iso2 and iso3 country codes are available if the <a href="@countries_api">countries_api</a> module is installed.', array('@countries_api' => url('http://drupal.org/project/countries_api'))) .'</p>';
!       $output .= '<p>'. t("The IP to Country database is provided by <a href='@webnet77'>Webnet77</a> and is updated atleast once a month. To update your ip2cc database, please visit the <a href='@update_page'>ip2cc database update</a> page.", array('@webnet77' => url('http://software77.net/geo-ip'), '@update_page' => url('admin/settings/ip2cc/update'))) .'</p>';
        return $output;
      case 'admin/settings/ip2cc':
!       $output = '<p>'. t("The IP to Country database is provided by <a href='@webnet77'>Webnet77</a> and is updated aproximately once a month. To update your ip2cc database, follow the following steps:", array('@webnet77' => url('http://software77.net/geo-ip'))) .'</p>';
!       $output .= '<ul><li>'. t('<a href="@download_url">download</a> the ip2cc database', array('@download_url' => url('http://software77.net/geo-ip/?DL=2'))) .'</li>';
!       $output .= '<li>'. t('Unzip the file to @module_dir', array('@module_dir' => drupal_get_path('module', 'ip2cc') .'/IpToCountry.csv')) .'</li>';
        $output .= '<li>'. t('Click the update button below') .'</li>';
        $output .= '<li>'. t("Wait - the import process can take several minutes.") .'</li></ul>';
        $output .= '<p><em>'. t("Note: If you are on a UNIX platform, you may run the 'fetch.sh' script provided in the ip2cc module directory which will download and extract unzip the IP to Country database for you.") .'</em></p>';