ndd_roadimport
parent: e56d1862 | patch | commit | show whitespace
unknown
2014-06-19 712c283b4fd777f6e865cb9c71f1efe3da6cf34f 
version to 2.1.2
bug fixed(infinite log)
convertFilter list
3 files modified
323 ■■■■■ changed files
xdgnjobs/ximple-jobcarrier/pom.xml 3 ●●●●● patch | view | raw | blame | history
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/OracleConvertPostGISJobContext.java 33 ●●●●● patch | view | raw | blame | history
xdgnjobs/ximple-spatialjob/src/main/resources/conf/DefaultConvertShpFilter.xml 287 ●●●●● patch | view | raw | blame | history 
 xdgnjobs/ximple-jobcarrier/pom.xml


@@ -314,7 +314,8 @@


      <plugin>


        <groupId>com.ximple.eofms.maven</groupId>


        <artifactId>ximple-jar-collector</artifactId>


        <version>${project.version}</version>


        <!--version>${project.version}</version-->


          <version>2.1.1</version>


        <executions>


          <execution>


            <goals>




 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/OracleConvertPostGISJobContext.java


@@ -1,20 +1,5 @@


package com.ximple.eofms.jobs.context.postgis;




import java.io.File;


import java.io.IOException;


import java.io.UnsupportedEncodingException;


import java.net.MalformedURLException;


import java.net.URL;


import java.sql.BatchUpdateException;


import java.sql.Connection;


import java.sql.DriverManager;


import java.sql.PreparedStatement;


import java.sql.SQLException;


import java.sql.Statement;


import java.util.ArrayList;


import java.util.HashMap;


import java.util.Iterator;




import com.vividsolutions.jts.geom.Geometry;


import com.vividsolutions.jts.util.Assert;


import com.ximple.eofms.filter.AbstractFLinkageDispatchableFilter;


@@ -40,6 +25,16 @@


import org.postgresql.util.PSQLException;


import org.quartz.JobExecutionContext;


import org.xml.sax.SAXException;




import java.io.File;


import java.io.IOException;


import java.io.UnsupportedEncodingException;


import java.net.MalformedURLException;


import java.net.URL;


import java.sql.*;


import java.util.ArrayList;


import java.util.HashMap;


import java.util.Iterator;




public class OracleConvertPostGISJobContext extends AbstractOracleToPostGISJobContext


    implements CreateFeatureTypeEventListener {


@@ -254,7 +249,7 @@


                    batchCount++;


                }




                int[] numUpdates = pstmt.executeBatch();


                int[] numUpdates = pstmt.executeBatch();        //error @ undefined colums


                for (int i = 0; i < numUpdates.length; i++) {


                    if (numUpdates[i] == -2)


                        logger.warn("Execution " + i + ": unknown number of rows updated");


@@ -272,9 +267,13 @@


            JDBCUtils.close(conn, Transaction.AUTO_COMMIT, e);


            logger.error(e.getMessage(), e);


            SQLException ex;


            while ((ex = e.getNextException()) != null) {


            String sTemp="";


            while ((ex = e.getNextException()) != null) {  //infite?!


                // logger.warn(ex.getMessage(), ex);


                if(sTemp.equals(ex.getMessage()))


                    break;


                logger.warn(ex.getMessage());


                sTemp=  ex.getMessage();


            }


        } catch (SQLException e) {


            JDBCUtils.close(conn, Transaction.AUTO_COMMIT, e);




 xdgnjobs/ximple-spatialjob/src/main/resources/conf/DefaultConvertShpFilter.xml


@@ -48,6 +48,16 @@


      </elementCriterion>


      <TextCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-106.C-99">


        <tid>106</tid>


        <cid>99</cid>


        <description>註記文字</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>


  <TypeCompFilter name="FSC-402.C-0">


    <tid>402</tid>


    <cid>0</cid>


@@ -117,7 +127,7 @@


  </TypeCompFilter>


  <TypeCompFilter name="FSC-411.C-4">


    <tid>411</tid>


    <cid>3</cid>


        <cid>4</cid>


    <description>低壓系統圖-配電室座標註記</description>


    <elementCriterion>


      <elementType>17</elementType>


@@ -163,6 +173,28 @@


    </elementCriterion>


    <SymbolCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-411.C-99">


        <tid>411</tid>


        <cid>99</cid>


        <description>註記文字</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>




    <TypeCompFilter name="FSC-416.C-0">


        <tid>416</tid>


        <cid>0</cid>


        <description>直接接管戶</description>


        <elementCriterion>




            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>




  <TypeCompFilter name="FSC-417.C-0">


    <tid>417</tid>


    <cid>0</cid>


@@ -181,6 +213,24 @@


    </elementCriterion>


    <TextCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-417.C-2">


        <tid>417</tid>


        <cid>2</cid>


        <description>共溝投料口</description>


        <elementCriterion>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>


    <TypeCompFilter name="FSC-417.C-3">


        <tid>417</tid>


        <cid>3</cid>


        <description>共溝投料口</description>


        <elementCriterion>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>


  <TypeCompFilter name="FSC-419.C-0">


    <tid>419</tid>


    <cid>0</cid>


@@ -194,6 +244,15 @@


    <tid>419</tid>


    <cid>1</cid>


    <description>連接孔圖號座標</description>


        <elementCriterion>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>


    <TypeCompFilter name="FSC-419.C-2">


        <tid>419</tid>


        <cid>2</cid>


        <description>聯接孔</description>


    <elementCriterion>


      <elementType>17</elementType>


    </elementCriterion>


@@ -321,6 +380,7 @@


    <cid>0</cid>


    <description>文字註記</description>


    <elementCriterion>


            <elementType>7</elementType>


      <elementType>17</elementType>


    </elementCriterion>


    <TextCreateStrategy/>


@@ -436,6 +496,17 @@


    </elementCriterion>


    <TextCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-407.C-99">


        <tid>407</tid>


        <cid>99</cid>


        <description>註記文字</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>




  <TypeCompFilter name="FSC-114.C-0">


    <tid>114</tid>


    <cid>0</cid>


@@ -569,6 +640,17 @@


    </elementCriterion>


    <SymbolCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-120.C-99">


        <tid>120</tid>


        <cid>99</cid>


        <description>註記文字</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>




  <TypeCompFilter name="FSC-150.C-0">


    <tid>150</tid>


    <cid>0</cid>


@@ -817,6 +899,17 @@


    </elementCriterion>


    <TextCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-140.C-99">


        <tid>140</tid>


        <cid>99</cid>


        <description>註記文字</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>




  <TypeCompFilter name="FSC-151.C-0">


    <tid>150</tid>


    <cid>0</cid>


@@ -836,6 +929,17 @@


    </elementCriterion>


    <SymbolCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-200.C-99">


        <tid>200</tid>


        <cid>99</cid>


        <description>註記文字</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>




  <!-- *****低壓****** -->


  <TypeCompFilter name="FSC-201.C-0">


    <tid>201</tid>


@@ -868,6 +972,16 @@


    </elementCriterion>


    <TextCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-201.C-3">


        <tid>201</tid>


        <cid>3</cid>


        <description>描線符號</description>


        <elementCriterion>


            <elementType>4</elementType>


            <elementType>12</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>


  <TypeCompFilter name="FSC-202.C-0">


    <tid>202</tid>


    <cid>0</cid>


@@ -887,6 +1001,17 @@


    </elementCriterion>


    <TextCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-202.C-99">


        <tid>202</tid>


        <cid>99</cid>


        <description>註記文字</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>




  <TypeCompFilter name="FSC-203.C-0">


    <tid>203</tid>


    <cid>0</cid>


@@ -900,6 +1025,16 @@


    <tid>203</tid>


    <cid>1</cid>


    <description>路燈責任分界點註記</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>


    <TypeCompFilter name="FSC-203.C-99">


        <tid>203</tid>


        <cid>99</cid>


        <description>註記文字</description>


    <elementCriterion>


      <elementType>7</elementType>


      <elementType>17</elementType>


@@ -1011,6 +1146,16 @@


    </elementCriterion>


    <SymbolCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-208.C-99">


        <tid>208</tid>


        <cid>99</cid>


        <description>註記文字</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>


  <TypeCompFilter name="FSC-209.C-0">


    <tid>209</tid>


    <cid>0</cid>


@@ -1024,6 +1169,16 @@


    <tid>209</tid>


    <cid>1</cid>


    <description>低壓交通號誌註記</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>


    <TypeCompFilter name="FSC-209.C-99">


        <tid>209</tid>


        <cid>99</cid>


        <description>註記文字</description>


    <elementCriterion>


      <elementType>7</elementType>


      <elementType>17</elementType>


@@ -1170,6 +1325,16 @@


    </elementCriterion>


    <TextCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-214.C-0">


        <tid>214</tid>


        <cid>0</cid>


        <description>導線交叉</description>


        <elementCriterion>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>




  <TypeCompFilter name="FSC-215.C-0">


    <tid>215</tid>


    <cid>0</cid>


@@ -1216,6 +1381,25 @@


      <elementType>17</elementType>


    </elementCriterion>


    <SymbolCreateStrategy/>


    </TypeCompFilter>


    <TypeCompFilter name="FSC-218.C-0">


        <tid>218</tid>


        <cid>0</cid>


        <description>用互受電設備</description>


        <elementCriterion>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>


    <TypeCompFilter name="FSC-218.C-1">


        <tid>218</tid>


        <cid>1</cid>


        <description>用戶受電設備字型</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


  </TypeCompFilter>


  <!-- 光纜 -->


  <TypeCompFilter name="FSC-300.C-0">


@@ -1267,6 +1451,16 @@


    </elementCriterion>


    <SymbolCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-300.C-99">


        <tid>300</tid>


        <cid>99</cid>


        <description>註記文字</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>


  <TypeCompFilter name="FSC-301.C-0">


    <tid>301</tid>


    <cid>0</cid>


@@ -1296,6 +1490,16 @@


    </elementCriterion>


    <TextCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-304.C-0">


        <tid>304</tid>


        <cid>99</cid>


        <description>導線交叉</description>


        <elementCriterion>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>




  <TypeCompFilter name="FSC-999.C-0">


    <tid>999</tid>


    <cid>0</cid>


@@ -1381,6 +1585,16 @@


    </elementCriterion>


    <TextCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-403.C-99">


        <tid>403</tid>


        <cid>99</cid>


        <description>註記文字</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>


  <TypeCompFilter name="FSC-401.C-0">


    <tid>401</tid>


    <cid>0</cid>


@@ -1422,6 +1636,16 @@


    </elementCriterion>


    <TextCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-401.C-4">


        <tid>401</tid>


        <cid>4</cid>


        <description>沒標註</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>


  <TypeCompFilter name="FSC-401.C-5">


    <tid>401</tid>


    <cid>5</cid>


@@ -1430,6 +1654,16 @@


      <elementType>17</elementType>


    </elementCriterion>


    <SymbolCreateStrategy/>


    </TypeCompFilter>


    <TypeCompFilter name="FSC-401.C-99">


        <tid>401</tid>


        <cid>99</cid>


        <description>註記文字</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


  </TypeCompFilter>


  <TypeCompFilter name="FSC-302.C-0">


    <tid>302</tid>


@@ -1505,6 +1739,16 @@


    </elementCriterion>


    <SymbolCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-307.C-99">


        <tid>307</tid>


        <cid>99</cid>


        <description>註記文字</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>


  <TypeCompFilter name="FSC-308.C-0">


    <tid>308</tid>


    <cid>0</cid>


@@ -1514,6 +1758,26 @@


    </elementCriterion>


    <SymbolCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-310.C-0">


        <tid>310</tid>


        <cid>0</cid>


        <description>交指燈</description>


        <elementCriterion>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>


    <TypeCompFilter name="FSC-310.C-1">


        <tid>310</tid>


        <cid>1</cid>


        <description>盞數</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>




  <TypeCompFilter name="FSC-311.C-0">


    <tid>311</tid>


    <cid>0</cid>


@@ -1701,6 +1965,17 @@


      </elementCriterion>


      <LineCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-110.C-99">


        <tid>110</tid>


        <cid>99</cid>


        <description>註記文字</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>




  <TypeCompFilter name="FSC-323.C-0">


    <tid>323</tid>


    <cid>0</cid>


@@ -1738,6 +2013,16 @@


    </elementCriterion>


    <SymbolCreateStrategy/>


  </TypeCompFilter>


    <TypeCompFilter name="FSC-312.C-99">


        <tid>312</tid>


        <cid>99</cid>


        <description>註記文字</description>


        <elementCriterion>


            <elementType>7</elementType>


            <elementType>17</elementType>


        </elementCriterion>


        <TextCreateStrategy/>


    </TypeCompFilter>


  <TypeCompFilter name="FSC-313.C-1">


    <tid>313</tid>


    <cid>1</cid>