fix action as string and not data

totoro
2 parents 07e68e53 3cd8455e
Showing 3 changed files with 20 additions and 18 deletions Show diff stats
src/generation/fields.anubis
src/generation/html.anubis
src/generation/types.anubis
@@ -83,16 +83,16 @@ public define String
   if t is 
   {
     //anubis(_T)                          then "constant_byte_array(0,0)", 
-    p_key                             then "with "+name+" = get_DB_id(lwa, \""+name+"\"),",
+    p_key                             then "with "+name+" = get_DB_id(lwa, __prefix__+\""+name+"\"),",
     //binary                              then "constant_byte_array(0,0)",
-    boolean_field                     then "with "+name+" = get_Bool(lwa, \""+name+"\"),",
-    date_field(attrs)                 then if attrs = none then "get_DB_date(lwa, \""+name+"\")" else "with "+name+" = get_dummy_DB_date,",
-    time_field(attrs)                 then if attrs = none then "get_DB_time(lwa, \""+name+"\")" else "with "+name+" = get_dummy_DB_time,",
-    datetime_field(attrs)             then if attrs = none then "get_DB_datetime(lwa, \""+name+"\")" else "with "+name+" = get_dummy_DB_datetime,",      
-    foreign_key(_,_)                  then "get_Int(lwa, \""+name+"\")",
-    integer_field                     then "get_Int(lwa, \""+name+"\")",
-    char_field(_,_)                   then "get_String(lwa, \""+name+"\")",
-    text_field                        then "get_String(lwa, \""+name+"\")"
+    boolean_field                     then "with "+name+" = get_Bool(lwa, __prefix__+\""+name+"\"),",
+    date_field(attrs)                 then if attrs = none then "get_DB_date(lwa, __prefix__+\""+name+"\")" else "with "+name+" = get_dummy_DB_date,",
+    time_field(attrs)                 then if attrs = none then "get_DB_time(lwa, __prefix__+\""+name+"\")" else "with "+name+" = get_dummy_DB_time,",
+    datetime_field(attrs)             then if attrs = none then "get_DB_datetime(lwa, __prefix__+\""+name+"\")" else "with "+name+" = get_dummy_DB_datetime,",      
+    foreign_key(_,_)                  then "get_Int(lwa, __prefix__+\""+name+"\")",
+    integer_field                     then "get_Int(lwa, __prefix__+\""+name+"\")",
+    char_field(_,_)                   then "get_String(lwa, __prefix__+\""+name+"\")",
+    text_field                        then "get_String(lwa, __prefix__+\""+name+"\")"
   }.
 public define String
@@ -48,7 +48,7 @@ public define String
     String          general_type_name,
     String          action_name
   )=
-  "link_id_action(to_String("+data_name+".id), "+to_String(column, data_name, general_type_name)+", "+action_name+")".
+  "link_id_action(to_String("+data_name+".id), "+to_String(column, data_name, general_type_name)+", \""+action_name+"\")".
 public define String
@@ -123,18 +123,18 @@ public define Maybe(One)
   since _generate_extract_web_arg(columns, [], 0) is ((List(String))list_of_web_arg, (Int) nb_closure),
   //generate the type of the table that contain all components 
   if write_string(stream, 
-     "\n\ndefine Maybe("+type_name+")\n"+
-     "  extract_from_web_arg\n"+
+     "\n\npublic define Maybe("+type_name+")\n"+
+     "  extract_"+type_name+"_from_web_arg\n"+
      "  (\n"+
      "    List(Web_arg) lwa,\n"+
-     "    String prefix\n"+
+     "    String __prefix__\n"+
      "  )=\n"+   //head of the definition
      to_String(list_of_web_arg)+                       //all editable components of the type
      "    success(\n"+generate_constructor(name, columns, "      ")+")\n"+         //generate type construction with values got from web arg
      "  "+fill(nb_closure, '}')+          //add close } according to number of web arg 
      ".\n") is                                         //end of the function
   {
-    failure     then  println("can't write extract_from_web_arg "+type_name); failure,
+    failure     then  println("can't write extract_"+type_name+"_from_web_arg "+type_name); failure,
     success(_)  then  success(unique)
   }.
@@ -283,12 +283,14 @@ public define Maybe(One)
      "             \"update_"+name+" (INSERT)\")),\n"+
      //UPDATE SQL query
      "    db_id(idx) then\n"+
-     "      forget(sql_query_timeout(db,\n"+
+     "      if sql_query_timeout(db,\n"+
      "             \"UPDATE "+name+" SET\n"+
      update_values(columns, "             ")+"\n"+
      "             WHERE id = \"+idx+\";\",\n"+
      generate_Bind_list(columns, name, "             ", false)+",\n"+
-     "             \"update_"+name+" (UPDATE)\"))\n"+
+     "             \"update_"+name+" (UPDATE)\") is { \n"+
+     "                 error(sql_error)\n"+
+     "                   then logError(debug_log, db_error(sql_error, \"update_"+name+"\")), ok(_, _, _) then unique }\n"+
      "  }.\n\n"+
      "public define Maybe(One)\n"+
      "  update_"+name+"\n"+
@@ -296,9 +298,9 @@ public define Maybe(One)
      "    SQLite3DataBase db,\n"+
      "    List(Web_arg)   lwa\n"+
      "  )=\n"+
-     "  if extract_from_web_arg(lwa, \"\") is\n"+
+     "  if extract_"+type_name+"_from_web_arg(lwa, \"\") is\n"+
      "  {\n"+
-     "    failure         then failure,\n"+
+     "    failure         then logError(debug_log, \"update_"+name+" extract_"+type_name+"_from_web_arg is failure\"); failure,\n"+
      "    success("+name+")  then success(update_"+name+"(db, "+name+"))\n"+
      "  }.\n\n"