update for EOFM-145

?? ?

2008-08-12 bdf4d5fa657539f8f4d8e565c5e5eb1d2b144004

 xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml

@@ -28,15 +28,15 @@
        -->
        <entry>
          <key>PGHOST</key>
          <value>192.168.11.119</value>
          <value>192.168.11.200</value>
        </entry>
        <entry>
          <key>PGDDATBASE</key>
          <value>xtpcgis</value>
          <value>tytpc</value>
        </entry>
        <entry>
          <key>PGPORT</key>
          <value>5432</value>
          <value>5442</value>
        </entry>
        <entry>
          <key>PGSCHEMA</key>
@@ -56,7 +56,7 @@
        </entry>
        <entry>
          <key>ORAINST</key>
          <value>nntpc</value>
          <value>tytpc</value>
        </entry>
        <entry>
          <key>ORAPORT</key>
@@ -80,7 +80,7 @@
        </entry>
        <entry>
          <key>CONVERTFILE</key>
          <value>true</value>
          <value>false</value>
        </entry>
        <entry>
          <key>CONVERTELEMIN</key>
@@ -108,7 +108,7 @@
        </entry>
        <entry>
          <key>COPYCONNECTIVITYMODE</key>
          <value>false</value>
          <value>true</value>
        </entry>
      </job-data-map>
    </job-detail>

 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java

@@ -310,9 +310,21 @@
        }
        Statement stmt = connection.createStatement();
        if (found)
        {
            stmt.execute(AbstractOracleJobContext.TRUNCATE_CONNECTIVITY_WEBCHECK);
        else
        } else {
            logger.info("Create CONNECTIVITY_WEBCHECK table.");
            stmt.execute(AbstractOracleJobContext.CREATE_CONNECTIVITY_WEBCHECK);
            stmt.execute(AbstractOracleJobContext.CREATE_CONNECTIVITY_WEBCHECK_INDEX_1);
            stmt.execute(AbstractOracleJobContext.CREATE_CONNECTIVITY_WEBCHECK_INDEX_2);
            stmt.execute(AbstractOracleJobContext.CREATE_CONNECTIVITY_WEBCHECK_INDEX_3);
            stmt.execute(AbstractOracleJobContext.CREATE_CONNECTIVITY_WEBCHECK_INDEX_4);
            stmt.execute(AbstractOracleJobContext.CREATE_CONNECTIVITY_WEBCHECK_INDEX_5);
            stmt.execute(AbstractOracleJobContext.CREATE_CONNECTIVITY_WEBCHECK_INDEX_6);
            stmt.execute(AbstractOracleJobContext.ALTER_CONNECTIVITY_WEBCHECK_1);
            stmt.execute(AbstractOracleJobContext.ALTER_CONNECTIVITY_WEBCHECK_2);
        }

        stmt.execute(AbstractOracleJobContext.COPY_CONNECTIVITY_TO_WEBCHECK);
        stmt.close();
    }

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

@@ -178,29 +178,51 @@
     */
    public static final String CONNECTIVITY_WEBCHECK_NAME = "CONNECTIVITY_WEBCHECK";
    public static final String TRUNCATE_CONNECTIVITY_WEBCHECK = "TRUNCATE TABLE BASEDB.CONNECTIVITY_WEBCHECK";
    public static final String CREATE_CONNECTIVITY_WEBCHECK = "CREATE TABLE BASEDB.CONNECTIVITY_WEBCHECK\n" +
            "( FSC      NUMBER(5) NOT NULL," +
            "  UFID     NUMBER(10) NOT NULL," +
            "  N1       NUMBER(10)," +
            "  N2       NUMBER(10)," +
            "  FDR1     NUMBER(5)," +
            "  FDR2     NUMBER(5)," +
            "  DIR      NUMBER(3)," +
            "  OHUG     NUMBER(3)," +
            "  OSTATUS  NUMBER(3)," +
            "  PHASE    NUMBER(3)," +
            "  X        NUMBER(10,3) NOT NULL," +
            "  Y        NUMBER(10,3) NOT NULL" +
            ")\n" +
            "TABLESPACE BASE_DATA PCTUSED 40 PCTFREE 10 INITRANS 1 MAXTRANS 255\n" +
            "STORAGE    (INITIAL 19120K MINEXTENTS 1 MAXEXTENTS 2147483645 \n" +
            "PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT )\n" +
            "LOGGING NOCOMPRESS NOCACHE NOPARALLEL MONITORING;";
    public static final String CREATE_CONNECTIVITY_WEBCHECK = "CREATE TABLE BASEDB.CONNECTIVITY_WEBCHECK (\n" +
            " \"FSC\"      NUMBER(5) NOT NULL," +
            " \"UFID\"     NUMBER(10) NOT NULL," +
            " \"N1\"       NUMBER(10)," +
            " \"N2\"       NUMBER(10)," +
            " \"FDR1\"     NUMBER(5)," +
            " \"FDR2\"     NUMBER(5)," +
            " \"DIR\"      NUMBER(3)," +
            " \"OHUG\"     NUMBER(3)," +
            " \"OSTATUS\"  NUMBER(3)," +
            " \"PHASE\"    NUMBER(3)," +
            " \"X\"        NUMBER(10,3) NOT NULL," +
            " \"Y\"        NUMBER(10,3) NOT NULL" +
            ")";


    public static final String COPY_CONNECTIVITY_TO_WEBCHECK = "INSERT /*+ APPEND */ INTO BASEDB.CONNECTIVITY_WEBCHECK\n" +
            "(FSC, UFID, N1, N2, FDR1, FDR2, DIR, OHUG,OSTATUS, PHASE, X, Y)\n" +
            "SELECT FSC, UFID, N1, N2, FDR1, FDR2, DIR, OHUG, OSTATUS, PHASE, X, Y FROM BASEDB.CONNECTIVITY ";

    public static final String CREATE_CONNECTIVITY_WEBCHECK_INDEX_1 =
            "CREATE INDEX BASEDB.CONNECTIVITY_FDR1_WEB ON BASEDB.CONNECTIVITY_WEBCHECK (FDR1)";

    public static final String CREATE_CONNECTIVITY_WEBCHECK_INDEX_2 =
            "CREATE INDEX BASEDB.CONNECTIVITY_FSCUFID_INDEX_WEB ON BASEDB.CONNECTIVITY_WEBCHECK (FSC, UFID)";

    public static final String CREATE_CONNECTIVITY_WEBCHECK_INDEX_3 =
            "CREATE INDEX BASEDB.CONNECTIVITY_N1TON2_WEB ON BASEDB.CONNECTIVITY_WEBCHECK (N1, N2)";

    public static final String CREATE_CONNECTIVITY_WEBCHECK_INDEX_4 =
            "CREATE INDEX BASEDB.CONNECTIVITY_N1_INDEX_WEB ON BASEDB.CONNECTIVITY_WEBCHECK (N1)";

    public static final String CREATE_CONNECTIVITY_WEBCHECK_INDEX_5 =
            "CREATE INDEX BASEDB.CONNECTIVITY_N2TON1_WEB ON BASEDB.CONNECTIVITY_WEBCHECK (N2, N1)";

    public static final String CREATE_CONNECTIVITY_WEBCHECK_INDEX_6 =
            "CREATE INDEX BASEDB.CONNECTIVITY_N2_INDEX_WEB ON BASEDB.CONNECTIVITY_WEBCHECK (N2)";

    public static final String ALTER_CONNECTIVITY_WEBCHECK_1 =
            "ALTER TABLE BASEDB.CONNECTIVITY_WEBCHECK ADD (\n" +
            "  CONSTRAINT CONNECT_UNI_WEB UNIQUE (FSC,UFID))";

    public static final String ALTER_CONNECTIVITY_WEBCHECK_2 =
            "ALTER TABLE BASEDB.CONNECTIVITY_WEBCHECK ADD (\n" +
            "  CONSTRAINT CONN_N1N2_WEB UNIQUE (N1,N2))";

    /**
     *