Changeset 191

Timestamp:

10/15/09 10:25:33 (6 weeks ago)

Author:

lb

Message:

refId in the various tables

Files:

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

trunk/tools/log2sqlite/log2sqlite_optim.ml

@@ -9 +9 @@
 
 let dbName = ref "log.db"
+
 let insert_ref = ref ""
+
+let refs_num = ref 0
 
 let anonymous s = 
@@ -65 +68 @@
      let quote_ref_loc = "\""^loc^"\"" in 
      let insert_q = "INSERT INTO afterKeys(refLocation, kind, keyLocation,
-     value)
-values("^quote_ref_loc^","^quote_kind^","^quote_keyLoc^","^quote_bool_val^");" in
+     value, refId)
+values("^quote_ref_loc^","^quote_kind^","^quote_keyLoc^","^quote_bool_val^","^string_of_int(!refs_num)^");" in
       exec db insert_q;
       ()      
 
-let conv_mova db mova location = 
-    let loc_str = conv_location location in 
+let conv_mova db location mova = 
+    let loc_str = conv_location location in
     match mova with
     MovAfter(keys) ->
@@ -84 +87 @@
     let conva_field = conv_conva conva in 
     let insert_update = 
-        "INSERT INTO ref(kind, name, refLoc, defLoc, useCond, movableBefore,
-        convertibleBefore, convertibleAfter) values( \""^ kind_field
+        "INSERT INTO ref(id, kind, name, refLoc, defLoc, useCond, movableBefore,
+        convertibleBefore, convertibleAfter) values(
+            "^string_of_int(!refs_num)^",\" "^ kind_field
         ^"\",\""^name^"\",\""^conv_location location^"\",\""^conv_defLoc
-        defLoc^"\",\""^ conv_use_cond use_cond^"\",\""^movb_field^"\",\""^convb_field^"\",\""^conva_field^"\");"
+        defLoc^"\",\""^ conv_use_cond
+        use_cond^"\",\""^movb_field^"\",\""^convb_field^"\",\""^conva_field^"\");"
     in 
+        refs_num := !refs_num + 1;
         insert_ref:=!insert_ref^insert_update
     
@@ -96 +102 @@
     let loc = "\""^conv_location location^"\"" in 
     let confOpt = "\""^configOption^"\"" in  
-    let insert_q = "INSERT INTO "^table^"(refLocation, configOption) values
-    ("^loc^","^confOpt^");" in
+    let insert_q = "INSERT INTO "^table^"(refLocation, configOption, refId) values
+    ("^loc^","^confOpt^", "^string_of_int(!refs_num)^");" in
     exec db insert_q;
     ()
@@ -112 +118 @@
     match use_copt with 
     Some(ConfOpt(c)) -> List.iter (insert_confOpts db location "usageConfOpts")
-    c
+    c;
+    ()
     | None -> () 
    
@@ -125 +132 @@
             conva);
           insert_uconfOpts db location use_copt;
-          insert_defconfOpts db location def_copt
+          insert_defconfOpts db location def_copt;
+          conv_mova db location mova
+
   | _ -> () (** For the Struct introductions **)
 
@@ -166 +175 @@
         let db  = db_open !dbName in
         let references = 
-        exec db "CREATE TABLE IF NOT EXISTS ref (id INTEGER PRIMARY KEY ASC,
+        exec db "CREATE TABLE IF NOT EXISTS ref (id INTEGER PRIMARY KEY,
         kind TEXT, name TEXT, refLoc TEXT, defLoc TEXT, useCond TEXT,
         movableBefore BOOLEAN, convertibleBefore BOOLEAN,
         convertibleAfter BOOLEAN); " in
         let afterKeys = exec db "CREATE TABLE IF NOT EXISTS afterKeys (id
-        INTEGER PRIMARY KEY ASC, refLocation TEXT, kind TEXT, keyLocation TEXT, value BOOL); " in 
+        INTEGER PRIMARY KEY ASC, refLocation TEXT, kind TEXT, keyLocation TEXT,
+        value BOOL, refId INTEGER); " in 
         let usageConfOpts = exec db "CREATE TABLE IF NOT EXISTS usageConfOpts (
             id INTEGER PRIMARY KEY 
-        ASC, refLocation TEXT, configOption TEXT); " in
+        ASC, refLocation TEXT, configOption TEXT, refId INTEGER); " in
         let defConfOpts = exec db "CREATE TABLE IF NOT EXISTS defConfOpts ( id
         INTEGER PRIMARY KEY 
-        ASC, refLocation TEXT, configOption TEXT); " in 
+        ASC, refLocation TEXT, configOption TEXT, refId INTEGER); " in 
         Printf.printf "Checking creations\n"; 
         creation_check references afterKeys usageConfOpts defConfOpts;