From d2986858ad69383e3b06188b4cebe9c2f714f2dd Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Thu, 12 Jun 2008 15:44:42 +0800
Subject: [PATCH] update for EOFM-117

---
 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java
index 1cd3c29..c8cb87c 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java
@@ -13,6 +13,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Types;
+import java.sql.Connection;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Map;
@@ -206,7 +207,7 @@
         {
             logger.info("-- step:clearOutputDatabase --");
             clearOutputDatabase();
-            boolean bFirst = true;
+            boolean bFirst = isCopyConnectivityMode();
             if (checkConvertDB())
             {
                 logger.info("-- step:convertOracleDB --");
@@ -278,7 +279,7 @@
      */
     private void copyConnectivity(OracleConvertMySQLJobContext jobContext) throws SQLException
     {
-        OracleConnection connection = jobContext.getOracleConnection();
+        Connection connection = jobContext.getOracleConnection();
         Statement stmt = connection.createStatement();
         stmt.execute(AbstractOracleJobContext.TRUNCATE_CONNECTIVITY_WEBCHECK);
         stmt.execute(AbstractOracleJobContext.COPY_CONNECTIVITY_TO_WEBCHECK);
@@ -343,7 +344,7 @@
         System.gc();
     }
 
-    protected OrderedMap getBlobStorageList(OracleConnection connection, String schemaSrc, String tableSrc,
+    protected OrderedMap getBlobStorageList(Connection connection, String schemaSrc, String tableSrc,
                                             OrderedMap orderedMap) throws SQLException
     {
         if (orderedMap == null)
@@ -436,7 +437,7 @@
     protected void queryIgsetElement(OracleConvertMySQLJobContext jobContext,
                                      String srcschema, String srctable) throws SQLException
     {
-        OracleConnection connection = jobContext.getOracleConnection();
+        Connection connection = jobContext.getOracleConnection();
         String fetchSrcStmtFmt = "SELECT IGDSELM FROM \"%s\".\"%s\" ORDER BY ROWID";
         PrintfFormat spf = new PrintfFormat(fetchSrcStmtFmt);
         String fetchSrcStmt = spf.sprintf(new Object[]{srcschema, srctable});
@@ -478,7 +479,7 @@
     protected void queryRawElement(OracleConvertMySQLJobContext jobContext,
                                    String srcschema, String srctable) throws SQLException
     {
-        OracleConnection connection = jobContext.getOracleConnection();
+        Connection connection = jobContext.getOracleConnection();
         String fetchDestStmtFmt = "SELECT ELEMENT FROM \"%s\".\"%s\" ORDER BY ROWID";
         PrintfFormat spf = new PrintfFormat(fetchDestStmtFmt);
         String fetchDestStmt = spf.sprintf(new Object[]{srcschema, srctable});

--
Gitblit v0.0.0-SNAPSHOT