@@ -1019,10 +1019,10 @@ static void osFilteritem(layerObj *layer, int function, char *query_str, size_t
1019
1019
else
1020
1020
strlcat ( query_str , " AND " , size );
1021
1021
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); */
1024
1024
/* snprintf (query_str + strlen(query_str), " %s = ", layer->filteritem); */
1025
- }
1025
+ /* } */
1026
1026
1027
1027
snprintf (query_str + strlen (query_str ), size - strlen (query_str ), " %s " , layer -> filter .native_string );
1028
1028
/* snprintf(buffer, n, "gfdg %s %s %s", layer->filter.native_string, (layer->filteritem != NULL ? layer->filteritem : ""), ); */
@@ -2945,17 +2945,17 @@ msOracleSpatialGetFieldDefn( layerObj *layer,
2945
2945
}
2946
2946
2947
2947
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 )
2949
2949
msInsertHashTable (& (layer -> metadata ), md_item_name , gml_type );
2950
2950
2951
2951
snprintf ( md_item_name , sizeof (md_item_name ), "gml_%s_width" , item );
2952
2952
if ( strlen (gml_width ) > 0
2953
- && msOWSLookupMetadata (& (layer -> metadata ), "G" , "width" ) == NULL )
2953
+ && msOWSLookupMetadata (& (layer -> metadata ), "G" , "width" ) == 0 )
2954
2954
msInsertHashTable (& (layer -> metadata ), md_item_name , gml_width );
2955
2955
2956
2956
snprintf ( md_item_name , sizeof (md_item_name ), "gml_%s_precision" ,item );
2957
2957
if ( strlen (gml_precision ) > 0
2958
- && msOWSLookupMetadata (& (layer -> metadata ), "G" , "precision" )== NULL )
2958
+ && msOWSLookupMetadata (& (layer -> metadata ), "G" , "precision" )== 0 )
2959
2959
msInsertHashTable (& (layer -> metadata ), md_item_name , gml_precision );
2960
2960
}
2961
2961
0 commit comments