From d98a6388291a1027a24a479c4b82bbfc5caaf14f Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Mon, 19 May 2008 14:37:18 +0800
Subject: [PATCH] update for EOFM-92
---
xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml | 6 +++---
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/IndexDgnConvertJobContext.java | 32 +++++++++++++++++---------------
2 files changed, 20 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 19b6e62..0997e76 100644
--- a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
+++ b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
@@ -42,15 +42,15 @@
</entry>
<entry>
<key>ORGSCHEMA</key>
- <value>CMMS_SPATIALDB</value>
+ <value>SPATIALDB, CMMS_SPATIALDB</value>
</entry>
<entry>
<key>CONVERTDB</key>
- <value>true</value>
+ <value>false</value>
</entry>
<entry>
<key>CONVERTFILE</key>
- <value>false</value>
+ <value>true</value>
</entry>
<entry>
<key>ELEMLOG</key>
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/IndexDgnConvertJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/IndexDgnConvertJobContext.java
index 8865474..98a9d45 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/IndexDgnConvertJobContext.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/IndexDgnConvertJobContext.java
@@ -51,8 +51,10 @@
private HashMap<String, FeatureWriter> featuresWriterContext = new HashMap<String, FeatureWriter>();
private PessimisticMapWrapper txFeaturesContext;
+ private FeatureTypeBuilder typeBuilder2 = null;
private FeatureTypeBuilder typeBuilder = null;
private FeatureType featureType = null;
+ private FeatureType featureType2 = null;
public IndexDgnConvertJobContext(String dataPath)
{
@@ -214,20 +216,20 @@
public FeatureType createFeatureElement2(String featureName) throws SchemaException
{
- if (typeBuilder == null)
+ if (typeBuilder2 == null)
{
- typeBuilder = FeatureTypeBuilder.newInstance(featureName);
- typeBuilder.addType(AttributeTypeFactory.newAttributeType("GEOM", Geometry.class));
- typeBuilder.addType(AttributeTypeFactory.newAttributeType("SYMCOLOR", String.class));
- typeBuilder.addType(AttributeTypeFactory.newAttributeType("SYMWEIGHT", Integer.class));
- typeBuilder.addType(AttributeTypeFactory.newAttributeType("SYMSTYLE", Integer.class));
- typeBuilder.addType(AttributeTypeFactory.newAttributeType("JUST", Integer.class));
- typeBuilder.addType(AttributeTypeFactory.newAttributeType("HEIGHT", Double.class));
- typeBuilder.addType(AttributeTypeFactory.newAttributeType("WIDTH", Double.class));
- typeBuilder.addType(AttributeTypeFactory.newAttributeType("ANGLE", Double.class));
- typeBuilder.addType(AttributeTypeFactory.newAttributeType("TPCID", String.class));
+ typeBuilder2 = FeatureTypeBuilder.newInstance(featureName);
+ typeBuilder2.addType(AttributeTypeFactory.newAttributeType("GEOM", Geometry.class));
+ typeBuilder2.addType(AttributeTypeFactory.newAttributeType("SYMCOLOR", String.class));
+ typeBuilder2.addType(AttributeTypeFactory.newAttributeType("SYMWEIGHT", Integer.class));
+ typeBuilder2.addType(AttributeTypeFactory.newAttributeType("SYMSTYLE", Integer.class));
+ typeBuilder2.addType(AttributeTypeFactory.newAttributeType("JUST", Integer.class));
+ typeBuilder2.addType(AttributeTypeFactory.newAttributeType("HEIGHT", Double.class));
+ typeBuilder2.addType(AttributeTypeFactory.newAttributeType("WIDTH", Double.class));
+ typeBuilder2.addType(AttributeTypeFactory.newAttributeType("ANGLE", Double.class));
+ typeBuilder2.addType(AttributeTypeFactory.newAttributeType("TPCID", String.class));
}
- return typeBuilder.getFeatureType();
+ return typeBuilder2.getFeatureType();
}
public Feature createFeature(FeatureType featureType, Element element) throws IllegalAttributeException
@@ -304,7 +306,7 @@
private Feature createFeature2(TextElement element) throws SchemaException, IllegalAttributeException
{
- if (featureType == null)
+ if (featureType2 == null)
{
String dgnname = getFilename().toLowerCase();
int i = dgnname.lastIndexOf(".");
@@ -313,9 +315,9 @@
dgnname = dgnname.substring(0, i);
}
dgnname = dgnname + "P";
- featureType = createFeatureElement2(dgnname);
+ featureType2 = createFeatureElement2(dgnname);
}
- return createFeature2(featureType, element);
+ return createFeature2(featureType2, element);
}
protected FrammeAttributeData getFeatureLinkage(Element element)
--
Gitblit v0.0.0-SNAPSHOT