Changeset 301

Timestamp:

06/19/10 15:37:24 (20 months ago)

Author:

ol

Message:

Handle user error message, when Transaction or Get Feature? on unkown layer, rather than assert crash. now pgsql_id_column function could return NULL value

Location:

trunk/src

Files:

• fe/fe_filter.c (modified) (2 diffs)
• ows/ows_psql.c (modified) (1 diff)
• wfs/wfs_describe.c (modified) (4 diffs)
• wfs/wfs_transaction.c (modified) (1 diff)

trunk/src/fe/fe_filter.c

@@ -380 +380 @@
 
             /* if there is no id column, raise an error */
-            if (id_name->use == 0) {
+            if (!id_name || id_name->use == 0) {
                 fe->error_code = FE_ERROR_FEATUREID;
                 list_free(fe_list);
@@ -542 +542 @@
 
     id_name = ows_psql_id_column(o, layer_name);
-
-    if (id_name->use == 0) return where;
+    if (!id_name || id_name->use == 0) return where;
 
     buffer_add_str(where, " WHERE ");

trunk/src/ows/ows_psql.c

@@ -49 +49 @@
             return ln->layer->storage->pkey;
 
-    assert(0); /* Should not happen */
     return NULL;
 }

trunk/src/wfs/wfs_describe.c

@@ -58 +58 @@
     table = ows_psql_describe_table(o, layer_name);
 
+    assert(id_name != NULL);
     assert(table != NULL);
 
@@ -237 +238 @@
         buffer_copy(schema, namespace);
         buffer_add_str(schema, "' schemaLocation='");
+
+#if 0
+    buffer_copy(schema, o->schema_dir);
+    buffer_add_str(schema, "tows/");
+    buffer_copy(schema, elemt->value);
+#endif
+
+
+#if 1
         buffer_copy(schema, o->online_resource);
 
@@ -255 +265 @@
         else
             buffer_add_str(schema, "&version=1.1.0");
+#endif
 
         buffer_add_str(schema, "'/>\n");
@@ -263 +274 @@
     list_free(layers);
 
+#if 0
+fprintf(stderr, "\n%s\n", schema->buf);
+#endif
+
     return schema;
 }

trunk/src/wfs/wfs_transaction.c

@@ -391 +391 @@
 
         id_column = ows_psql_id_column(o, layer_name);
+        if (!id_column) {
+             buffer_free(id);
+             buffer_free(sql);
+             buffer_free(handle);
+             buffer_free(values);
+             buffer_free(layer_name);
+             result = buffer_init();
+             buffer_add_str(result, "Error unknown Layer Name");
+             return result;
+        }
         layer_prefix = ows_layer_prefix(o->layers, layer_name);