From 94f090e8965c95af2a1a058312690e7ab19eec83 Mon Sep 17 00:00:00 2001
From: Dennis Kao <ulysseskao@gmail.com>
Date: Wed, 15 Jan 2014 11:26:28 +0800
Subject: [PATCH] update color table with compid = 0
---
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
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 14537f2..9bbfe1c 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
@@ -90,7 +90,7 @@
public static final String NONFLOW_MARK = "shape://slash";
private static String FETCH_CONNFDR = "SELECT FSC, UFID, FDR1, DIR FROM BASEDB.CONNECTIVITY ORDER BY FSC";
- private static String FETCH_COLORTAB = "SELECT TAG_SFSC, TAG_LUFID, COLOR FROM OCSDB.COLOR ORDER BY TAG_SFSC";
+ private static String FETCH_COLORTAB = "SELECT TAG_SFSC, TAG_LUFID, COLOR FROM OCSDB.COLOR WHERE TAG_BCOMPID = 0 ORDER BY TAG_SFSC";
private static String CREATE_OWNERTABLE = "CREATE TABLE s (tid smallint not null, oid int not null, owner smallint not null)";
private static String CREATE_COLORTABLE = "CREATE TABLE s (tid smallint not null, oid int not null, dyncolor varchar(10) not null)";
@@ -1744,7 +1744,10 @@
long oid = rs.getLong(2);
int colorId = rs.getInt(3);
String colorText = colorTable.getColorCode(colorId);
-
+ if (cid > Short.MAX_VALUE) {
+ logger.info("Wrong Color Table:" + cid + "-" + oid);
+ continue;
+ }
sb.append(cid).append(',');
sb.append(oid).append(',');
sb.append(colorText).append("\n");
@@ -1830,6 +1833,11 @@
flowMark = UNFLOW_MARK;
}
+ if (cid > Short.MAX_VALUE) {
+ logger.info("Wrong Connectivity Table:" + cid + "-" + oid);
+ continue;
+ }
+
sb.append(cid).append(',');
sb.append(oid).append(',');
sb.append(ownerId).append(',');
--
Gitblit v0.0.0-SNAPSHOT