[GNUnet-SVN] r13436 - gnunet/src/monkey/seaspider/org/gnunet/seaspider

[gnunet]

Author: grothoff
Date: 2010-10-27 16:41:20 +0200 (Wed, 27 Oct 2010)
New Revision: 13436

Modified:
   
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionDatabaseHandler.java
   gnunet/src/monkey/seaspider/org/gnunet/seaspider/Seaspider.java
Log:
proper transactions

Modified: 
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionDatabaseHandler.java
===================================================================
--- 
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionDatabaseHandler.java 
    2010-10-27 14:32:10 UTC (rev 13435)
+++ 
gnunet/src/monkey/seaspider/org/gnunet/seaspider/ExpressionDatabaseHandler.java 
    2010-10-27 14:41:20 UTC (rev 13436)
@@ -8,9 +8,14 @@
 import org.tmatesoft.sqljet.core.table.SqlJetDb;
 
 public class ExpressionDatabaseHandler {
+
+       private static final boolean DEBUG = false;
+               
+       private static SqlJetDb db;
+
+       private static ISqlJetTable table;
+
        
-       private static SqlJetDb db = null;
-       
        public static void createExpressionDatabase(String databasePath) {
                String createTableQuery = "CREATE TABLE Expression ( expr_ID 
INT NOT NULL PRIMARY KEY , " +
                "file_name TEXT NOT NULL , expr_syntax TEXT NOT NULL ," +
@@ -31,6 +36,8 @@
                        }
                        /* Create table Expression */
                        db.createTable(createTableQuery);
+                       db.beginTransaction(SqlJetTransactionMode.WRITE);
+                       table = db.getTable("Expression");
                }
                catch (SqlJetException e) {
                        e.printStackTrace();
@@ -41,6 +48,7 @@
        public static void closeDatabase()
        {
                try {
+                       db.commit();
                        db.close();
                } catch (SqlJetException e) {
                        e.printStackTrace();
@@ -55,24 +63,15 @@
                        return;
                if (expressionSyntax.startsWith("\""))
                        return;
-               if (false)
+               if (DEBUG)
                        System.out.println (fileName  + ":[" + startLineNo + 
"-" + endLineNo + "]: " + expressionSyntax);
-               if (true)
-                       return;
                if (db == null) {
                        System.out.println("Error:Database handle is not 
initialized. Program will exit now!");
                        System.exit(1);
                }
                
-               ISqlJetTable table;
                try {
-                       table = db.getTable("Expression");
-                       db.beginTransaction(SqlJetTransactionMode.WRITE);
-                       try {
-                               table.insert(fileName, expressionSyntax, 
startLineNo, endLineNo);
-                       } finally {
-                               db.commit();
-                       }
+                       table.insert(fileName, expressionSyntax, startLineNo, 
endLineNo);
                }
                catch (SqlJetException e) {
                        e.printStackTrace();

Modified: gnunet/src/monkey/seaspider/org/gnunet/seaspider/Seaspider.java
===================================================================
--- gnunet/src/monkey/seaspider/org/gnunet/seaspider/Seaspider.java     
2010-10-27 14:32:10 UTC (rev 13435)
+++ gnunet/src/monkey/seaspider/org/gnunet/seaspider/Seaspider.java     
2010-10-27 14:41:20 UTC (rev 13436)
@@ -38,11 +38,11 @@
          }
      };
      
-     /* File filter to get only source and header files */
+     /* File filter to get only source files and no test cases */
      FileFilter sourceFilter = new FileFilter() {
        public boolean accept(File file) {
                String fileName = file.getName();
-               return fileName.endsWith(".c");
+               return fileName.endsWith(".c") && ! 
fileName.startsWith("test_");
        }
      };