# HG changeset patch
# User vc11884admin@VC11884.win.bsh.de
# Date 1309881144 -7200
# Node ID d7c8493cb3454ef61df4dae1cb8912c8899c2dea
# Parent  f3a539ace2a446267fab25ba3a9695c75ba92435
Manage filter and expressions for sde layers.

diff -r f3a539ace2a4 -r d7c8493cb345 ChangeLog
--- a/ChangeLog	Tue Jul 05 17:22:03 2011 +0200
+++ b/ChangeLog	Tue Jul 05 17:52:24 2011 +0200
@@ -1,3 +1,9 @@
+2011-07-05  Raimund Renkert  <raimund.renkert@intevation.de>
+
+	* src/java/de/intevation/mxd/writer/MapScriptWriter.java:
+	  Write the layer filter attribute if a definition query exists in the
+	  mxd and set the database prefix to all expression elements.
+
 2011-07-05  Raimund Renkert  <raimund.renkert@intevation.de>
 
 	* src/java/de/intevation/mxd/writer/FillStyleWriter.java:
diff -r f3a539ace2a4 -r d7c8493cb345 src/java/de/intevation/mxd/writer/MapScriptWriter.java
--- a/src/java/de/intevation/mxd/writer/MapScriptWriter.java	Tue Jul 05 17:22:03 2011 +0200
+++ b/src/java/de/intevation/mxd/writer/MapScriptWriter.java	Tue Jul 05 17:52:24 2011 +0200
@@ -238,7 +238,13 @@
                 }
                 else {
                     prefix = layerElement.getAttribute("data_source");
+		    if(layerElement.hasAttribute("definition_query") &&
+		       !layerElement.getAttribute("definition_query").equals("")) {
+		        layer.setFilter("where " +
+		            layerElement.getAttribute("definition_query"));   
+		    }
                 }
+
             }
             layer.setTemplate("PleaseInsertAValidTemplateForGFI");
             //Write classes.
@@ -323,7 +329,7 @@
 		    else {
                         expression += " > " + ce.getAttribute("min_value");
 		    }
-                    expression += " AND [";
+                    expression += " AND [" + pre;
                     expression += ce.getAttribute("expression_field_0")+ "]";
                 }
                 expression += " " + ce.getAttribute("expression_operator");