Changeset 195 for src/ows/ows_config.c

Timestamp:

01/21/10 22:19:43 (2 years ago)

Author:

ol

Message:

Use PostGIS 1.5 GeomFromGML to parse GML instead of TinyOWS one. Add check_schema and check_valid_geom config properties to allow to bypass schema and is_valid check, cf #44.

Files:

• src/ows/ows_config.c (modified) (4 diffs)

src/ows/ows_config.c

@@ -42 +42 @@
 
     a = xmlTextReaderGetAttribute(r, (xmlChar *) "online_resource");
-
     if (a != NULL) {
         o->online_resource = buffer_init();
@@ -50 +49 @@
 
     a = xmlTextReaderGetAttribute(r, (xmlChar *) "schema_dir");
-
     if (a != NULL) {
         o->schema_dir = buffer_init();
@@ -58 +56 @@
 
     a = xmlTextReaderGetAttribute(r, (xmlChar *) "log");
-
     if (a != NULL) {
         o->log = buffer_init();
@@ -66 +63 @@
 
     a = xmlTextReaderGetAttribute(r, (xmlChar *) "degree_precision");
-
     if (a != NULL) {
         o->schema_dir = buffer_init();
         precision = atoi((char *) a);
-
         if (precision > 0 && precision < 12)
             o->degree_precision = precision;
-
         xmlFree(a);
     }
 
     a = xmlTextReaderGetAttribute(r, (xmlChar *) "meter_precision");
-
     if (a != NULL) {
         o->schema_dir = buffer_init();
         precision = atoi((char *) a);
-
         if (precision > 0 && precision < 12)
             o->meter_precision = precision;
-
         xmlFree(a);
     }
 
     a = xmlTextReaderGetAttribute(r, (xmlChar *) "wfs_display_bbox");
-
     o->wfs_display_bbox = true;
-
-    if (a != NULL) {
-        if (atoi((char *) a))
-            o->wfs_display_bbox = true;
-        else
-            o->wfs_display_bbox = false;
-
-        xmlFree(a);
-    }
-
+    if (a != NULL) {
+        if (atoi((char *) a)) o->wfs_display_bbox = true;
+        else                  o->wfs_display_bbox = false;
+        xmlFree(a);
+    }
+
+    a = xmlTextReaderGetAttribute(r, (xmlChar *) "check_schema");
+    o->check_schema = true;
+    if (a != NULL) {
+        if (atoi((char *) a)) o->check_schema = true;
+        else                  o->check_schema = false;
+        xmlFree(a);
+    }
+
+    a = xmlTextReaderGetAttribute(r, (xmlChar *) "check_valid_geom");
+    o->check_valid_geom = true;
+    if (a != NULL) {
+        if (atoi((char *) a)) o->check_valid_geom = true;
+        else                  o->check_valid_geom = false;
+        xmlFree(a);
+    }
 }