From d8e9f7b7ab68eb2598569f49568a65272c288e64 Mon Sep 17 00:00:00 2001
From: ulysseskao <ulysseskao@ximple.com.tw>
Date: Tue, 21 Jan 2014 10:31:14 +0800
Subject: [PATCH] log info add ufid

---
 xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml                                                            |   10 +++++-----
 xdgnjobs/ximple-jobcarrier/.gitignore                                                                                    |    1 +
 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/FeatureDgnConvertPostGISJobContext.java   |    4 +++-
 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/OracleIncrementPostGISJobContext.java     |    3 ++-
 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/OracleConvertPostGISJobContext.java       |    6 ++++--
 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/IndexDgnConvertPostGISJobContext.java     |    3 ++-
 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/DummyFeatureConvertPostGISJobContext.java |    4 +++-
 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/DummyFeatureConvertJobContext.java                        |    4 +++-
 8 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/xdgnjobs/ximple-jobcarrier/.gitignore b/xdgnjobs/ximple-jobcarrier/.gitignore
index b83d222..1ae0a1b 100644
--- a/xdgnjobs/ximple-jobcarrier/.gitignore
+++ b/xdgnjobs/ximple-jobcarrier/.gitignore
@@ -1 +1,2 @@
 /target/
+/xjobcarrier.log
diff --git a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
index 03e3128..dd4907a 100644
--- a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
+++ b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
@@ -35,11 +35,11 @@
       <job-data-map>
         <entry>
           <key>JOBDATA_DIR</key>
-          <value>/home/ulysseskao/projects/xgeodmms/xjobrun/nstpcjobs/jobdata</value>
+          <value>/home/ulysseskao/projects/xgeodmms/xjobrun/nntpcjobs/jobdata</value>
         </entry>
         <entry>
           <key>PGHOST</key>
-          <value>10.10.1.9</value>
+          <value>10.10.1.7</value>
         </entry>
         <entry>
           <key>PGDATBASE</key>
@@ -63,7 +63,7 @@
         </entry>
         <entry>
           <key>ORAHOST</key>
-          <value>10.10.1.9</value>
+          <value>10.10.1.7</value>
         </entry>
         <entry>
           <key>ORAINST</key>
@@ -88,7 +88,7 @@
         </entry>
         <entry>
           <key>CONVERTDB</key>
-          <value>false</value>
+          <value>true</value>
         </entry>
         <entry>
           <key>CONVERTFILE</key>
@@ -96,7 +96,7 @@
         </entry>
         <entry>
           <key>CONVERTELEMIN</key>
-          <value>false</value>
+          <value>true</value>
         </entry>
         <entry>
           <key>CONVERTPWTHEMES</key>
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/DummyFeatureConvertJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/DummyFeatureConvertJobContext.java
index 394509b..2dcc60a 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/DummyFeatureConvertJobContext.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/DummyFeatureConvertJobContext.java
@@ -108,7 +108,9 @@
                 AbstractFLinkageDispatchableFilter.getFeatureLinkage(element);
             logger.warn("Unknown Element:" + element.getElementType().toString() +
                 ":type=" + element.getType() + ":lv=" + element.getLevelIndex() + ":id=" +
-                (linkage == null ? "NULL" : "FSC=" + (linkage.getFsc() + "|COMPID=" + linkage.getComponentID())));
+                    (linkage == null ? "NULL" : "FSC=" + (linkage.getFsc() + "|UFID=" + linkage.getUfid() +
+                            "|COMPID=" + linkage.getComponentID())));
+
             if (element instanceof ComplexElement) {
                 ComplexElement complex = (ComplexElement) element;
                 logger.warn("----Complex Element size=" + complex.size());
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/DummyFeatureConvertPostGISJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/DummyFeatureConvertPostGISJobContext.java
index ca42eda..f86d4cb 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/DummyFeatureConvertPostGISJobContext.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/DummyFeatureConvertPostGISJobContext.java
@@ -107,7 +107,9 @@
                 AbstractFLinkageDispatchableFilter.getFeatureLinkage(element);
             logger.warn("Unknown Element:" + element.getElementType().toString() +
                 ":type=" + element.getType() + ":lv=" + element.getLevelIndex() + ":id=" +
-                (linkage == null ? "NULL" : "FSC=" + (linkage.getFsc() + "|COMPID=" + linkage.getComponentID())));
+                    (linkage == null ? "NULL" : "FSC=" + (linkage.getFsc() + "|UFID=" + linkage.getUfid() +
+                            "|COMPID=" + linkage.getComponentID())));
+
             if (element instanceof ComplexElement) {
                 ComplexElement complex = (ComplexElement) element;
                 logger.warn("----Complex Element size=" + complex.size());
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/FeatureDgnConvertPostGISJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/FeatureDgnConvertPostGISJobContext.java
index 69241cf..3539a99 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/FeatureDgnConvertPostGISJobContext.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/FeatureDgnConvertPostGISJobContext.java
@@ -100,7 +100,9 @@
                 AbstractFLinkageDispatchableFilter.getFeatureLinkage(element);
             logger.warn("Unknown Element:" + element.getElementType().toString() +
                 ":type=" + element.getType() + ":lv=" + element.getLevelIndex() + ":id=" +
-                (linkage == null ? "NULL" : "FSC=" + (linkage.getFsc() + "|COMPID=" + linkage.getComponentID())));
+                (linkage == null ? "NULL" : "FSC=" + (linkage.getFsc() + "|UFID=" + linkage.getUfid() +
+                        "|COMPID=" + linkage.getComponentID())));
+
             if (element instanceof ComplexElement) {
                 ComplexElement complex = (ComplexElement) element;
                 logger.warn("----Complex Element size=" + complex.size());
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/IndexDgnConvertPostGISJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/IndexDgnConvertPostGISJobContext.java
index 8c612ca..3dc991a 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/IndexDgnConvertPostGISJobContext.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/IndexDgnConvertPostGISJobContext.java
@@ -137,7 +137,8 @@
             } else {
                 Coordinate pt = polygon.getEnvelopeInternal().centre();
                 String id = TPCLIDConverter.CoordinateToTpclId(pt);
-                logger.info("cannot craete feature. " + element.toString() + "'" +
+
+                logger.info("cannot craete feature. type=" + element.getElementType() + "'" +
                     id + "'- from pt=" + pt);
             }
             return;
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/OracleConvertPostGISJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/OracleConvertPostGISJobContext.java
index 46ebe1f..f6a8741 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/OracleConvertPostGISJobContext.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/OracleConvertPostGISJobContext.java
@@ -122,7 +122,8 @@
                 AbstractFLinkageDispatchableFilter.getFeatureLinkage(element);
             logger.warn("Unknown Element:" + element.getElementType().toString() +
                 ":type=" + element.getType() + ":lv=" + element.getLevelIndex() + ":id=" +
-                (linkage == null ? "NULL" : "FSC=" + (linkage.getFsc() + "|COMPID=" + linkage.getComponentID())));
+                    (linkage == null ? "NULL" : "FSC=" + (linkage.getFsc() + "|UFID=" + linkage.getUfid() +
+                            "|COMPID=" + linkage.getComponentID())));
 
             if (element instanceof ComplexElement) {
                 ComplexElement complex = (ComplexElement) element;
@@ -144,7 +145,8 @@
                 AbstractFLinkageDispatchableFilter.getFeatureLinkage(element);
             logger.warn("Empty Geom Element:" + element.getElementType().toString() +
                 ":type=" + element.getType() + ":lv=" + element.getLevelIndex() + ":id=" +
-                (linkage == null ? "NULL" : (linkage.getFsc() + "|" + linkage.getComponentID())));
+                (linkage == null ? "NULL" : (linkage.getFsc() + "|" + linkage.getUfid() + "|" +
+                                             linkage.getComponentID())));
 
             if (element instanceof ComplexElement) {
                 ComplexElement complex = (ComplexElement) element;
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/OracleIncrementPostGISJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/OracleIncrementPostGISJobContext.java
index 524976b..0a1f1c3 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/OracleIncrementPostGISJobContext.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/OracleIncrementPostGISJobContext.java
@@ -156,7 +156,8 @@
                 AbstractFLinkageDispatchableFilter.getFeatureLinkage(element);
             logger.warn("Unknown Element:" + element.getElementType().toString() +
                 ":type=" + element.getType() + ":lv=" + element.getLevelIndex() + ":id=" +
-                (linkage == null ? "NULL" : "FSC=" + (linkage.getFsc() + "|COMPID=" + linkage.getComponentID())));
+                (linkage == null ? "NULL" : "FSC=" + (linkage.getFsc() + "|UFID=" + linkage.getUfid() +
+                        "|COMPID=" + linkage.getComponentID())));
 
             if (element instanceof ComplexElement) {
                 ComplexElement complex = (ComplexElement) element;

--
Gitblit v0.0.0-SNAPSHOT