diff --git a/data_reader.py b/data_reader.py index 5d4a75f..dfb8fea 100755 --- a/data_reader.py +++ b/data_reader.py @@ -80,16 +80,16 @@ def parce_string(line): dial_number = dial_number[3:] else: call_direct = "Исходящий" - insert(call_date=call_date, - call_time=call_time, - int_number=int_number, - ext_co_line=ext_co_line, - dial_number=dial_number, - ring=ring, - call_duration=call_duration, - acc_code=acc_code, - call_code=call_code, - call_direct=call_direct) + insert(call_date=call_date, + call_time=call_time, + int_number=int_number, + ext_co_line=ext_co_line, + dial_number=dial_number, + ring=ring, + call_duration=call_duration, + acc_code=acc_code, + call_code=call_code, + call_direct=call_direct) def port_data_read(port_name): global out_dir diff --git a/logger.tcl b/logger.tcl index 4ee8e91..517a67c 100755 --- a/logger.tcl +++ b/logger.tcl @@ -9,7 +9,6 @@ package require mysqltcl # параметры соединения с СУБД -#source config.tcl #set db(host) "host" #set db(user) "user" #set db(pass) "password" @@ -72,12 +71,18 @@ proc ParceString {line} { InsertData } +proc Read {} { + global fh + if {[gets $fh line] >= 0} { + ParceString $line + } +} + proc PortDataRead {portName} { - global out_dir + global out_dir fh set fh [open $portName RDONLY] - fconfigure $fh -blocking 0 -buffering none -mode 9600,n,8,1 -translation crlf -eofchar {} - fileevent $fh readable [list read $fh] - puts "Waiting for Capture data" + fconfigure $fh -blocking 0 -buffering line -mode 9600,n,8,1 -translation crlf -eofchar {} + fileevent $fh readable Read vwait forever }