mxd2map: src/java/de/intevation/mxd/writer/MapScriptWriter.java comparison

Verify the SDE databse jointable attribute.

author	raimund renkert <raimund.renkert@intevation.de>
date	Wed, 20 Jul 2011 17:51:38 +0200
parents	c640fb351f66
children	cdbf2f2dca35

comparison

equal deleted inserted replaced

-:216105271856
+:5350621a0294
 "/mxd/file",
 XPathConstants.NODE);
 //Write the map attributes.
 writeMap();
 //Write the layers.
-writeLayer();
+	boolean ret = writeLayer();
 //Save the map.
-mapObj cloneMap = map.cloneMap();
+	if (ret) {
+mapObj cloneMap = map.cloneMap();
 cloneMap.save(mapFilename);
 logger.info("Mapfile created: " + mapFilename);
 return true;
+	}
+	return false;
 }
 /**
 * Create the map object and set the attributes.
 */
 }
 /**
 * Create layer objects and set the attributes.
 */
-private void writeLayer() {
+private boolean writeLayer() {
 logger.debug("writeLayer()");
 Element mapNode = (Element)XMLUtils.xpath(
 root,
 "/mxd/map",
 XPathConstants.NODE);
 ",SHAPE," +
 layerElement.getAttribute("version"));
 layer.setProcessing("CLOSE_CONNECTION=defer");
 layer.setProcessing("ATTRIBUTE_QUALIFIED=TRUE");
 if(layerElement.hasAttribute("join_table")) {
+		    String join = layerElement.getAttribute("join_table");
+		    if (join.indexOf(".") <= 0) {
+		    	logger.warn ("Incomplete join table in layer " +
+				     layerElement.getAttribute("name") +
+				     ". Aborting.");
+			return false;
+		    }
 layer.setProcessing(
 "JOINTABLE=" +
 layerElement.getAttribute("join_table"));
 layer.setFilter(
 "where " +
 }
 //Write classes.
 writeClass(layer, layerElement);
 }
+	return true;
 }
 /**
 * Adds the classes to the layer.
 * @param layer        Mapscript layer object.

Mercurial > mxd2map