[mapserver-commits] r7751 - trunk/mapserver

[svn at osgeo.org]

Author: Assefa
Date: 2008-06-26 14:36:15 -0400 (Thu, 26 Jun 2008)
New Revision: 7751

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapsde.c
Log:
processing option added to allow using fully qualified names for attributes (#2423)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-06-26 18:23:52 UTC (rev 7750)
+++ trunk/mapserver/HISTORY.TXT	2008-06-26 18:36:15 UTC (rev 7751)
@@ -12,6 +12,9 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- mapsde.c: processing option added to allow using fully qualified names
+  for attributes (#2423).           
+
 - mapsde.c: Test that for an active connection before closing it #2498
 
 - mapdraw.c: Fixed issue where path following lines were not being drawn if FORCEd. (#2600)

Modified: trunk/mapserver/mapsde.c
===================================================================
--- trunk/mapserver/mapsde.c	2008-06-26 18:23:52 UTC (rev 7750)
+++ trunk/mapserver/mapsde.c	2008-06-26 18:36:15 UTC (rev 7751)
@@ -272,7 +272,9 @@
     }
 
 
-    if (sde->join_table) {
+    proc_key = msLayerGetProcessingKey(layer,"ATTRIBUTE_QUALIFIED");
+    if (sde->join_table ||
+        (proc_key && strcasecmp( proc_key, "TRUE") == 0)) {
         strcat(full_column_name, sde->table);
         strcat(full_column_name, ".");
         strcat(full_column_name, column_name);
@@ -1832,6 +1834,8 @@
 /*    nBaseColumns = 0; */
 /*    nJoinColumns = 0; */
  
+    char *proc_key = NULL;
+
     if (!msSDELayerIsOpen(layer)) {
         msSetError( MS_SDEERR,
                     "SDE layer has not been opened.",
@@ -1947,7 +1951,10 @@
     } else {
        msDebug("layer->items has already been initialized!!!");
     }
-    if (!sde->join_table) {
+
+    proc_key = msLayerGetProcessingKey(layer,"ATTRIBUTE_QUALIFIED");
+    if (!sde->join_table && 
+        (proc_key == NULL ||  strcasecmp( proc_key, "TRUE") != 0)) {
         for(i=0; i<layer->numitems; i++) layer->items[i] = strdup(all_itemdefs[i].column_name);
         for(i=0; i<layer->numitems; i++) { /* requested columns */
             for(j=0; j<layer->numitems; j++) { /* all columns */