From aaf4c6c3a1d50b67b9a7dfd1bc011615ba5d9f57 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Fri, 06 Jun 2008 18:44:30 +0800
Subject: [PATCH] update for EOFM-115
---
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java
index d3de309..384b6d9 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java
@@ -22,6 +22,10 @@
import org.apache.commons.logging.LogFactory;
import org.geotools.feature.IllegalAttributeException;
import org.geotools.feature.SchemaException;
+import org.geotools.data.oracle.OracleDataStore;
+import org.geotools.data.jdbc.ConnectionPoolManager;
+import org.geotools.data.jdbc.datasource.DataSourceUtil;
+import org.geotools.data.jdbc.datasource.DataSourceFinder;
import org.quartz.JobDetail;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
@@ -33,14 +37,14 @@
import oracle.sql.ARRAY;
import oracle.sql.BLOB;
+import com.ximple.eofms.jobs.context.AbstractOracleJobContext;
+import com.ximple.eofms.jobs.context.shapefile.FeatureDgnConvertShpJobContext;
+import com.ximple.eofms.jobs.context.shapefile.GeneralDgnConvertShpJobContext;
+import com.ximple.eofms.jobs.context.shapefile.IndexDgnConvertShpJobContext;
+import com.ximple.eofms.jobs.context.shapefile.OracleConvertShapefilesJobContext;
import com.ximple.eofms.util.BinConverter;
import com.ximple.eofms.util.ByteArrayCompressor;
import com.ximple.eofms.util.StringUtils;
-import com.ximple.eofms.jobs.context.AbstractOracleJobContext;
-import com.ximple.eofms.jobs.context.FeatureDgnConvertShpJobContext;
-import com.ximple.eofms.jobs.context.GeneralDgnConvertShpJobContext;
-import com.ximple.eofms.jobs.context.IndexDgnConvertShpJobContext;
-import com.ximple.eofms.jobs.context.OracleConvertShapefilesJobContext;
import com.ximple.io.dgn7.ComplexElement;
import com.ximple.io.dgn7.Dgn7fileException;
import com.ximple.io.dgn7.Dgn7fileReader;
@@ -102,6 +106,11 @@
// Log the time the job started
logger.info(jobName + " fired at " + new Date());
extractJobConfiguration(jobDetail);
+ createSourceDataStore();
+ if (getSourceDataStore() == null)
+ {
+ throw new JobExecutionException("Cannot connect source oracle database.");
+ }
try
{
@@ -115,11 +124,8 @@
for (String orgSchema : _orgSchema)
{
OracleConvertShapefilesJobContext jobContext = (OracleConvertShapefilesJobContext) prepareJobContext(_filterPath);
- jobContext.setConnectionInfo(_oracleHost, _oraclePort, _oracleInstance);
- jobContext.setLogin(_username, _password);
- jobContext.setShapeData(_dataPath);
- jobContext.setConvertDB(_convertDB);
- jobContext.setConvertFile(_convertFile);
+ jobContext.setSourceDataStore(getSourceDataStore());
+ jobContext.setDataPath(_dataPath);
jobContext.setConvertElementIn(_convertElementIn);
jobContext.setElementLogging(checkElementLogging());
jobContext.setExecutionContext(context);
@@ -156,6 +162,8 @@
logger.info("-- step:createDummyFeatureFile --");
createDummyFeatureFile(context);
}
+
+ disconnect();
} catch (SQLException e)
{
logger.warn(e.getMessage(), e);
@@ -485,7 +493,8 @@
* �����ഫ�����ɪ��u�@
*
* @param context �u�@��������
- * @throws org.quartz.JobExecutionException exception
+ * @throws org.quartz.JobExecutionException
+ * exception
*/
private void convertIndexDesignFile(JobExecutionContext context) throws JobExecutionException
{
@@ -614,7 +623,8 @@
* �����ഫ��L�]�p���ɪ��u�@
*
* @param context jobContext
- * @throws org.quartz.JobExecutionException exception
+ * @throws org.quartz.JobExecutionException
+ * exception
*/
private void convertOtherDesignFile(JobExecutionContext context) throws JobExecutionException
{
--
Gitblit v0.0.0-SNAPSHOT