From d0d1692ce4025d12c57159a322165fc3bd5ba979 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Thu, 14 Aug 2008 16:21:35 +0800
Subject: [PATCH] update for EOFM-144

---
 xdgnjobs/ximple-spatialjob/src/main/resources/conf/DefaultConvertShpFilter.xml                                         |   32 +++++++++++++++++++++++++++++++-
 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/GeneralDgnConvertPostGISJobContext.java |    4 ++++
 2 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/GeneralDgnConvertPostGISJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/GeneralDgnConvertPostGISJobContext.java
index 1eeccc7..5033bac 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/GeneralDgnConvertPostGISJobContext.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/GeneralDgnConvertPostGISJobContext.java
@@ -72,6 +72,7 @@
         FeatureType ft = lookupFeatureType(element);
         if (ft != null)
         {
+			boolean canLog = true;
             Feature feature = null;
             try
             {
@@ -79,10 +80,13 @@
             } catch (ArrayIndexOutOfBoundsException e)
             {
                 getLogger().warn(e.getMessage(), e);
+                canLog = false;
             }
 
             if (feature == null)
             {
+				if (!canLog) return;
+
                 if (element instanceof TextElement)
                     logger.info("cannot craete feature." + element.toString() + "'" +
                             ((TextElement) element).getText() + "'");
diff --git a/xdgnjobs/ximple-spatialjob/src/main/resources/conf/DefaultConvertShpFilter.xml b/xdgnjobs/ximple-spatialjob/src/main/resources/conf/DefaultConvertShpFilter.xml
index 404da7c..1233019 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/resources/conf/DefaultConvertShpFilter.xml
+++ b/xdgnjobs/ximple-spatialjob/src/main/resources/conf/DefaultConvertShpFilter.xml
@@ -159,7 +159,7 @@
       <elementType>7</elementType>
       <elementType>17</elementType>
     </elementCriterion>
-    <MultiSymbolCreateStrategy/>
+    <SymbolCreateStrategy/>
   </TypeCompFilter>
   <TypeCompFilter name="FSC-423.C-1">
     <tid>423</tid>
@@ -186,6 +186,7 @@
     <description>��u���O</description>
     <elementCriterion>
       <elementType>17</elementType>
+      <elementType>7</elementType>
     </elementCriterion>
     <TextCreateStrategy/>
   </TypeCompFilter>
@@ -457,6 +458,16 @@
       <elementType>17</elementType>
     </elementCriterion>
     <SymbolCreateStrategy/>
+  </TypeCompFilter>
+  <TypeCompFilter name="FSC-107.C-1">
+    <tid>107</tid>
+    <cid>1</cid>
+    <description>��������O</description>
+    <elementCriterion>
+      <elementType>7</elementType>
+      <elementType>17</elementType>
+    </elementCriterion>
+    <TextCreateStrategy/>
   </TypeCompFilter>
   <TypeCompFilter name="FSC-107.C-2">
     <tid>107</tid>
@@ -1562,6 +1573,25 @@
     </elementCriterion>
     <SymbolCreateStrategy/>
   </TypeCompFilter>
+  <TypeCompFilter name="FSC-325.C-0">
+    <tid>325</tid>
+    <cid>0</cid>
+    <description>���֤��t�˸m</description>
+    <elementCriterion>
+      <elementType>17</elementType>
+    </elementCriterion>
+    <SymbolCreateStrategy/>
+  </TypeCompFilter>
+  <TypeCompFilter name="FSC-325.C-1">
+    <tid>325</tid>
+    <cid>1</cid>
+    <description>���֤��t�˸m���O</description>
+    <elementCriterion>
+      <elementType>17</elementType>
+    </elementCriterion>
+    <SymbolCreateStrategy/>
+  </TypeCompFilter>
+
   <TypeCompFilter name="FSC-323.C-0">
     <tid>323</tid>
     <cid>0</cid>

--
Gitblit v0.0.0-SNAPSHOT