Merge branch 'master' of https://github.com/mapserver/tinyows

Olivier Courtin · Olivier Courtin · commit f1abcce211bc · 2016-03-21T19:03:35.000+01:00
diff --git a/README b/README
@@ -17,5 +17,5 @@ All code must meet the following rules :
 
 Code dynamically linked with the following other librairies:
 - PostgreSQL 8.x and 9.x
-- libxml 2.8.x
+- libxml 2.9.x
 - flex
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1.0
+1.1.1
diff --git a/configure.in b/configure.in
@@ -29,8 +29,8 @@ XML2_VER=`$LIBXML2_CONFIG --version`
 AC_MSG_RESULT([checking for libxml2 version... $XML2_VER])
 
 xml2_vers=`$LIBXML2_CONFIG --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-if test "$xml2_vers" -lt 2008000 ; then
-	AC_MSG_ERROR([You need at least libxml 2.8.0])
+if test "$xml2_vers" -lt 2009000 ; then
+	AC_MSG_ERROR([You need at least libxml 2.9.0])
 fi
 
 
diff --git a/src/fe/fe_spatial_ops.c b/src/fe/fe_spatial_ops.c
@@ -433,11 +433,17 @@ static buffer *fe_bbox_layer(ows *o, buffer *typename, buffer *sql, buffer *prop
   if (transform) {
     buffer_add(sql, ',');
     buffer_add_int(sql, srid);
+    buffer_add(sql, ')');
   }
-  buffer_add(sql, ')');
 
   buffer_add_str(sql, ",");
+  if (transform) buffer_add_str(sql, "ST_Transform(");
   buffer_copy(sql, envelope);
+  if (transform) {
+    buffer_add(sql, ',');
+    buffer_add_int(sql, srid);
+    buffer_add(sql, ')');
+  }
   buffer_add_str(sql, ") AND ");
   if (transform) buffer_add_str(sql, "ST_Transform(");
 
@@ -448,11 +454,17 @@ static buffer *fe_bbox_layer(ows *o, buffer *typename, buffer *sql, buffer *prop
   if (transform) {
     buffer_add(sql, ',');
     buffer_add_int(sql, srid);
+    buffer_add(sql, ')');
   }
-  buffer_add(sql, ')');
 
   buffer_add_str(sql, " && ");
+  if (transform) buffer_add_str(sql, "ST_Transform(");
   buffer_copy(sql, envelope);
+  if (transform) {
+    buffer_add(sql, ',');
+    buffer_add_int(sql, srid);
+    buffer_add(sql, ')');
+  }
   buffer_add_str(sql, ")");
 
   return sql;
diff --git a/src/mapfile/mapfile.c b/src/mapfile/mapfile.c
@@ -1672,8 +1672,10 @@ static void end_layer()
  * down here because we want the user's section 1 to have been scanned first.
  * The user has a chance to override it with an option.
  */
+#ifndef _WIN32
 #include <unistd.h>
 #endif
+#endif
 
 #ifndef YY_EXTRA_TYPE
 #define YY_EXTRA_TYPE void *
diff --git a/src/ows/ows_geobbox.c b/src/ows/ows_geobbox.c
@@ -58,8 +58,8 @@ ows_geobbox *ows_geobbox_copy(ows_geobbox *g)
   ows_geobbox *c;
 
   assert(g);
-  c = malloc(sizeof(g));
-  return memcpy(c, g, sizeof(g));
+  c = malloc(sizeof(*g));
+  return memcpy(c, g, sizeof(*g));
 }
 
 
diff --git a/src/ows_struct.h b/src/ows_struct.h
@@ -273,6 +273,7 @@ enum wfs_format {
   WFS_GML311,
   WFS_GML321,
   WFS_GEOJSON,
+  WFS_JSONP,
   WFS_TEXT_XML,
   WFS_APPLICATION_XML
 };
@@ -303,6 +304,7 @@ typedef struct Wfs_request {
   buffer * resulttype;
   buffer * sortby;
   list * sections;
+  buffer * callback;
 
   alist * insert_results;
   int delete_results;
diff --git a/src/struct/buffer.c b/src/struct/buffer.c
@@ -141,7 +141,11 @@ buffer *buffer_ftoa(double f)
 
   res = buffer_init();
   while (res->size < 100) buffer_realloc(res);
+  #ifndef _WIN32
   snprintf(res->buf, 99, "%f", f);
+  #else
+  _snprintf(res->buf, 99, "%f", f);
+  #endif 
   res->use = strlen(res->buf);
 
   return res;
@@ -503,8 +507,6 @@ buffer *buffer_encode_xml_entities_str(const char * str)
 
   for( /* empty */ ; *str ; str++) {
 
-    if ((int) *str < 32 && (*str != '\n' && *str != '\r' && *str != '	')) break;
-
     switch(*str) {
       case '&':
         buffer_add_str(buf, "&amp;");
@@ -538,9 +540,6 @@ buffer *buffer_encode_xml_entities_str(const char * str)
 /*
  * Modify string to replace encoded characters by their true value
  * for JSON output
- *
- * The replacements performed are:
- *  " -> \"
  */
 buffer *buffer_encode_json_str(const char * str)
 {
@@ -555,6 +554,22 @@ buffer *buffer_encode_json_str(const char * str)
         buffer_add_str(buf, "\\\"");
         break;
 
+      case '\n':
+        buffer_add_str(buf, "\\\\n");
+        break;
+
+      case '\r':
+        buffer_add_str(buf, "\\\\r");
+        break;
+
+      case '\t':
+        buffer_add_str(buf, "\\\\t");
+        break;
+
+      case '\\':
+        buffer_add_str(buf, "\\\\");
+        break;
+
       default:
         buffer_add(buf, *str);
     }
diff --git a/src/struct/cgi_request.c b/src/struct/cgi_request.c
@@ -33,7 +33,7 @@
 /*
  * Max query string length send via QUERY_STRING CGI
  */
-#define CGI_QUERY_MAX 32768
+#define CGI_QUERY_MAX 1000000
 
 
 /*
diff --git a/src/wfs/wfs_get_feature.c b/src/wfs/wfs_get_feature.c
@@ -511,7 +511,7 @@ static buffer *wfs_retrieve_sql_request_select(ows * o, wfs_request * wr, buffer
         buffer_add_str(select, ") AS \"");
         buffer_copy(select, an->key);
         buffer_add_str(select, "\" ");
-      } else if (wr->format == WFS_GEOJSON) {
+      } else if (wr->format == WFS_GEOJSON || wr->format == WFS_JSONP) {
         buffer_add_str(select, "ST_AsGeoJSON(");
 
         /* Geometry Reprojection on the fly step if asked */
@@ -786,7 +786,17 @@ static void wfs_geojson_display_results(ows * o, wfs_request * wr, mlist * reque
   prop = buffer_init();
   id_name = buffer_init();
 
-  fprintf(o->output, "Content-Type: application/json\n\n");
+  if (wr->format == WFS_JSONP)
+  {
+         assert(wr->callback);
+
+         fprintf(o->output, "Content-Type: application/javascript\n\n");
+         fprintf(o->output, wr->callback->buf);
+         fprintf(o->output, "(");
+
+  } else fprintf(o->output, "Content-Type: application/json\n\n");
+  
+
   fprintf(o->output, "{\"type\": \"FeatureCollection\", \"crs\":{\"type\":\"name\",\"properties\":{\"name\":\"");
   if (ows_version_get(o->request->version) == 100)
     fprintf(o->output, "EPSG:%i", wr->srs->srid);
@@ -872,6 +882,7 @@ static void wfs_geojson_display_results(ows * o, wfs_request * wr, mlist * reque
   }
 
   fprintf(o->output, "]}");
+  if (wr->format == WFS_JSONP) fprintf(o->output, ");");
 
   buffer_free(geom);
   buffer_free(prop);
@@ -897,7 +908,7 @@ void wfs_get_feature(ows * o, wfs_request * wr)
     else
       wfs_gml_display_results(o, wr, request_list);
 
-  } else if (wr->format == WFS_GEOJSON)
+  } else if (wr->format == WFS_GEOJSON || wr->format == WFS_JSONP)
     wfs_geojson_display_results(o, wr, request_list);
 
   /* Add here other functions to display GetFeature response in other formats */
diff --git a/src/wfs/wfs_request.c b/src/wfs/wfs_request.c
@@ -55,6 +55,7 @@ wfs_request *wfs_request_init()
   wr->resulttype = NULL;
   wr->sortby = NULL;
   wr->sections = NULL;
+  wr->callback = NULL;
 
   wr->insert_results = NULL;
   wr->delete_results = 0;
@@ -150,6 +151,12 @@ void wfs_request_flush(wfs_request * wr, FILE * output)
     fprintf(output, "\n");
   }
 
+  if (wr->callback) {
+    fprintf(output, " callback -> ");
+    list_flush(wr->callback, output);
+    fprintf(output, "\n");
+  }
+
   fprintf(output, "]\n");
 }
 #endif
@@ -174,6 +181,7 @@ void wfs_request_free(wfs_request * wr)
   if (wr->sortby)         buffer_free(wr->sortby);
   if (wr->sections)       list_free(wr->sections);
   if (wr->insert_results) alist_free(wr->insert_results);
+  if (wr->callback)       buffer_free(wr->callback);
 
   free(wr);
   wr = NULL;
@@ -467,13 +475,27 @@ static void wfs_request_check_output(ows * o, wfs_request * wr)
     else if (    buffer_cmp(array_get(o->cgi, "outputformat"), "JSON")
               || buffer_cmp(array_get(o->cgi, "outputformat"), "application/json"))
       wr->format = WFS_GEOJSON;
+    else if (    buffer_cmp(array_get(o->cgi, "outputformat"), "JSONP")
+              || buffer_cmp(array_get(o->cgi, "outputformat"), "application/javascript"))
+    {
+      wr->format = WFS_JSONP;
+
+      wr->callback = buffer_init();
+      if (!array_is_key(o->cgi, "callback"))
+          buffer_add_str(wr->callback, "wfs_jsonp_callback");
+      else 
+          buffer_copy(wr->callback, array_get(o->cgi, "callback"));
+    }
     else if (    wr->request == WFS_DESCRIBE_FEATURE_TYPE
               && buffer_cmp(array_get(o->cgi, "outputformat"), "XMLSCHEMA"))  // FIXME: really ?
       wr->format = WFS_XML_SCHEMA;
     else
       wfs_error(o, wr, WFS_ERROR_OUTPUT_FORMAT_NOT_SUPPORTED,
                 "OutputFormat is not supported", "GetFeature");
   }
+
+
+
 }
 
 
diff --git a/src/wfs/wfs_transaction.c b/src/wfs/wfs_transaction.c
@@ -505,7 +505,7 @@ static buffer *wfs_insert_xml(ows * o, wfs_request * wr, xmlDocPtr xmldoc, xmlNo
     node = n->children;
 
     /* Jump to the next element if spaces */
-    while (node->type != XML_ELEMENT_NODE) node = node->next;
+    while (node != NULL && node->type != XML_ELEMENT_NODE) node = node->next;
 
     /* Fill SQL fields and values at once */
     for ( /* empty */ ; node; node = node->next) {
@@ -541,45 +541,48 @@ static buffer *wfs_insert_xml(ows * o, wfs_request * wr, xmlDocPtr xmldoc, xmlNo
           elemt = node->children;
 
           /* Jump to the next element if spaces */
-          while (elemt->type != XML_ELEMENT_NODE) elemt = elemt->next;
-
-          if (!strcmp((char *) elemt->name, "Box") ||
-              !strcmp((char *) elemt->name, "Envelope")) {
-
-            fe = filter_encoding_init();
-            fe->sql = fe_envelope(o, layer_name, fe, fe->sql, elemt);
-            if (fe->error_code != FE_NO_ERROR) {
-              result = fill_fe_error(o, fe);
-              buffer_free(sql);
-              buffer_free(values);
-              buffer_free(column);
-              buffer_free(id);
+          while (elemt != NULL && elemt->type != XML_ELEMENT_NODE) elemt = elemt->next;
+          if (elemt != NULL) {
+            if (!strcmp((char *) elemt->name, "Box") ||
+                !strcmp((char *) elemt->name, "Envelope")) {
+
+              fe = filter_encoding_init();
+              fe->sql = fe_envelope(o, layer_name, fe, fe->sql, elemt);
+              if (fe->error_code != FE_NO_ERROR) {
+                result = fill_fe_error(o, fe);
+                buffer_free(sql);
+                buffer_free(values);
+                buffer_free(column);
+                buffer_free(id);
+                filter_encoding_free(fe);
+                return result;
+              }
+              buffer_copy(values, fe->sql);
               filter_encoding_free(fe);
-              return result;
-            }
-            buffer_copy(values, fe->sql);
-            filter_encoding_free(fe);
-
-          } else if (!strcmp((char *) elemt->name, "Null")) {
-            buffer_add_str(values, "''");
-          } else {
-            gml = ows_psql_gml_to_sql(o, elemt, srid_root);
-            if (gml) {
-              buffer_add_str(values, "'");
-              buffer_copy(values, gml);
-              buffer_add_str(values, "'");
-              buffer_free(gml);
+
+            } else if (!strcmp((char *) elemt->name, "Null")) {
+              buffer_add_str(values, "''");
             } else {
-              buffer_free(sql);
-              buffer_free(values);
-              buffer_free(column);
-              buffer_free(id);
-              buffer_free(layer_name);
-
-              result = buffer_from_str("Error invalid Geometry");
-              return result;
+              gml = ows_psql_gml_to_sql(o, elemt, srid_root);
+              if (gml) {
+                buffer_add_str(values, "'");
+                buffer_copy(values, gml);
+                buffer_add_str(values, "'");
+                buffer_free(gml);
+              } else {
+                buffer_free(sql);
+                buffer_free(values);
+                buffer_free(column);
+                buffer_free(id);
+                buffer_free(layer_name);
+
+                result = buffer_from_str("Error invalid Geometry");
+                return result;
+              }
             }
           }
+          else
+            buffer_add_str(values, "NULL");
 
         } else values = wfs_retrieve_value(o, wr, values, xmldoc, node);
 

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,8 @@ ows_geobbox ows_geobbox_copy(ows_geobbox g)`
`58`	`58`	`ows_geobbox *c;`
`59`	`59`
`60`	`60`	`assert(g);`
`61`		`- c = malloc(sizeof(g));`
`62`		`- return memcpy(c, g, sizeof(g));`
	`61`	`+ c = malloc(sizeof(*g));`
	`62`	`+ return memcpy(c, g, sizeof(*g));`
`63`	`63`	`}`
`64`	`64`
`65`	`65`