1515from ipSearch import IPLoader ,IPv6Loader
1616from dat2txt import get_ip_info ,get_ipv6_info
1717from database import mysql_Database ,sqlite3_Database
18- from configs import config ,default_dat_update ,default_sqlite3_update ,default_txt_update ,default_sql_update ,default_sql_export ,default_gz_export
18+ from configs import config ,default_dat_update ,default_v6dat_update , default_sqlite3_update ,default_txt_update ,default_sql_update ,default_sql_export ,default_gz_export
1919from dat2mysql import dat2mysql ,db2mysql
2020from dat2sqlite3 import dat2sqlite3 ,db2sqlite3
2121from collegeUpdate import collegeUpdate
@@ -65,6 +65,8 @@ def dat2Txt(dat_filename= None, txt_filename= None, startIndex= None, endIndex=
6565dat_filename = os .path .abspath (data_dir + os .path .sep + "czipdata.dat" )
6666if not file_set (dat_filename )or default_dat_update :
6767tag = down (dat_filename )
68+ else :
69+ tag = 0
6870q = IPLoader (dat_filename )
6971if txt_filename is None :
7072txt_filename = os .path .abspath (data_dir + os .path .sep + "czipdata.txt" )
@@ -108,8 +110,10 @@ def db2Txt(db_filename= None, txt_filename= None, startIndex= None, endIndex= No
108110
109111if db_filename is None :
110112db_filename = DEFAULT_FILE_LOCATION
111- if not file_set (db_filename )or default_dat_update :
113+ if not file_set (db_filename )or default_v6dat_update :
112114tag = v6down (db_filename ,ipv4update = ipv4update )
115+ else :
116+ tag = 0
113117D = IPv6Loader (db_filename )
114118if txt_filename is None :
115119txt_filename = os .path .abspath (data_dir + os .path .sep + "ipv6data.txt" )
@@ -327,4 +331,4 @@ def sqlite3dump(sqlite3file):
327331except :
328332pass
329333if ipv4update or ipv6update :
330- sqlite3dump (sqlite3file )
334+ sqlite3dump (sqlite3file )