From e74264d50398db0c9f69761291e2891823f3c450 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Fri, 05 Sep 2008 18:32:01 +0800
Subject: [PATCH] update for EOFM-157

---
 xdgnjobs/ximple-elmparser/src/main/java/com/ximple/eofms/XElementFetcher.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/xdgnjobs/ximple-elmparser/src/main/java/com/ximple/eofms/XElementFetcher.java b/xdgnjobs/ximple-elmparser/src/main/java/com/ximple/eofms/XElementFetcher.java
index 5e6ec32..f9f9cc7 100644
--- a/xdgnjobs/ximple-elmparser/src/main/java/com/ximple/eofms/XElementFetcher.java
+++ b/xdgnjobs/ximple-elmparser/src/main/java/com/ximple/eofms/XElementFetcher.java
@@ -1,5 +1,6 @@
 package com.ximple.eofms;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
@@ -38,15 +39,15 @@
 import oracle.sql.BLOB;
 
 import com.ximple.eofms.filter.ElementDispatcher;
-import com.ximple.eofms.jobs.context.postgis.FeatureDgnConvertPostGISJobContext;
 import com.ximple.eofms.jobs.OracleElementLogger;
+import com.ximple.eofms.jobs.context.postgis.FeatureDgnConvertPostGISJobContext;
+import com.ximple.io.dgn7.ArcElement;
+import com.ximple.io.dgn7.ComplexChainElement;
 import com.ximple.io.dgn7.ComplexElement;
 import com.ximple.io.dgn7.Dgn7fileException;
 import com.ximple.io.dgn7.Element;
 import com.ximple.io.dgn7.ElementType;
 import com.ximple.io.dgn7.IElementHandler;
-import com.ximple.io.dgn7.ArcElement;
-import com.ximple.io.dgn7.ComplexChainElement;
 import com.ximple.util.PrintfFormat;
 
 public class XElementFetcher implements Runnable
@@ -61,7 +62,6 @@
     private static final String ORAUSER = "ORAUSER";
     private static final String ORAPASS = "ORAPASS";
     private static final String ORGSCHEMA = "ORGSCHEMA";
-    private static final String DATAPATH = "DATAPATH";
 
     private static final int FETCHSIZE = 30;
     private static final int COMMITSIZE = 100;
@@ -114,7 +114,7 @@
     private void initializeDataConfig()
     {
         dataConfig = new HashMap<String, String>();
-        dataConfig.put(DATAPATH, "G:\\Temp\\JobData\\tctpc\\elmout");
+        dataConfig.put(XElementParser.ROOTDATAPATH, XElementParser.DEFAULT_DATAPATH);
         dataConfig.put(ORAHOST, "192.168.11.200");
         dataConfig.put(ORAINST, "tctpc");
         dataConfig.put(ORAPORT, "1521");
@@ -166,7 +166,7 @@
             ArrayList<String> schemas = getSchemaNames();
             for (String schema : schemas)
             {
-                executeFetchElement(dataStore, schema, dataConfig.get(DATAPATH));
+                executeFetchElement(dataStore, schema, getOutputPath());
             }
         } catch (SQLException e)
         {
@@ -175,6 +175,11 @@
         }
     }
 
+    private String getOutputPath()
+    {
+        return dataConfig.get(XElementParser.ROOTDATAPATH) + File.separator + XElementParser.DEFAULT_DGNOUTPATH;
+    }
+
     protected OracleDataStore createSourceDataStore()
     {
         if (!driverFound)

--
Gitblit v0.0.0-SNAPSHOT