Changeset 586 for trunk/zoo-project/zoo-kernel/service_internal_ms.c

Timestamp:

Feb 16, 2015, 10:45:52 PM (9 years ago)

Author:

djay

Message:

Add the PHP ZOO-API, fix issue if ZTS is not defined, correct loading of the PHP script depending of the ZOO-Kernel location, use a ZEND_HANDLE_FD rather than the ZEND_HANDLE_FP used before, correct location of the hello.php service.

File:

• trunk/zoo-project/zoo-kernel/service_internal_ms.c (modified) (11 diffs)

trunk/zoo-project/zoo-kernel/service_internal_ms.c

@@ -23 +23 @@
  */
 
-#ifdef USE_MS
+/**
+ * Cross platform definition of layerObj->class
+ */
 #ifndef WIN32
 #define CLASS class
@@ -32 +34 @@
 
 /**
+ * Get a list of configuration keys having a corresponding mandatory ows_*.
  * Map composed by a main.cfg maps name as key and the corresponding 
  * MapServer Mafile Metadata name to use
@@ -38 +41 @@
  *  - http://mapserver.org/ogc/wfs_server.html
  *  - http://mapserver.org/ogc/wcs_server.html
+ *
+ * @return a new map containing a table linking a name of a configuration key
+ * to a corresponding mandatory ows_* keyword (ie. "fees" => "ows_fees").
  */
 map* getCorrespondance(){
@@ -67 +73 @@
 }
 
+/**
+ * Add width and height keys to an output maps containing the maximum width
+ * and height for displaying the full data extent.
+ * Restriction to an image having a size of 640x480 (width * height)
+ *
+ * @param output 
+ * @param minx the lower left x coordinate
+ * @param miny the lower left y coordinate
+ * @param maxx the upper right x coordinate
+ * @param maxy the upper right y coordinate
+ */
 void setMapSize(maps* output,double minx,double miny,double maxx,double maxy){
   double maxWidth=640;
@@ -104 +121 @@
 }
 
+/**
+ * Add a Reference key to an output containing the WMFS/WFS/WCS request for
+ * accessing service result
+ * 
+ * @param m the conf maps containing the main.cfg settings
+ * @param tmpI the specific output maps to add the Reference key
+ */
 void setReferenceUrl(maps* m,maps* tmpI){
   outputMapfile(m,tmpI);
@@ -205 +229 @@
 
 /**
- * Set projection using Authority Code and Name if available or fallback to 
- * proj4 definition if available or fallback to default EPSG:4326
+ * Set projection for a layer in a MAPFILE using Authority Code and Name if
+ * available or fallback to proj4 definition if available or fallback to
+ * default EPSG:4326
+ *
+ * @param output the output maps
+ * @param m the opened mapObj
+ * @param myLayer the layerObj
+ * @param pszProjection a char* containing the SRS definition in WKT format
  */
 void setSrsInformations(maps* output,mapObj* m,layerObj* myLayer,
@@ -299 +329 @@
 }
 
+/**
+ * Set the MAPFILE extent, the the ows_extent for the layer, add wms_extent and
+ * wfs_extent to the output maps and call setMapSize.
+ *
+ * @param output the specific output
+ * @param m the mapObj
+ * @param myLayer the layerObj
+ * @param minX the lower left x coordinate
+ * @param minY the lower left y coordinate
+ * @param maxX the upper right x coordinate
+ * @param maxY the upper right y coordinate
+ * @see setMapSize
+ */
 void setMsExtent(maps* output,mapObj* m,layerObj* myLayer,
                  double minX,double minY,double maxX,double maxY){
@@ -357 +400 @@
 }
 
+/**
+ * Try to open a vector output and define the corresponding layer in the MAPFILE
+ *
+ * @param conf the conf maps containing the main.cfg settings
+ * @param output the specific output maps
+ * @param m the mapObj
+ */
 int tryOgr(maps* conf,maps* output,mapObj* m){
 
@@ -663 +713 @@
 }
 
-
+/**
+ * Try to open a raster output and define the corresponding layer in the MAPFILE
+ *
+ * @param conf the conf maps containing the main.cfg settings
+ * @param output the specific output maps
+ * @param m the mapObj
+ */
 int tryGdal(maps* conf,maps* output,mapObj* m){
   map* tmpMap=getMap(output->content,"storage");
@@ -914 +970 @@
 /**
  * Create a MapFile for WMS, WFS or WCS Service output
+ *
+ * @param conf the conf maps containing the main.cfg settings
+ * @param outputs a specific output maps
  */
 void outputMapfile(maps* conf,maps* outputs){
 
   /**
-   * Firs store the value on disk
+   * First store the value on disk
    */
   map* mime=getMap(outputs->content,"mimeType");
@@ -1106 +1165 @@
 }
 
-#endif