From 7c489a7b30ed09100ad58fedb7e40281f823e91d Mon Sep 17 00:00:00 2001
From: Dennis Kao <ulysseskao@gmail.com>
Date: Thu, 26 Sep 2013 18:51:16 +0800
Subject: [PATCH] update for dist id

---
 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java |   65 ++------------------------------
 1 files changed, 4 insertions(+), 61 deletions(-)

diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java
index df6d3b8..c7e0cb9 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java
@@ -249,6 +249,10 @@
 
                 long tStep = System.currentTimeMillis();
 
+                fetchTPData(jobContext);
+                logger.info("TPC DIST:" + jobContext.getDistId() + ":" +
+                    ((jobContext.getDistName() == null) ? "NULL" : jobContext.getDistName()));
+
                 if (isCopyConnectivityMode()) {
                     copyConnectivity(jobContext);
                 }
@@ -337,67 +341,6 @@
     private void logTimeDiff(String message, long tBefore, long tCurrent) {
         logger.warn(message + ":use time = " + ((int) ((tCurrent - tBefore) / 60000.0)) + " min - " +
             (((int) ((tCurrent - tBefore) % 60000.0)) / 1000) + " sec");
-    }
-
-    /**
-     * Connectivity�ƻs�@�Ӫ����A�b�d�߹q�y��V�ɥΨӤ��OMS��Ʈw���q���s����(Connectivity)
-     *
-     * @param jobContext job context
-     * @throws SQLException sql exception
-     */
-    private void copyConnectivity(OracleConvertPostGISJobContext jobContext) throws SQLException {
-        Connection connection = jobContext.getOracleConnection();
-        ResultSet rsMeta = connection.getMetaData().getTables(null, "BASEDB",
-            AbstractOracleJobContext.CONNECTIVITY_WEBCHECK_NAME + "%",
-            new String[]{"TABLE"});
-
-        boolean found = false;
-        try {
-            while (rsMeta.next()) {
-                String tablename = rsMeta.getString(3);
-                if (AbstractOracleJobContext.CONNECTIVITY_WEBCHECK_NAME.equalsIgnoreCase(tablename)) {
-                    found = true;
-                    break;
-                }
-            }
-            // } catch (SQLException e)
-        } finally {
-            if (rsMeta != null) {
-                rsMeta.close();
-                rsMeta = null;
-            }
-        }
-        Statement stmt = connection.createStatement();
-        if (found) {
-            stmt.execute(AbstractOracleJobContext.TRUNCATE_CONNECTIVITY_WEBCHECK);
-        } else {
-            logger.info("Create CONNECTIVITY_WEBCHECK table.");
-            stmt.execute(AbstractOracleJobContext.CREATE_CONNECTIVITY_WEBCHECK);
-            stmt.execute(AbstractOracleJobContext.CREATE_CONNECTIVITY_WEBCHECK_INDEX_1);
-            stmt.execute(AbstractOracleJobContext.CREATE_CONNECTIVITY_WEBCHECK_INDEX_2);
-            stmt.execute(AbstractOracleJobContext.CREATE_CONNECTIVITY_WEBCHECK_INDEX_3);
-            stmt.execute(AbstractOracleJobContext.CREATE_CONNECTIVITY_WEBCHECK_INDEX_4);
-            stmt.execute(AbstractOracleJobContext.CREATE_CONNECTIVITY_WEBCHECK_INDEX_5);
-            stmt.execute(AbstractOracleJobContext.CREATE_CONNECTIVITY_WEBCHECK_INDEX_6);
-            stmt.execute(AbstractOracleJobContext.ALTER_CONNECTIVITY_WEBCHECK_1);
-            stmt.execute(AbstractOracleJobContext.ALTER_CONNECTIVITY_WEBCHECK_2);
-        }
-
-        stmt.execute(AbstractOracleJobContext.COPY_CONNECTIVITY_TO_WEBCHECK);
-        stmt.close();
-    }
-
-
-    private void createHibernateSequence(OracleConvertPostGISJobContext jobContext) throws SQLException {
-        Connection connection = jobContext.getOracleConnection();
-
-        try {
-            Statement stmt = connection.createStatement();
-            stmt.execute(AbstractOracleJobContext.CREATE_HIBERNATE_SEQUENCE);
-            stmt.close();
-        } catch (SQLException e) {
-            logger.warn("HIBERNATE_SEQUENCE is already exist.");
-        }
     }
 
     private void exetcuteConvert(OracleConvertPostGISJobContext jobContext,

--
Gitblit v0.0.0-SNAPSHOT