=

panpap · Nov 18, 2016 · bf62e51 · bf62e51
1 parent 64912ee
commit bf62e51
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/config b/config
@@ -3,7 +3,7 @@
         "isThereHeader?": false,
         "removeDuplicates?": true,
         "printToSTDOUT?": true,
-        "detectBeacons?": true,
+        "detectBeacons?": false,
         "resultToFiles": {
                 "devices.csv": false,
                 "sizes3rd.csv": false,
@@ -15,7 +15,7 @@
         "database?": true,
         "tablesDB": {
                 "publishers": false,
-                "beacons": true,
+                "beacons": false,
                 "impressions": false,
                 "advertisements": false,
                 "userResults": true,

diff --git a/define.rb b/define.rb
@@ -92,7 +92,7 @@ def initialize(filename)
 			"bcnTable"=>{"beacons"=>'timestamp BIGINT, ip_port VARCHAR, url VARCHAR, beaconType VARCHAR, mob INTEGER,device VARCHAR,browser VARCHAR, id VARCHAR PRIMARY KEY'},
 			"advertiserTable"=>{"advertisers"=>'host VARCHAR PRIMARY KEY, numOfReqs BIGINT, numOfUsers BIGINT, avgReqPerUser INTEGER, avgDurOfReqs VARCHAR, totalDurOfReqs VARCHAR, avgSizeOfReqs VARCHAR,totalBytesDelivered BIGINT, type VARCHAR'},
 			"adsTable"=>{"advertisements"=>'timestamp BIGINT, receiverType VARCHAR,ip_Port VARCHAR, url VARCHAR, dataSize INTEGER, duration INTEGER,mob INTEGER,device VARCHAR,browser VARCHAR, id VARCHAR PRIMARY KEY'},
-			"userTable"=>{"userResults"=>'id VARCHAR PRIMARY KEY, totalRows BIGINT, advertising INTEGER, analytics INTEGER, social INTEGER, third_party_content INTEGER, other INTEGER, avgDurationPerCategory VARCHAR, totalSizePerCategory VARCHAR, totalBytes BIGINT, avgBytesPerReq  VARCHAR, sumDuration BIGINT, avgDurationOfReq VARCHAR,  hashedPrices INTEGER, numericPrices INTEGER, impressions INTEGER, publishersVisited INTEGER, beacons INTEGER, numOfCookieSyncs INTEGER, numOfLocations INTEGER, uniqLocations VARCHAR'},
+			"userTable"=>{"userResults"=>'id VARCHAR PRIMARY KEY, totalRows BIGINT, advertising INTEGER, analytics INTEGER, social INTEGER, third_party_content INTEGER, other INTEGER, avgDurationPerCategory VARCHAR, totalSizePerCategory VARCHAR, totalBytes BIGINT, avgBytesPerReq  VARCHAR, sumDuration BIGINT, avgDurationOfReq VARCHAR,  hashedPrices INTEGER, numericPrices INTEGER, impressions INTEGER, publishersVisited INTEGER, beacons INTEGER, numOfCookieSyncs INTEGER, numOfLocations INTEGER, uniqLocations VARCHAR, sumDurationPerCat  VARCHAR'},
 			"userFilesTable"=>{"userFiletypes"=>'id VARCHAR PRIMARY KEY, Reqs_Advertising_data INTEGER, Reqs_Advertising_gif INTEGER, Reqs_Advertising_html INTEGER, Reqs_Advertising_image INTEGER, Reqs_Advertising_other INTEGER, Reqs_Advertising_script INTEGER, Reqs_Advertising_styling INTEGER, Reqs_Advertising_text INTEGER, Reqs_Advertising_video INTEGER, Reqs_Analytics_data INTEGER, Reqs_Analytics_gif INTEGER, Reqs_Analytics_html INTEGER, Reqs_Analytics_image INTEGER, Reqs_Analytics_other INTEGER, Reqs_Analytics_script INTEGER, Reqs_Analytics_styling INTEGER, Reqs_Analytics_text INTEGER, Reqs_Analytics_video INTEGER, Reqs_Social_data INTEGER, Reqs_Social_gif INTEGER, Reqs_Social_html INTEGER, Reqs_Social_image INTEGER, Reqs_Social_other INTEGER, Reqs_Social_script INTEGER, Reqs_Social_styling INTEGER, Reqs_Social_text INTEGER, Reqs_Social_video INTEGER, Reqs3rd_party_Content_data INTEGER, Reqs3rd_party_Content_gif INTEGER, Reqs3rd_party_Content_html INTEGER, Reqs3rd_party_Content_image INTEGER, Reqs3rd_party_Content_other INTEGER, Reqs3rd_party_Content_script INTEGER, Reqs3rd_party_Content_styling INTEGER, Reqs3rd_party_Content_text INTEGER, Reqs3rd_party_Content_video INTEGER, ' + 
 #'Reqs_Beacons_data INTEGER, Reqs_Beacons_gif INTEGER, Reqs_Beacons_html INTEGER, Reqs_Beacons_image INTEGER, Reqs_Beacons_other INTEGER, Reqs_Beacons_script INTEGER, Reqs_Beacons_styling INTEGER, Reqs_Beacons_text INTEGER, Reqs_Beacons_video INTEGER,' +
 'Reqs_Other_data INTEGER, Reqs_Other_gif INTEGER, Reqs_Other_html INTEGER, Reqs_Other_image INTEGER, Reqs_Other_other INTEGER, Reqs_Other_script INTEGER, Reqs_Other_styling INTEGER, Reqs_Other_text INTEGER, Reqs_Other_video INTEGER, TotalBytes_Advertising_data INTEGER, TotalBytes_Advertising_gif INTEGER, TotalBytes_Advertising_html INTEGER, TotalBytes_Advertising_image INTEGER, TotalBytes_Advertising_other INTEGER, TotalBytes_Advertising_script INTEGER, TotalBytes_Advertising_styling INTEGER, TotalBytes_Advertising_text INTEGER, TotalBytes_Advertising_video INTEGER, TotalBytes_Analytics_data INTEGER, TotalBytes_Analytics_gif INTEGER, TotalBytes_Analytics_html INTEGER, TotalBytes_Analytics_image INTEGER, TotalBytes_Analytics_other INTEGER, TotalBytes_Analytics_script INTEGER, TotalBytes_Analytics_styling INTEGER, TotalBytes_Analytics_text INTEGER, TotalBytes_Analytics_video INTEGER, TotalBytes_Social_data INTEGER, TotalBytes_Social_gif INTEGER, TotalBytes_Social_html INTEGER, TotalBytes_Social_image INTEGER, TotalBytes_Social_other INTEGER, TotalBytes_Social_script INTEGER, TotalBytes_Social_styling INTEGER, TotalBytes_Social_text INTEGER, TotalBytes_Social_video INTEGER, TotalBytes3rd_party_Content_data INTEGER, TotalBytes3rd_party_Content_gif INTEGER, TotalBytes3rd_party_Content_html INTEGER, TotalBytes3rd_party_Content_image INTEGER, TotalBytes3rd_party_Content_other INTEGER, TotalBytes3rd_party_Content_script INTEGER, TotalBytes3rd_party_Content_styling INTEGER, TotalBytes3rd_party_Content_text INTEGER, TotalBytes3rd_party_Content_video INTEGER, ' +