From b8918d3237b8ce922bc7b34d6b61e147a8e08761 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Tue, 06 May 2008 19:51:57 +0800
Subject: [PATCH] update for EOFM-75
---
xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml | 8 ++++++++
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleDatabaseJob.java | 7 +++++++
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertJobContext.java | 12 ++++++++++++
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java | 2 ++
4 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
index bb6e9eb..53991c5 100644
--- a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
+++ b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
@@ -45,6 +45,14 @@
<value>SPATIALDB, CMMS_SPATIALDB</value>
</entry>
<entry>
+ <key>CONVERTDB</key>
+ <value>true</value>
+ </entry>
+ <entry>
+ <key>CONVERTFILE</key>
+ <value>true</value>
+ </entry>
+ <entry>
<key>TESTMODE</key>
<value>FALSE</value>
</entry>
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleDatabaseJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleDatabaseJob.java
index 79fdcf5..67c898b 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleDatabaseJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleDatabaseJob.java
@@ -24,6 +24,8 @@
private static final String SHPDATA_DIR = "SHPDATA_DIR";
private static final String CONFSHPFILTER = "SHPFILTER_CONF";
private static final String SPATAILSCHEMA = "ORGSCHEMA";
+ private static final String CONVERTDB = "CONVERTDB";
+ private static final String CONVERTFILE = "CONVERTFILE";
private static final String ORAHOST = "ORAHOST";
private static final String ORAINST = "ORAINST";
private static final String ORAPORT = "ORAPORT";
@@ -39,6 +41,8 @@
protected String _oraclePort;
protected String _username;
protected String _password;
+ protected String _convertDB;
+ protected String _convertFile;
protected ArrayList<String> _orgSchema = new ArrayList<String>();
protected boolean _testMode = false;
protected int _testCount = -1;
@@ -58,6 +62,9 @@
_oraclePort = dataMap.getString(ORAPORT);
_username = dataMap.getString(ORAUSER);
_password = dataMap.getString(ORAPASS);
+ _convertDB = dataMap.getString(CONVERTDB);
+ _convertFile = dataMap.getString(CONVERTFILE);
+
String strSchema = dataMap.getString(SPATAILSCHEMA);
StringTokenizer st = new StringTokenizer(strSchema, ",");
while (st.hasMoreTokens())
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 5ff3300..bfeefe4 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
@@ -102,6 +102,8 @@
jobContext.setConnectionInfo(_oracleHost, _oraclePort, _oracleInstance);
jobContext.setLogin(_username, _password);
jobContext.setShapeData(_dataPath);
+ jobContext.setConvertDB(_convertDB);
+ jobContext.setConvertFile(_convertFile);
jobContext.setExecutionContext(context);
if (bFirst)
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertJobContext.java
index 163163b..e03f510 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertJobContext.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertJobContext.java
@@ -66,6 +66,8 @@
private JobExecutionContext executionContext;
private String dataOut = null;
+ private String _convertDB = null;
+ private String _convertFile = null;
public OracleConvertJobContext(String filterConfig)
{
@@ -271,4 +273,14 @@
}
return dataOut;
}
+
+ public void setConvertDB(String convertDB)
+ {
+ _convertDB = convertDB;
+ }
+
+ public void setConvertFile(String convertFile)
+ {
+ _convertFile = convertFile;
+ }
}
--
Gitblit v0.0.0-SNAPSHOT