[GNUnet-SVN] r25981 - monkey/trunk/seaspider

[gnunet]

Author: teichm
Date: 2013-02-01 16:30:16 +0100 (Fri, 01 Feb 2013)
New Revision: 25981

Modified:
   monkey/trunk/seaspider/seasp2_convert
Log:
ignore patterns in seasp2_convert part3, should be done, first tests work

Modified: monkey/trunk/seaspider/seasp2_convert
===================================================================
--- monkey/trunk/seaspider/seasp2_convert       2013-02-01 15:10:38 UTC (rev 
25980)
+++ monkey/trunk/seaspider/seasp2_convert       2013-02-01 15:30:16 UTC (rev 
25981)
@@ -139,7 +139,7 @@
         return
     cfilename = os.path.split(os.path.splitext(filename)[0])[1] + '.c'
 
-    local_ignores = [ign for ign in ignores if ign[0] in cfilename]
+    local_ignores = [ign for ign in ignores if ign[0].search(cfilename)]
     print local_ignores
 
     lines = infile.readlines(10000)
@@ -164,13 +164,13 @@
 
             if rowtype == 'SystemGlobal':
                 globalvar = m.group(4)
-                add_expr(sql_cur, local_ignores, func_name[1],
+                add_expr(sql_cur, ignores, func_name[1],
                          cfilename, globalvar, 0, 32767, 0)
             elif rowtype == 'Global':
                 lineno = int(m.group(3))
                 globalvar = m.group(4)
-                vals = (rowfile, globalvar, lineno, 32767, 0)
-                sql_cur.execute('INSERT OR IGNORE INTO Expression VALUES 
(NULL,?,?,?,?,?)', vals)
+                add_expr(sql_cur, ignores, func_name[1],
+                         rowfile, globalvar, lineno, 32767, 0)
             elif rowtype == 'Function':
                 funame = m.group(4)
                 print 'entering Function ', funame
@@ -190,8 +190,8 @@
                         (rowfile, para, lineno) = parameters.popleft()
                     except IndexError:
                         break
-                    vals = (rowfile, para, lineno, scope_end[-1], 0)
-                    sql_cur.execute('INSERT OR IGNORE INTO Expression VALUES 
(NULL,?,?,?,?,?)', vals)
+                    add_expr(sql_cur, local_ignores, func_name[1],
+                             rowfile, para, lineno, scope_end[-1], 0)
             elif rowtype == 'Begin-Expression':
                 lineno = int(m.group(3))
                 iscall = int(m.group(4)[0])