From be3f6f9762dd15177477a7bcf6e11a2e27c70e57 Mon Sep 17 00:00:00 2001
From: unknown <yuanhung@ximple.com.tw>
Date: Mon, 04 Aug 2014 18:16:17 +0800
Subject: [PATCH] bug fix a.error @ geometry column not exist b.error @ drop table

---
 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java |   81 ++++++++++++++++++----------------------
 1 files changed, 36 insertions(+), 45 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 e8cd4c9..01b045e 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
@@ -1,37 +1,21 @@
 package com.ximple.eofms.jobs;
 
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.PushbackReader;
-import java.io.StringReader;
-import java.math.BigDecimal;
-import java.nio.BufferOverflowException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.channels.FileChannel;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
+import com.ximple.eofms.jobs.context.AbstractOracleJobContext;
+import com.ximple.eofms.jobs.context.postgis.FeatureDgnConvertPostGISJobContext;
+import com.ximple.eofms.jobs.context.postgis.GeneralDgnConvertPostGISJobContext;
+import com.ximple.eofms.jobs.context.postgis.IndexDgnConvertPostGISJobContext;
+import com.ximple.eofms.jobs.context.postgis.OracleConvertPostGISJobContext;
 import com.ximple.eofms.util.*;
+import com.ximple.io.dgn7.*;
+import com.ximple.util.PrintfFormat;
+import oracle.jdbc.OracleConnection;
+import oracle.jdbc.OracleResultSet;
+import oracle.sql.ARRAY;
+import oracle.sql.BLOB;
 import org.apache.commons.collections.OrderedMap;
 import org.apache.commons.collections.OrderedMapIterator;
 import org.apache.commons.collections.map.LinkedMap;
 import org.apache.commons.dbcp.DelegatingConnection;
-import org.apache.commons.dbcp.PoolingConnection;
-import org.apache.commons.dbcp.PoolingDataSource;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.geotools.data.DataStore;
@@ -48,24 +32,15 @@
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 
-import oracle.jdbc.OracleConnection;
-import oracle.jdbc.OracleResultSet;
-import oracle.sql.ARRAY;
-import oracle.sql.BLOB;
-
-import com.ximple.eofms.jobs.context.AbstractOracleJobContext;
-import com.ximple.eofms.jobs.context.postgis.FeatureDgnConvertPostGISJobContext;
-import com.ximple.eofms.jobs.context.postgis.GeneralDgnConvertPostGISJobContext;
-import com.ximple.eofms.jobs.context.postgis.IndexDgnConvertPostGISJobContext;
-import com.ximple.eofms.jobs.context.postgis.OracleConvertPostGISJobContext;
-import com.ximple.io.dgn7.ComplexElement;
-import com.ximple.io.dgn7.Dgn7fileException;
-import com.ximple.io.dgn7.Dgn7fileReader;
-import com.ximple.io.dgn7.Element;
-import com.ximple.io.dgn7.ElementType;
-import com.ximple.io.dgn7.IElementHandler;
-import com.ximple.io.dgn7.Lock;
-import com.ximple.util.PrintfFormat;
+import java.io.*;
+import java.math.BigDecimal;
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.FileChannel;
+import java.sql.*;
+import java.util.*;
+import java.util.Date;
 
 public class OracleConvertDgn2PostGISJob extends AbstractOracleDatabaseJob {
     final static Log logger = LogFactory.getLog(OracleConvertDgn2PostGISJob.class);
@@ -379,7 +354,12 @@
             logger.warn(ex.getMessage(), ex);
             throw new JobExecutionException("IO error. " + ex.getMessage(), ex);
         } finally {
+            try{
             disconnect();
+            }catch(Exception doubleEx)
+            {
+
+            }
         }
         logger.warn(jobName + " end at " + new Date());
     }
@@ -1238,10 +1218,15 @@
     }
 
     protected void disconnect() {
+        try{
         super.disconnect();
         if (targetDataStore != null) {
             targetDataStore.dispose();
             targetDataStore = null;
+        }
+        }catch (Exception ex)
+        {
+            logger.warn(ex.getMessage());
         }
     }
 
@@ -1308,7 +1293,13 @@
         } finally {
             JDBCUtils.close(rs);
             JDBCUtils.close(stmt);
+            try{
             JDBCUtils.close(connection, Transaction.AUTO_COMMIT, null);
+
+            }catch(Exception doubleException)
+            {
+
+            }
         }
         return targetSchema;
     }

--
Gitblit v0.0.0-SNAPSHOT