ferengi/ferengi_gui
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

converted colons, merge updated

Browse Source
This commit is contained in:
Jakub Žáček
2022-08-22 13:51:11 +02:00
parent 0eb420add2
commit d8d6613249
1 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
main.py
View File

@@ -17,6 +17,11 @@ def merge():
df = pd.concat((pd.read_csv(f, header = 0) for f in interesting_files))
df.to_csv("./output/global_output.csv",index=False,index_label=None,columns=None)
"""
def convertChars(val):
converted = val.replace(',', '')
converted = converted.replace('.', ',')
return converted
def merge():
dirpath = "./output/"
@@ -106,8 +111,6 @@ def merge():
imsitoconvert = int(imsi)
#print(serialnumberdict[int(imsitoconvert)]['sn'])
if imsitoconvert in serialnumberdict:
print("found in snhelper, can convert to sn")
@@ -119,10 +122,6 @@ def merge():
realsn = "unknown"
else:
print("msisdn not found in helper, we dont have iccid and imsi")
iccid = "N/A"
@@ -137,7 +136,7 @@ def merge():
simstatus = row['SIM-STATUS']
operator = row['OPERATOR']
print("realsn: ",realsn)
writer.writerow([msisdn, iccid, imsi, dataprice, dataamount, smsprice, smscount, otherprice, simstatus, realsn, operator])
writer.writerow([msisdn, iccid, imsi, convertChars(dataprice), convertChars(dataamount), convertChars(smsprice), convertChars(smscount), convertChars(otherprice), simstatus, realsn, operator])
print("Merged")
with open(dirpath+vfczfile, newline='', encoding="utf-8") as csvfile:
@@ -156,7 +155,7 @@ def merge():
otherprice = row['OTHER-PRICE']
simstatus = row['SIM-STATUS']
operator = row['OPERATOR']
writer.writerow([msisdn, iccid, imsi, dataprice, dataamount, smsprice, smscount, otherprice, simstatus, operator])
writer.writerow([msisdn, iccid, imsi, convertChars(dataprice), convertChars(dataamount), convertChars(smsprice), convertChars(smscount), convertChars(otherprice), simstatus, "unknown",operator])
with open(dirpath+vfgdspfile, newline='', encoding="utf-8") as csvfile:
@@ -168,6 +167,22 @@ def merge():
for row in reader:
print(row)
msisdn = int(row['MSISDN'])
iccid = int(row['ICCID'])
imsi = int(row['IMSI'])
# grab sn from helper
if imsi in serialnumberdict:
print("found in snhelper, can convert to sn")
realsn = serialnumberdict[int(imsi)]['sn']
print(realsn)
else:
print("msisdn not found in helper, we dont have sn")
realsn = "unknown"
dataprice = row['DATA-PRICE']
dataamount = row['DATA-AMOUNT']
smsprice = row['SMS-PRICE']
@@ -175,7 +190,7 @@ def merge():
otherprice = row['OTHER-PRICE']
simstatus = row['SIM-STATUS']
operator = row['OPERATOR']
writer.writerow([msisdn, iccid, imsi, dataprice, dataamount, smsprice, smscount, otherprice, simstatus, operator])
writer.writerow([msisdn, iccid, imsi, convertChars(dataprice), convertChars(dataamount), convertChars(smsprice), convertChars(smscount), convertChars(otherprice), simstatus, realsn, operator])
with open(dirpath+tmgdspfile, newline='', encoding="utf-8") as csvfile:
reader = csv.DictReader(csvfile, delimiter=',')
@@ -186,6 +201,21 @@ def merge():
for row in reader:
print(row)
msisdn = int(row['MSISDN'])
iccid = int(row['ICCID'])
imsi = int(row['IMSI'])
# grab sn from helper
if imsi in serialnumberdict:
print("found in snhelper, can convert to sn")
realsn = serialnumberdict[int(imsi)]['sn']
print(realsn)
else:
print("msisdn not found in helper, we dont have sn")
realsn = "unknown"
dataprice = row['DATA-PRICE']
dataamount = row['DATA-AMOUNT']
smsprice = row['SMS-PRICE']
@@ -193,7 +223,7 @@ def merge():
otherprice = row['OTHER-PRICE']
simstatus = row['SIM-STATUS']
operator = row['OPERATOR']
writer.writerow([msisdn, iccid, imsi, dataprice, dataamount, smsprice, smscount, otherprice, simstatus, operator])
writer.writerow([msisdn, iccid, imsi, convertChars(dataprice), convertChars(dataamount), convertChars(smsprice), convertChars(smscount), convertChars(otherprice), simstatus,realsn ,operator])
print("succesfuly merged")