Skip to content

Commit b1604a7

Browse files
msmitherdctbonfort
authored andcommitted
Oraclespatial: remove filteritem (RFC91) (#5229)
Remove addition of filteritem to sql since its being added via the filter translation processes
1 parent c71a4f3 commit b1604a7

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

maporaclespatial.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -1019,10 +1019,10 @@ static void osFilteritem(layerObj *layer, int function, char *query_str, size_t
10191019
else
10201020
strlcat( query_str, " AND ", size);
10211021

1022-
if (layer->filteritem != NULL) {
1023-
snprintf (query_str + strlen(query_str), size-strlen(query_str), " %s = ", layer->filteritem);
1022+
/* if (layer->filteritem != NULL) {
1023+
snprintf (query_str + strlen(query_str), size-strlen(query_str), " %s = ", layer->filteritem); */
10241024
/* snprintf (query_str + strlen(query_str), " %s = ", layer->filteritem); */
1025-
}
1025+
/* } */
10261026

10271027
snprintf (query_str + strlen(query_str), size-strlen(query_str), " %s ", layer->filter.native_string);
10281028
/* snprintf(buffer, n, "gfdg %s %s %s", layer->filter.native_string, (layer->filteritem != NULL ? layer->filteritem : ""), ); */
@@ -2945,17 +2945,17 @@ msOracleSpatialGetFieldDefn( layerObj *layer,
29452945
}
29462946

29472947
snprintf( md_item_name, sizeof(md_item_name), "gml_%s_type", item );
2948-
if( msOWSLookupMetadata(&(layer->metadata), "G", "type") == NULL )
2948+
if( msOWSLookupMetadata(&(layer->metadata), "G", "type") == 0 )
29492949
msInsertHashTable(&(layer->metadata), md_item_name, gml_type );
29502950

29512951
snprintf( md_item_name, sizeof(md_item_name), "gml_%s_width", item );
29522952
if( strlen(gml_width) > 0
2953-
&& msOWSLookupMetadata(&(layer->metadata), "G", "width") == NULL )
2953+
&& msOWSLookupMetadata(&(layer->metadata), "G", "width") == 0 )
29542954
msInsertHashTable(&(layer->metadata), md_item_name, gml_width );
29552955

29562956
snprintf( md_item_name, sizeof(md_item_name), "gml_%s_precision",item );
29572957
if( strlen(gml_precision) > 0
2958-
&& msOWSLookupMetadata(&(layer->metadata), "G", "precision")==NULL )
2958+
&& msOWSLookupMetadata(&(layer->metadata), "G", "precision")==0 )
29592959
msInsertHashTable(&(layer->metadata), md_item_name, gml_precision );
29602960
}
29612961

0 commit comments

Comments
 (0)