From 6d2edcc80c543290a1695e1eb364ba4ac6c0df1f Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Fri, 30 Apr 2010 18:21:18 +0800
Subject: [PATCH]
---
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 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 4d5a258..d713440 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
@@ -39,8 +39,6 @@
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
-import com.vividsolutions.jts.geom.GeometryFactory;
-
import oracle.jdbc.OracleConnection;
import oracle.jdbc.OracleResultSet;
import oracle.sql.ARRAY;
@@ -62,8 +60,6 @@
import com.ximple.io.dgn7.ElementType;
import com.ximple.io.dgn7.IElementHandler;
import com.ximple.io.dgn7.Lock;
-import com.ximple.io.dgn7.ShapeElement;
-import com.ximple.io.dgn7.TextElement;
import com.ximple.util.PrintfFormat;
public class OracleConvertDgn2PostGISJob extends AbstractOracleDatabaseJob {
@@ -96,7 +92,6 @@
protected static PostgisDataStoreFactory dataStoreFactory = new PostgisDataStoreFactory();
- GeometryFactory _geomFactory = new GeometryFactory();
protected String _pgHost;
protected String _pgDatabase;
protected String _pgPort;
@@ -118,9 +113,9 @@
protected AbstractOracleJobContext prepareJobContext(String targetSchemaName, String filterPath,
boolean profileMode,
- boolean useTransform, boolean useEPSG3826) {
+ boolean useTransform) {
return new OracleConvertPostGISJobContext(getDataPath(),
- getTargetDataStore(), targetSchemaName, filterPath, profileMode, useTransform, useEPSG3826);
+ getTargetDataStore(), targetSchemaName, filterPath, profileMode, useTransform);
}
protected void extractJobConfiguration(JobDetail jobDetail) throws JobExecutionException {
@@ -239,13 +234,13 @@
OracleConvertPostGISJobContext jobContext =
(OracleConvertPostGISJobContext) prepareJobContext(targetSchemaName, _filterPath,
- isProfileMode(), isTransformed(), isEPSG3826());
+ isProfileMode(), isTransformed());
jobContext.setSourceDataStore(getSourceDataStore());
// jobContext.setConvertElementIn(_convertElementIn);
jobContext.setElementLogging(checkElementLogging());
jobContext.setExecutionContext(context);
- CreateHibernateSequence(jobContext);
+ createHibernateSequence(jobContext);
long tStep = System.currentTimeMillis();
@@ -389,7 +384,7 @@
}
- private void CreateHibernateSequence(OracleConvertPostGISJobContext jobContext) throws SQLException {
+ private void createHibernateSequence(OracleConvertPostGISJobContext jobContext) throws SQLException {
Connection connection = jobContext.getOracleConnection();
try {
@@ -398,7 +393,7 @@
stmt.close();
} catch (SQLException e)
{
- logger.warn("HIBERNATE_SEQUENCE �w�g�s�b");
+ logger.warn("HIBERNATE_SEQUENCE is already exist.");
}
}
@@ -732,7 +727,7 @@
if (dgnFile.isDirectory()) continue;
IndexDgnConvertPostGISJobContext convertContext =
new IndexDgnConvertPostGISJobContext(getDataPath(), getTargetDataStore(), targetSchemaName,
- isProfileMode(), isTransformed(), isEPSG3826());
+ isProfileMode(), isTransformed());
logger.info("--- start index dgnfile-" + dgnFile.toString() + " ---");
FileInputStream fs = null;
FileChannel fc = null;
@@ -891,7 +886,7 @@
GeneralDgnConvertPostGISJobContext convertContext =
new GeneralDgnConvertPostGISJobContext(getDataPath(), getTargetDataStore(), targetSchemaName,
- isProfileMode(), isTransformed(), isEPSG3826());
+ isProfileMode(), isTransformed());
logger.info("--- start other dgnfile-" + dgnFile.toString() + " ---");
FileInputStream fs = null;
FileChannel fc;
@@ -1074,7 +1069,7 @@
for (File dgnFile : dgnFiles) {
FeatureDgnConvertPostGISJobContext convertContext =
new FeatureDgnConvertPostGISJobContext(getDataPath(), getTargetDataStore(), targetSchemaName, _filterPath,
- isProfileMode(), isTransformed(), isEPSG3826());
+ isProfileMode(), isTransformed());
logger.info("--- start dgnfile-" + dgnFile.toString() + " ---");
try {
convertContext.setExecutionContext(context);
@@ -1312,7 +1307,7 @@
sql = new StringBuilder("ALTER TABLE ");
sql.append(encodeSchemaTableName(pgSchema, DataReposVersionManager.XGVERSIONTABLE_NAME));
- sql.append(" OWNER TO spatialdb");
+ sql.append(" OWNER TO ").append(_pgUsername);
stmt.executeUpdate(sql.toString());
sql = new StringBuilder("GRANT ALL ON TABLE ");
@@ -1381,7 +1376,7 @@
StringBuilder sbSQL = new StringBuilder("CREATE SCHEMA ");
sbSQL.append(s).append(' ');
- sbSQL.append("AUTHORIZATION spatialdb");
+ sbSQL.append("AUTHORIZATION ").append(_pgUsername);
stmt = connection.createStatement();
stmt.executeUpdate(sbSQL.toString());
--
Gitblit v0.0.0-SNAPSHOT