yan/archived-ip2region
1
0
Fork 0
mirror of https://github.com/netfun2000/ip2region.git synced 2026-02-27 09:44:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

conflicts fixed

Browse Source
This commit is contained in:
狮子的魂
2015-12-08 21:48:39 +08:00
parent 9b0b7e8ebd
commit 83d7586c84
18 changed files with 1 additions and 1862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
binding/php/testSeacher.php
View File

@@ -2,32 +2,11 @@
/**
* Ip2Region php client test script
*
<<<<<<< HEAD
* @author chenxin<chenxin619315@gmail.com>
=======
* @author chenxin<chenxin619315@gmail.com>
>>>>>>> 7e51a4909fdb01014f948c2dbc5cfb5fbed9ce56
*/
if ( $argc < 2 )
{
<<<<<<< HEAD
$usage = <<<EOF
Usage: php Test.php [ip2region db file] [alrogrithm]
+-Algorithm: binary or b-tree\n
EOF;
exit($usage);
}
array_shift($argv);
$dbFile = $argv[0];
$method = 1;
$algorithm = 'B-tree';
if ( isset($argv[1])
&& strtolower($argv[1]) == 'binary' ) {
$method = 2;
$algorithm = 'Binary';
=======
$usage = <<<EOF
Usage: php Test.php [ip2region db file] [alrogrithm]
+-Algorithm: binary or b-tree\n
@@ -43,7 +22,6 @@ if ( isset($argv[1])
&& strtolower($argv[1]) == 'binary' ) {
$method = 2;
$algorithm = 'Binary';
>>>>>>> 7e51a4909fdb01014f948c2dbc5cfb5fbed9ce56
}
require dirname(__FILE__) . '/Ip2Region.class.php';
@@ -61,21 +39,6 @@ echo $initStr, "\n";
while ( true )
{
<<<<<<< HEAD
echo "ip2region>> ";
$line = trim(fgets(STDIN));
if ( strlen($line) < 2 ) continue;
if ( $line == 'quit' ) break;
if ( ip2long($line) == NULL ) {
echo "Error: invalid ip address\n";
continue;
}
$s_time = getTime();
$data = $method==2 ? $ip2regionObj->binarySearch($line) : $ip2regionObj->btreeSearch($line);
$c_time = getTime() - $s_time;
printf("%s|%s in %.5f millseconds\n", $data['city_id'], $data['region'], $c_time);
=======
echo "ip2region>> ";
$line = trim(fgets(STDIN));
if ( strlen($line) < 2 ) continue;
@@ -89,15 +52,10 @@ while ( true )
$data = $method==2 ? $ip2regionObj->binarySearch($line) : $ip2regionObj->btreeSearch($line);
$c_time = getTime() - $s_time;
printf("%s|%s in %.5f millseconds\n", $data['city_id'], $data['region'], $c_time);
>>>>>>> 7e51a4909fdb01014f948c2dbc5cfb5fbed9ce56
}
function getTime()
{
<<<<<<< HEAD
return (microtime(true) * 1000);
=======
return (microtime(true) * 1000);
>>>>>>> 7e51a4909fdb01014f948c2dbc5cfb5fbed9ce56
}
?>