Added supports for address type and category fields. Added exception handling for incorrect BIN database.

Author: ip2location-com

CHANGELOG.TXT

@@ -1 +1,3 @@
-8.0.0 Support Index BIN
+8.0.0 Support Index BIN
+
+8.1.0 Added supports for address type and category fields. Added exception handling for incorrect BIN database.

IP2Loc_DBInterface.pas

@@ -1,10 +1,10 @@
  ////////////////////////////////////////////////
 // Unit      : IP2Loc_DBInterface.pas           //
-// Version   : 8.0.0                            //
-// Date      : July 2016                        //
-// Translator: Benbaha Abdelkrim AKA DeadC0der  //
+// Version   : 8.1.0                            //
+// Date      : June 2021                        //
+// Translator: IP2Location                      //
 // Email     : support@ip2location.com          //
-// License   : Included :)                      //
+// License   : MIT                              //
  ////////////////////////////////////////////////
 
 unit IP2Loc_DBInterface;
@@ -45,7 +45,7 @@ implementation
 var
  DB_access_type:TIP2Location_mem_type=IP2LOCATION_FILE_IO;
  cache_shm_ptr :pointer; 
- shm_fd   	   :integer;
+ shm_fd        :integer;
 
 function IP2Location_DB_Load_to_mem(filehandle:integer;memory:pointer;size:int64):integer;
 begin
@@ -68,9 +68,8 @@ function IP2Location_DB_set_memory_cache(filehandle:integer):integer;
      if assigned(cache_shm_ptr) and (IP2Location_DB_Load_to_mem(filehandle,cache_shm_ptr,_size)<>-1) then
       begin
        result:=0;
-	     DB_access_type:=IP2LOCATION_CACHE_MEMORY;
-	    end;
-
+         DB_access_type:=IP2LOCATION_CACHE_MEMORY;
+      end;
    end;
 end;
 
@@ -85,31 +84,31 @@ function IP2Location_DB_set_shared_memory(filehandle:integer):integer;
  _size:=GetFileSize(filehandle,nil);
   if (filehandle <>-1) and (_size<>-1) then
    begin
-  	shm_fd:=CreateFileMapping(
+      shm_fd:=CreateFileMapping(
                  INVALID_HANDLE_VALUE,
                  nil,
                  PAGE_READWRITE,
                  0,
                  _size+1,
                  PChar(IP2LOCATION_SHM));
-	  DB_loaded := (GetLastError = ERROR_ALREADY_EXISTS);
-	   if shm_fd <>0 then
-	    cache_shm_ptr := MapViewOfFile(
-			shm_fd,
-			FILE_MAP_WRITE,
-			0, 
-			0,
-			0)else exit;
-	   if not(DB_Loaded) and (IP2Location_DB_Load_to_mem(filehandle,cache_shm_ptr,_size)<>-1) then
-	    begin
-	     DB_access_type := IP2LOCATION_SHARED_MEMORY;
-	     result:=0;
-	    end
-	   else
-	   begin
-	    UnmapViewOfFile(cache_shm_ptr);
-	    CloseHandle(shm_fd);
-	 	 end;
+      DB_loaded := (GetLastError = ERROR_ALREADY_EXISTS);
+      if shm_fd <>0 then
+        cache_shm_ptr := MapViewOfFile(
+            shm_fd,
+            FILE_MAP_WRITE,
+            0, 
+            0,
+            0)else exit;
+       if not(DB_Loaded) and (IP2Location_DB_Load_to_mem(filehandle,cache_shm_ptr,_size)<>-1) then
+        begin
+         DB_access_type := IP2LOCATION_SHARED_MEMORY;
+         result:=0;
+        end
+       else
+       begin
+        UnmapViewOfFile(cache_shm_ptr);
+        CloseHandle(shm_fd);
+          end;
    end;
 end;
 
@@ -125,41 +124,39 @@ function IP2Location_DB_close(filehandle:integer):integer;
  DB_access_type := IP2LOCATION_FILE_IO;
  result:=0;
  end;
- 
+
  function IP2Location_read8(handle:integer;position:Cardinal):byte;
  begin
   result:=0;
-  	if (DB_access_type = IP2LOCATION_FILE_IO) and (handle <> 0) then
-	   begin
-	    FileSeek(handle,position-1,0);
+      if (DB_access_type = IP2LOCATION_FILE_IO) and (handle <> 0) then
+       begin
+        FileSeek(handle,position-1,0);
       FileRead(handle,result,1);
-	   end
-	  else
-	  result:=PByteArray(cache_shm_ptr)^[position-1];
- end; 
-	 
+       end
+      else
+      result:=PByteArray(cache_shm_ptr)^[position-1];
+ end;
+
 function IP2Location_read32(handle:integer;position:cardinal):cardinal;
 var byte1,byte2,byte3,byte4:Byte;
 begin
  if (DB_access_type = IP2LOCATION_FILE_IO) and (handle <> 0) then
-	 begin
-	  FileSeek(handle,position-1,0);
+     begin
+      FileSeek(handle,position-1,0);
     FileRead(handle,byte1,1);
-	  FileRead(handle,byte2,1);
-	  FileRead(handle,byte3,1);
-	  FileRead(handle,byte4,1);
-	 end
+      FileRead(handle,byte2,1);
+      FileRead(handle,byte3,1);
+      FileRead(handle,byte4,1);
+     end
  else
    begin
-	  byte1:=PByteArray(cache_shm_ptr)^[position-1];
-	  byte2:=PByteArray(cache_shm_ptr)^[position];
-	  byte3:=PByteArray(cache_shm_ptr)^[position+1];
-	  byte4:=PByteArray(cache_shm_ptr)^[position+2];
-	 end;
-	result:= (byte4 shl 24) or (byte3 shl 16) or (byte2 shl 8) or byte1;  
+      byte1:=PByteArray(cache_shm_ptr)^[position-1];
+      byte2:=PByteArray(cache_shm_ptr)^[position];
+      byte3:=PByteArray(cache_shm_ptr)^[position+1];
+      byte4:=PByteArray(cache_shm_ptr)^[position+2];
+     end;
+    result:= (byte4 shl 24) or (byte3 shl 16) or (byte2 shl 8) or byte1;  
   end;
-  
-
 
 function IP2Location_readStr(handle:integer;position:cardinal):PChar;
 var _size:byte;P_In:PAnsiChar;
@@ -183,7 +180,7 @@ function IP2Location_readStr(handle:integer;position:cardinal):PChar;
   Result:=AllocMem(StrLen(P_IN)*2+2);
   MultiByteToWideChar(CP_UTF8,0,P_IN,StrLen(P_IN),Result,StrLen(P_IN));
  {$ENDIF}
-end; 
+end;
 
 function IP2Location_readFloat(handle:integer;position:cardinal):single;
 begin
@@ -195,28 +192,24 @@ function IP2Location_readFloat(handle:integer;position:cardinal):single;
    end
   else
   CopyMemory(@result,@PByteArray(cache_shm_ptr)^[position-1],4);
-end; 
+end;
 
- 
 procedure IP2Location_DB_del_shm();
 begin
 {$IFDEF POSIX}
 {$ENDIF}
 end;
 
- function  IP2Location_readIPv6Address(handle:integer;position:Cardinal):Tin6_addr_local;
+function  IP2Location_readIPv6Address(handle:integer;position:Cardinal):Tin6_addr_local;
  var i:integer;
  begin
   with result do 
    for i:=0 to 15 do 
     addr8[i]:=IP2Location_read8(handle, position + (15-i)); 
  end;
 
-
-
 function IP2Location_DB_set_file_io():Cardinal;
 begin
-
 end;
 
 end.