Merge branch 'nodejsclient' of https://git.oschina.net/lionsoul/ip2region into nodejsclient
This commit is contained in:
commit
ae1a7742c2
|
|
@ -22,9 +22,9 @@ var totalHeaderLength = 4096;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* binary search
|
* binary search synchronized
|
||||||
* */
|
* */
|
||||||
ip2region.binarySearch = function(ip)
|
ip2region.binarySearchSync = function(ip)
|
||||||
{
|
{
|
||||||
var low = 0;
|
var low = 0;
|
||||||
var mid = 0;
|
var mid = 0;
|
||||||
|
|
@ -82,9 +82,9 @@ var headerLen = 0;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* btree search
|
* btree search synchronized
|
||||||
* */
|
* */
|
||||||
ip2region.btreeSearch = function(ip)
|
ip2region.btreeSearchSync = function(ip)
|
||||||
{
|
{
|
||||||
var indexBlockBuffer = new Buffer(indexBlockLength);
|
var indexBlockBuffer = new Buffer(indexBlockLength);
|
||||||
var headerIndexBuffer = new Buffer(totalHeaderLength);
|
var headerIndexBuffer = new Buffer(totalHeaderLength);
|
||||||
|
|
@ -242,10 +242,8 @@ function getLong(buffer, offset)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// api for create
|
exports.create = function(db_path)
|
||||||
exports.create = function(db_path) {
|
{
|
||||||
|
|
||||||
// db file check
|
|
||||||
if (typeof(db_path) == "undefined" || fs.exists(db_path) ) {
|
if (typeof(db_path) == "undefined" || fs.exists(db_path) ) {
|
||||||
throw("[ip2region] db file not exists : " + db_path);
|
throw("[ip2region] db file not exists : " + db_path);
|
||||||
}
|
}
|
||||||
|
|
@ -272,8 +270,8 @@ exports.create = function(db_path) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// api for destroy
|
exports.destroy = function(ip2rObj)
|
||||||
exports.destroy = function(ip2rObj){
|
{
|
||||||
ip2rObj.db_file_path = null;
|
ip2rObj.db_file_path = null;
|
||||||
fs.closeSync(ip2rObj.db_fd);
|
fs.closeSync(ip2rObj.db_fd);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,8 @@ var Ip2region = require('./ip2region');
|
||||||
var ipObj = Ip2region.create('../../data/ip2region.db');
|
var ipObj = Ip2region.create('../../data/ip2region.db');
|
||||||
|
|
||||||
// 2. use
|
// 2. use
|
||||||
//console.log(ipObj.binarySearch("120.24.78.68"));
|
//console.log(ipObj.binarySearchSync("120.24.78.68"));
|
||||||
console.log(ipObj.btreeSearch("120.24.78.68"));
|
console.log(ipObj.btreeSearchSync("120.24.78.68"));
|
||||||
|
|
||||||
// 3. destroy
|
// 3. destroy
|
||||||
Ip2region.destroy(ipObj);
|
Ip2region.destroy(ipObj);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue