From c335918811ddc282a5e182b2e89878ca258c94f2 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Tue, 03 Jun 2008 19:18:20 +0800
Subject: [PATCH] update for EOFM-111, EOFM-112
---
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 95f104c..ae243c6 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
@@ -36,6 +36,11 @@
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.FeatureDgnConvertJobContext;
+import com.ximple.eofms.jobs.context.GeneralDgnConvertJobContext;
+import com.ximple.eofms.jobs.context.IndexDgnConvertJobContext;
+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;
@@ -78,7 +83,12 @@
protected AbstractOracleJobContext prepareJobContext(String filterPath)
{
- return new OracleConvertJobContext(filterPath);
+ return new OracleConvertShapefilesJobContext(filterPath);
+ }
+
+ protected void extractJobConfiguration(JobDetail jobDetail) throws JobExecutionException
+ {
+ super.extractJobConfiguration(jobDetail);
}
public void execute(JobExecutionContext context) throws JobExecutionException
@@ -104,7 +114,7 @@
for (String orgSchema : _orgSchema)
{
- OracleConvertJobContext jobContext = (OracleConvertJobContext) prepareJobContext(_filterPath);
+ OracleConvertShapefilesJobContext jobContext = (OracleConvertShapefilesJobContext) prepareJobContext(_filterPath);
jobContext.setConnectionInfo(_oracleHost, _oraclePort, _oracleInstance);
jobContext.setLogin(_username, _password);
jobContext.setShapeData(_dataPath);
@@ -164,15 +174,15 @@
* @param jobContext job context
* @throws SQLException sql exception
*/
- private void copyConnectivity(OracleConvertJobContext jobContext) throws SQLException
+ private void copyConnectivity(OracleConvertShapefilesJobContext jobContext) throws SQLException
{
OracleConnection connection = jobContext.getOracleConnection();
Statement stmt = connection.createStatement();
- stmt.execute(OracleConvertJobContext.TRUNCATE_CONNECTIVITY_WEBCHECK);
- stmt.execute(OracleConvertJobContext.COPY_CONNECTIVITY_TO_WEBCHECK);
+ stmt.execute(OracleConvertShapefilesJobContext.TRUNCATE_CONNECTIVITY_WEBCHECK);
+ stmt.execute(OracleConvertShapefilesJobContext.COPY_CONNECTIVITY_TO_WEBCHECK);
}
- private void exetcuteConvert(OracleConvertJobContext jobContext,
+ private void exetcuteConvert(OracleConvertShapefilesJobContext jobContext,
String querySchema, String dataPath) throws SQLException
{
int order = 0;
@@ -321,7 +331,7 @@
return orderedMap;
}
- protected void queryIgsetElement(OracleConvertJobContext jobContext,
+ protected void queryIgsetElement(OracleConvertShapefilesJobContext jobContext,
String srcschema, String srctable) throws SQLException
{
OracleConnection connection = jobContext.getOracleConnection();
@@ -363,7 +373,7 @@
stmtSrc.close();
}
- protected void queryRawElement(OracleConvertJobContext jobContext,
+ protected void queryRawElement(OracleConvertShapefilesJobContext jobContext,
String srcschema, String srctable) throws SQLException
{
OracleConnection connection = jobContext.getOracleConnection();
@@ -728,7 +738,7 @@
private void clearOutputDirectory()
{
- File outDataPath = new File(getDataPath(), OracleConvertJobContext.SHPOUTPATH);
+ File outDataPath = new File(getDataPath(), OracleConvertShapefilesJobContext.SHPOUTPATH);
if (outDataPath.exists() && outDataPath.isDirectory())
{
deleteFilesInPath(outDataPath);
--
Gitblit v0.0.0-SNAPSHOT