From 87165dd0490779a58add55937fcf80c95c5782f4 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Mon, 19 May 2008 09:38:35 +0800
Subject: [PATCH] update for EOFM-90
---
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleJobContext.java | 12 +++---------
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertJobContext.java | 2 +-
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java | 2 +-
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractDgnFileJobContext.java | 12 +++---------
4 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractDgnFileJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractDgnFileJobContext.java
index 6c8718a..c7feace 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractDgnFileJobContext.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractDgnFileJobContext.java
@@ -20,7 +20,7 @@
private Dgn7fileReader reader = null;
private String filename = null;
- private String _elementLogging = null;
+ private boolean _elementLogging;
public AbstractDgnFileJobContext(String dataPath)
{
@@ -70,19 +70,13 @@
this.filename = filename;
}
- public String getElementLogging()
+ public boolean getElementLogging()
{
return _elementLogging;
}
- public void setElementLogging(String elementLogging)
+ public void setElementLogging(boolean elementLogging)
{
this._elementLogging = elementLogging;
- }
-
- public boolean checkElementLogging()
- {
- return _elementLogging != null && !_elementLogging.equalsIgnoreCase("false") &&
- !_elementLogging.equalsIgnoreCase("no") && !_elementLogging.equalsIgnoreCase("0");
}
}
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleJobContext.java
index 68a8bb5..f1d867c 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleJobContext.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleJobContext.java
@@ -217,7 +217,7 @@
protected String _dataPath;
private OracleConnection oracleConnection = null;
protected Properties properties;
- protected String _elementLogging = null;
+ protected boolean _elementLogging;
public static String getCurrentURL(String oracleHost, String oraclePort, String oracleInstance)
{
@@ -308,20 +308,14 @@
return _oraclePort;
}
- public String getElementLogging()
+ public boolean getElementLogging()
{
return _elementLogging;
}
- public void setElementLogging(String elementLogging)
+ public void setElementLogging(boolean elementLogging)
{
_elementLogging = elementLogging;
- }
-
- public boolean checkElementLogging()
- {
- return _elementLogging != null && !_elementLogging.equalsIgnoreCase("false") &&
- !_elementLogging.equalsIgnoreCase("no") && !_elementLogging.equalsIgnoreCase("0");
}
public abstract void startTransaction();
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 ffabbde..60bb642 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
@@ -109,7 +109,7 @@
jobContext.setShapeData(_dataPath);
jobContext.setConvertDB(_convertDB);
jobContext.setConvertFile(_convertFile);
- jobContext.setElementLogging(_elementLogging);
+ jobContext.setElementLogging(checkElementLogging());
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 6ba8702..0e19bf1 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
@@ -137,7 +137,7 @@
":type=" + element.getType() + ":lv=" + element.getLevelIndex() + ":id=" +
(linkage == null ? "NULL" : (linkage.getFsc() + "|" + linkage.getComponentID())));
- if (checkElementLogging())
+ if (getElementLogging())
getElementLogger().logElement(element, getCurrentSchema());
return;
}
--
Gitblit v0.0.0-SNAPSHOT