Changeset 194

Timestamp:

10/20/09 16:44:00 (5 weeks ago)

Author:

lb

Message:

Ordering and schema changing

Files:

• trunk/tools/log2sqlite/log2sqlite_optim.ml (modified) (10 diffs)

trunk/tools/log2sqlite/log2sqlite_optim.ml

@@ -5 +5 @@
 open Sqlite3
 open Sqlite3.Rc
-
+open Str
+open List
+
+exception BadLocation of string
 let filename = ref None
 
@@ -13 +16 @@
 
 let refs_num = ref 0
+
+let conf_opt_order = ref 0
 
 let anonymous s = 
@@ -70 +75 @@
      value, refId)
 values("^quote_ref_loc^","^quote_kind^","^quote_keyLoc^","^quote_bool_val^","^string_of_int(!refs_num)^");" in
+     
       exec db insert_q;
       ()      
@@ -79 +85 @@
     List.iter (insert_keys db loc_str) keys;
     ()
+
+
+let refLoc_token refLocation= 
+        match refLocation with 
+        Location(file_path, line, col) ->
+            let split_path = Str.split (regexp "/") file_path in 
+            let file_name = nth split_path (length split_path - 1)  in
+            let tmp_str =  "\""^file_name^"\", "^string_of_int(line)^",
+            "^string_of_int(col) in
+            (match string_match (regexp ".*c$") file_name 0 with
+                true -> "\"Regular\", "^tmp_str
+              | false -> "\"Header\", "^tmp_str)
 
 let insert_new_ref db kind location name defLoc use_cond movb mova convb
@@ -87 +105 @@
     let conva_field = conv_conva conva in 
     let insert_update = 
-        "INSERT INTO ref(id, kind, name, refLoc, defLoc, useCond, movableBefore,
+        "INSERT INTO ref(id, kind, name, refLoc, fileKind, fileName, lineNum,
+        colNum, defLoc, useCond, movableBefore,
         convertibleBefore, convertibleAfter) values(
             "^string_of_int(!refs_num)^",\" "^ kind_field
-        ^"\",\""^name^"\",\""^conv_location location^"\",\""^conv_defLoc
+            ^"\",\""^name^"\",\""^conv_location location^"\", "^refLoc_token
+            location^" , \""^conv_defLoc
         defLoc^"\",\""^ conv_use_cond
         use_cond^"\",\""^movb_field^"\",\""^convb_field^"\",\""^conva_field^"\");"
     in 
-        refs_num := !refs_num + 1;
-        insert_ref:=!insert_ref^insert_update
-    
+        insert_ref:=!insert_ref^insert_update;
+        refs_num := !refs_num + 1 
     (**conv_mova db mova location**)
 
@@ -102 +121 @@
     let loc = "\""^conv_location location^"\"" in 
     let confOpt = "\""^configOption^"\"" in  
-    let insert_q = "INSERT INTO "^table^"(refLocation, configOption, refId) values
-    ("^loc^","^confOpt^", "^string_of_int(!refs_num)^");" in
+    let insert_q = "INSERT INTO "^table^"(refLocation, configOption,
+    confOpt_order, refId) values
+    ("^loc^","^confOpt^", "^string_of_int(!conf_opt_order)^", "^string_of_int(!refs_num)^");" in
+    conf_opt_order := !conf_opt_order + 1;
     exec db insert_q;
     ()
 
+
+let re_init_conf_opt_order = 
+    conf_opt_order := 0
 
 let insert_defconfOpts db location def_copt = 
     match def_copt with 
-    Some(ConfOpt(c)) -> List.iter (insert_confOpts db location "defConfOpts")
+    Some(ConfOpt(c)) -> re_init_conf_opt_order; List.iter (insert_confOpts db location "defConfOpts")
     c;
     ()
@@ -117 +141 @@
 let insert_uconfOpts db location use_copt =
     match use_copt with 
-    Some(ConfOpt(c)) -> List.iter (insert_confOpts db location "usageConfOpts")
+    Some(ConfOpt(c)) -> re_init_conf_opt_order; List.iter (insert_confOpts db location "usageConfOpts")
     c;
     ()
@@ -150 +174 @@
     match x with
     | Log(file_list) ->
-       Printf.printf "NEW LOG ";
        List.iter (conv_file db) file_list 
       
@@ -176 +199 @@
         let references = 
         exec db "CREATE TABLE IF NOT EXISTS ref (id INTEGER PRIMARY KEY,
-        kind TEXT, name TEXT, refLoc TEXT, defLoc TEXT, useCond TEXT,
+        kind TEXT, name TEXT, refLoc TEXT, fileKind TEXT, fileName TEXT,
+        lineNum INTEGER, colNum INTEGER, defLoc TEXT, useCond TEXT,
         movableBefore BOOLEAN, convertibleBefore BOOLEAN,
         convertibleAfter BOOLEAN); " in
@@ -183 +207 @@
         value BOOL, refId INTEGER); " in 
         let usageConfOpts = exec db "CREATE TABLE IF NOT EXISTS usageConfOpts (
-            id INTEGER PRIMARY KEY 
-        ASC, refLocation TEXT, configOption TEXT, refId INTEGER); " in
+            id INTEGER PRIMARY KEY ASC, refLocation TEXT, configOption TEXT,
+            confOpt_order INTEGER, refId INTEGER); " in
         let defConfOpts = exec db "CREATE TABLE IF NOT EXISTS defConfOpts ( id
         INTEGER PRIMARY KEY 
-        ASC, refLocation TEXT, configOption TEXT, refId INTEGER); " in 
+        ASC, refLocation TEXT, configOption TEXT, confOpt_order INTEGER, refId INTEGER); " in 
         Printf.printf "Checking creations\n"; 
         creation_check references afterKeys usageConfOpts defConfOpts;