From d6730f9476e7313e33a08a1d6024e69ae1eda184 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Mon, 25 Aug 2008 14:45:21 +0800
Subject: [PATCH] update for EOFM-152
---
xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml | 8 +-------
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/TPCLIDConverter.java | 14 ++++++++------
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java | 2 +-
xdgnjobs/ximple-spatialjob/src/main/resources/conf/DefaultConvertShpFilter.xml | 2 +-
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java | 2 +-
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java | 2 +-
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java | 2 +-
7 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
index 8052c2d..5f1ee59 100644
--- a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
+++ b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
@@ -20,12 +20,6 @@
<key>JOBDATA_DIR</key>
<value>g:\temp\JobData</value>
</entry>
- <!--
- <entry>
- <key>ELMSFILTER_CONF</key>
- <value></value>
- </entry>
- -->
<entry>
<key>PGHOST</key>
<value>192.168.11.200</value>
@@ -40,7 +34,7 @@
</entry>
<entry>
<key>PGSCHEMA</key>
- <value>gisrepo1</value>
+ <value>public</value>
</entry>
<entry>
<key>PGUSER</key>
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java
index 58b6715..da4142a 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java
@@ -267,7 +267,7 @@
logger.warn(ex.getMessage(), ex);
throw new JobExecutionException("IO error. " + ex.getMessage(), ex);
}
- logger.info(jobName + " end at " + new Date());
+ logger.warn(jobName + " end at " + new Date());
}
/**
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java
index 8a1c243..0cbe537 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java
@@ -267,7 +267,7 @@
logger.warn(ex.getMessage(), ex);
throw new JobExecutionException("IO error. " + ex.getMessage(), ex);
}
- logger.info(jobName + " end at " + new Date());
+ logger.warn(jobName + " end at " + new Date());
}
/**
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java
index 3aa6279..c62f7c3 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java
@@ -272,7 +272,7 @@
throw new JobExecutionException("IO error. " + ex.getMessage(), ex);
}
updateRepoStatusToReady(targetSchemaName);
- logger.info(jobName + " end at " + new Date());
+ logger.warn(jobName + " end at " + new Date());
}
/**
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java
index 8d252b3..1feb7f8 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java
@@ -172,7 +172,7 @@
logger.warn(ex.getMessage(), ex);
throw new JobExecutionException("IO error. " + ex.getMessage(), ex);
}
- logger.info(jobName + " end at " + new Date());
+ logger.warn(jobName + " end at " + new Date());
}
/**
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/TPCLIDConverter.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/TPCLIDConverter.java
index a4989d8..2a45c96 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/TPCLIDConverter.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/TPCLIDConverter.java
@@ -5,8 +5,10 @@
public abstract class TPCLIDConverter
{
- private final static int SX1200 = 800;
- private final static int SY1200 = 500;
+ public final static int SX1200 = 800;
+ public final static int SY1200 = 500;
+ public final static int SX600 = 400;
+ public final static int SY600 = 250;
public static String CoordinateToTpclId(Coordinate dp)
{
@@ -26,7 +28,7 @@
String CoordToTPCLID = "";
- char mapID = CoordinateToSingleMapID(dp);
+ char mapID = coordinateToSingleMapID(dp);
if (mapID == 'w')
{
@@ -69,7 +71,7 @@
return CoordToTPCLID;
}
- public static char CoordinateToSingleMapID(Coordinate dp)
+ public static char coordinateToSingleMapID(Coordinate dp)
{
char mapID = 'w';
@@ -477,7 +479,7 @@
}
- private static int asciiToInt(String p1)
+ public static int asciiToInt(String p1)
{
if (p1.endsWith("A")) return 65;
if (p1.endsWith("B")) return 66;
@@ -509,7 +511,7 @@
}
- private static char intToAscii(int p1)
+ public static char intToAscii(int p1)
{
switch (p1)
{
diff --git a/xdgnjobs/ximple-spatialjob/src/main/resources/conf/DefaultConvertShpFilter.xml b/xdgnjobs/ximple-spatialjob/src/main/resources/conf/DefaultConvertShpFilter.xml
index 1233019..29fa2ae 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>
- <SymbolCreateStrategy/>
+ <MultiSymbolCreateStrategy/>
</TypeCompFilter>
<TypeCompFilter name="FSC-423.C-1">
<tid>423</tid>
--
Gitblit v0.0.0-SNAPSHOT