2020-1-capstone-design2 / 2016104137

Go to a project
Toggle navigation Toggle navigation pinning
김예미
1cb110dc 1 parent 6284e35e

add database part

Inline Side-by-side
Showing 2 changed files with 18 additions and 5 deletions
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
21 </div> 21 </div>
22 <div class="content"> 22 <div class="content">
23 <h1 id="cc">Contents</h1> 23 <h1 id="cc">Contents</h1>
24 + </div>
24 <div data-role="main" class="ui-content" id="btn_group"> 25 <div data-role="main" class="ui-content" id="btn_group">
25 <button id="connect_btn" onclick="location.href='menu.html'">Next</button> 26 <button id="connect_btn" onclick="location.href='menu.html'">Next</button>
26 </div> 27 </div>
......
...@@ -42,7 +42,9 @@ function apkInstall(){ ...@@ -42,7 +42,9 @@ function apkInstall(){
42 cc.innerHTML="install apk"; 42 cc.innerHTML="install apk";
43 cmd_exec = exec('adb -s '+device+' shell am start -n com.example.dataextraction/com.example.dataextraction.MainActivity',function(error, stdout, stderr){ 43 cmd_exec = exec('adb -s '+device+' shell am start -n com.example.dataextraction/com.example.dataextraction.MainActivity',function(error, stdout, stderr){
44 cc.innerHTML="start app"; 44 cc.innerHTML="start app";
45 + setTimeout(function(){
45 cc.innerHTML="extract data"; 46 cc.innerHTML="extract data";
47 + },10000);
46 }) 48 })
47 }); 49 });
48 cmd_install(); 50 cmd_install();
...@@ -54,6 +56,7 @@ ipcRenderer.on("device", (e, arg) => { ...@@ -54,6 +56,7 @@ ipcRenderer.on("device", (e, arg) => {
54 connect_btn.innerHTML = "Connected : ".concat(device); 56 connect_btn.innerHTML = "Connected : ".concat(device);
55 //device.innerHTML = arg.toString(); 57 //device.innerHTML = arg.toString();
56 58
59 + cc.innerHTML="DATA EXTRACTION START !";
57 apkInstall(); 60 apkInstall();
58 }); 61 });
59 62
...@@ -74,11 +77,20 @@ function extractDB () { ...@@ -74,11 +77,20 @@ function extractDB () {
74 cc.innerHTML="make InnerDB SQL"; 77 cc.innerHTML="make InnerDB SQL";
75 cmd_sqlNdb = exec('sqlite3 networkDatabase.db .dump | python SQLiteToMysql_network.py > networkDatabase.sql', function(error, stdout, stderr){ 78 cmd_sqlNdb = exec('sqlite3 networkDatabase.db .dump | python SQLiteToMysql_network.py > networkDatabase.sql', function(error, stdout, stderr){
76 cc.innerHTML="make NetworkDB SQL"; 79 cc.innerHTML="make NetworkDB SQL";
77 - 80 + cmd_makeIdb = exec('mysql -uroot -p1234 -e "DROP DATABASE IF EXISTS DATAEXTRACTION;CREATE DATABASE DATAEXTRACTION CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;USE DATAEXTRACTION;"',function(error, stdout, stderr){
78 - connection.query('DROP DATABASE IF EXISTS DATAEXTRACTION; CREATE DATABASE DATAEXTRACTION CHARACTER SET utf8mb4 COLLATE utf8mb4_bin',function(error, result,fields){ 81 + cc.innerHTML="create InnerDB";
79 - connection.query('DROP DATABASE IF EXISTS DATAEXTRACTION_NETWORK; CREATE DATABASE DATAEXTRACTION_NETWORK',function(error, result, fields){ 82 + cmd_insertIdb = exec('mysql -uroot -p1234 DATAEXTRACTION < InnerDatabase.sql',function(error, stdout, stderr){
83 + cc.innerHTML="insert Data ; InnerDB";
84 + cmd_makeNdb = exec('mysql -uroot -p1234 -e "DROP DATABASE IF EXISTS DATAEXTRACTION_network;CREATE DATABASE DATAEXTRACTION_network;USE DATAEXTRACTION_network;"',function(error, stdout, stderr){
85 + cc.innerHTML="create NetworkDB";
86 + cmd_insertNdb = exec('mysql -uroot -p1234 DATAEXTRACTION_network < networkDatabase.sql',function(error, stdout, stderr){
87 + cc.innerHTML="insert Data ; NetworkDB";
88 + cc.innerHTML="Data Extraction Complete !";
89 + cc.innerHTML="Click 'NEXT' Button";
90 + })
91 + })
92 + })
80 }) 93 })
81 - });
82 }) 94 })
83 }) 95 })
84 }) 96 })
...@@ -92,7 +104,7 @@ function extractDB () { ...@@ -92,7 +104,7 @@ function extractDB () {
92 104
93 //db insert done 105 //db insert done
94 io.on('connection', function(socket){ 106 io.on('connection', function(socket){
95 - cc.innerHTML="connect"; 107 + cc.innerHTML="database created !";
96 var instanceId = socket.id; 108 var instanceId = socket.id;
97 109
98 socket.on('alert', function(data){ 110 socket.on('alert', function(data){
......