Changeset 1066 for trunk/src/java/org/jcoderz/phoenix/dbview/DbView.java

Timestamp:

07/08/08 19:12:15 (4 years ago)

Author:

amandel

Message:

Several fixes for Exceptions in current setup.

Files:

• trunk/src/java/org/jcoderz/phoenix/dbview/DbView.java (modified) (13 diffs)

trunk/src/java/org/jcoderz/phoenix/dbview/DbView.java

@@ -69 +69 @@
 import org.jcoderz.commons.util.DbUtil;
 import org.jcoderz.commons.util.IoUtil;
+import org.jcoderz.commons.util.LoggingUtils;
 import org.jcoderz.commons.util.XmlUtil;
 
@@ -79 +80 @@
 public class DbView
 {
-   /** Default database jndi name. */ 
+   /** Default database jndi name. */
    public static final String DATASOURCE = "java:comp/env/jdbc/svs/db";
 
@@ -85 +86 @@
    public static final String LINE_SEPARATOR = Constants.LINE_SEPARATOR;
 
-   private static final int MILLIS_PER_SECOND 
+   private static final int MILLIS_PER_SECOND
            = org.jcoderz.commons.types.Date.MILLIS_PER_SECOND;
    private static final String SELECT_ALL_TABLES = "select * from tab";
@@ -93 +94 @@
    private final Map mTypeMapper = new HashMap();
    private final DateFormat mDateFormater
-         = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss.SSS", 
+         = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss.SSS",
                  Constants.SYSTEM_LOCALE);
 
@@ -182 +183 @@
             final String tableName = rs.getString(1);
             performConvertion(
-                  new File(dir, tableName + ".xml").getCanonicalPath(),
-                  dbConnection, "select * from " + tableName);
+                  new File(dir,
+                      escapeTableName(tableName) + ".xml").getCanonicalPath(),
+                      dbConnection, "select * from \"" + tableName + '"');
          }
       }
@@ -239 +241 @@
             else if ("-loglevel".equals(args[i]))
             {
-               mLogLevel = Level.parse(args[i + 1]);
+               mLogLevel = Level.parse(args[++i]);
                Logger.getLogger("").setLevel(mLogLevel);
+               LoggingUtils.setGlobalHandlerLogLevel(mLogLevel);
             }
             else
@@ -331 +334 @@
          throws IOException, SQLException
    {
+      logger.fine("about to dump '" + query + "' into '" + fileName +"'.");
       PrintWriter out = null;
       PreparedStatement statement = null;
@@ -354 +358 @@
    }
 
-   private Connection getConnectionFromDataSource () 
+   private Connection getConnectionFromDataSource ()
        throws NamingException, SQLException
    {
@@ -558 +562 @@
    }
 
-   private Object readBlob (ResultSet rs, int column) 
+   private Object readBlob (ResultSet rs, int column)
          throws SQLException
    {
@@ -587 +591 @@
       final String result;
       final Reader reader = rs.getCharacterStream(column);
-      try
-      {
-         result = IoUtil.readFully(reader);
-      }
-      finally
-      {
-         IoUtil.close(reader);
+      if (reader != null)
+      {
+          try
+          {
+             result = IoUtil.readFully(reader);
+          }
+          finally
+          {
+             IoUtil.close(reader);
+          }
+      }
+      else
+      {
+          result = null;
       }
       return result;
@@ -721 +732 @@
          // ts.getTime does not return millis....
          d = new Date(((ts.getTime() / MILLIS_PER_SECOND) * MILLIS_PER_SECOND)
-               + (ts.getNanos() 
+               + (ts.getNanos()
                    / org.jcoderz.commons.types.Date.NANOS_PER_MILLI));
       }
@@ -804 +815 @@
             else
             {
-               final IllegalArgumentException axe 
+               final IllegalArgumentException axe
                      = new IllegalArgumentException(
                         "Could not map type for object '" + String.valueOf(in)
@@ -817 +828 @@
       }
    }
+
+   public static String escapeTableName (String in)
+   {
+       return in.replaceAll("[/\\\\$]", "#");
+   }
 }