[mapserver-commits] r10036 - trunk/mapserver/mapscript/php

[svn at osgeo.org]

Author: aboudreault
Date: 2010-04-01 09:17:20 -0400 (Thu, 01 Apr 2010)
New Revision: 10036

Modified:
   trunk/mapserver/mapscript/php/labelcache.c
   trunk/mapserver/mapscript/php/legend.c
   trunk/mapserver/mapscript/php/map.c
   trunk/mapserver/mapscript/php/scalebar.c
   trunk/mapserver/mapscript/php/shape.c
   trunk/mapserver/mapscript/php/symbol.c
Log:
Removed a few deprecated php object properties and fixed some return values

Modified: trunk/mapserver/mapscript/php/labelcache.c
===================================================================
--- trunk/mapserver/mapscript/php/labelcache.c	2010-03-31 23:03:06 UTC (rev 10035)
+++ trunk/mapserver/mapscript/php/labelcache.c	2010-04-01 13:17:20 UTC (rev 10036)
@@ -88,7 +88,6 @@
     PHP_ME(labelCacheObj, __get, labelcache___get_args, ZEND_ACC_PUBLIC)
     PHP_ME(labelCacheObj, __set, labelcache___set_args, ZEND_ACC_PUBLIC)
     PHP_ME(labelCacheObj, free, NULL, ZEND_ACC_PUBLIC)
-    PHP_MALIAS(labelCacheObj, freeCache, free, NULL, ZEND_ACC_PUBLIC)
     {NULL, NULL, NULL}
 };
 

Modified: trunk/mapserver/mapscript/php/legend.c
===================================================================
--- trunk/mapserver/mapscript/php/legend.c	2010-03-31 23:03:06 UTC (rev 10035)
+++ trunk/mapserver/mapscript/php/legend.c	2010-04-01 13:17:20 UTC (rev 10036)
@@ -79,8 +79,6 @@
     else IF_GET_LONG("keyspacingy", php_legend->legend->keyspacingy)
     else IF_GET_LONG("status", php_legend->legend->status)
     else IF_GET_LONG("position", php_legend->legend->position)
-    else IF_GET_LONG("transparent", php_legend->legend->transparent)
-    else IF_GET_LONG("interlace", php_legend->legend->interlace)
     else IF_GET_LONG("postlabelcache", php_legend->legend->postlabelcache)
     else IF_GET_STRING("template", php_legend->legend->template)
     else IF_GET_OBJECT("outlinecolor", php_legend->outlinecolor)
@@ -118,8 +116,6 @@
     else IF_SET_LONG("keyspacingy", php_legend->legend->keyspacingy, value)
     else IF_SET_LONG("status", php_legend->legend->status, value)
     else IF_SET_LONG("position", php_legend->legend->position, value)
-    else IF_SET_LONG("transparent", php_legend->legend->transparent, value)
-    else IF_SET_LONG("interlace", php_legend->legend->interlace, value)
     else IF_SET_LONG("postlabelcache", php_legend->legend->postlabelcache, value)
     else IF_SET_STRING("template", php_legend->legend->template, value)
     else if ( (STRING_EQUAL("outlinecolor", property)) ||

Modified: trunk/mapserver/mapscript/php/map.c
===================================================================
--- trunk/mapserver/mapscript/php/map.c	2010-03-31 23:03:06 UTC (rev 10035)
+++ trunk/mapserver/mapscript/php/map.c	2010-04-01 13:17:20 UTC (rev 10036)
@@ -2631,7 +2631,7 @@
     {
         // Failed for some reason
         mapscript_report_php_error(E_WARNING, "processTemplate: failed reading array" TSRMLS_CC);
-        RETURN_NULL();
+        RETURN_STRING("", 0);
     }
     efree(papszNameValue);
 
@@ -2711,7 +2711,7 @@
     {
         // Failed for some reason
         mapscript_report_php_error(E_WARNING, "processQueryTemplate: failed reading array" TSRMLS_CC);
-        RETURN_NULL();
+        RETURN_STRING("", 0);
     }
     efree(papszNameValue);
 
@@ -2791,7 +2791,7 @@
     {
         // Failed for some reason
         mapscript_report_php_error(E_WARNING, "processLegendTemplate: failed reading array" TSRMLS_CC);
-        RETURN_NULL();
+        RETURN_STRING("", 0);
     }
     efree(papszNameValue);
 

Modified: trunk/mapserver/mapscript/php/scalebar.c
===================================================================
--- trunk/mapserver/mapscript/php/scalebar.c	2010-03-31 23:03:06 UTC (rev 10035)
+++ trunk/mapserver/mapscript/php/scalebar.c	2010-04-01 13:17:20 UTC (rev 10036)
@@ -84,8 +84,6 @@
     else IF_GET_LONG("units", php_scalebar->scalebar->units)
     else IF_GET_LONG("status", php_scalebar->scalebar->status)
     else IF_GET_LONG("position", php_scalebar->scalebar->position)
-    else IF_GET_LONG("transparent", php_scalebar->scalebar->transparent)
-    else IF_GET_LONG("interlace", php_scalebar->scalebar->interlace)
     else IF_GET_LONG("postlabelcache", php_scalebar->scalebar->postlabelcache)
     else IF_GET_LONG("align", php_scalebar->scalebar->align)
     else IF_GET_OBJECT("color", php_scalebar->color)
@@ -124,8 +122,6 @@
     else IF_SET_LONG("units", php_scalebar->scalebar->units, value)
     else IF_SET_LONG("status", php_scalebar->scalebar->status, value)
     else IF_SET_LONG("position", php_scalebar->scalebar->position, value)
-    else IF_SET_LONG("transparent", php_scalebar->scalebar->transparent, value)
-    else IF_SET_LONG("interlace", php_scalebar->scalebar->interlace, value)
     else IF_SET_LONG("postlabelcache", php_scalebar->scalebar->postlabelcache, value)
     else IF_SET_LONG("align", php_scalebar->scalebar->align, value)
     else if ( (STRING_EQUAL("color", property)) ||

Modified: trunk/mapserver/mapscript/php/shape.c
===================================================================
--- trunk/mapserver/mapscript/php/shape.c	2010-03-31 23:03:06 UTC (rev 10035)
+++ trunk/mapserver/mapscript/php/shape.c	2010-04-01 13:17:20 UTC (rev 10036)
@@ -1058,7 +1058,7 @@
 
     shape = shapeObj_simplify(php_shape->shape, tolerance);
     if (shape  == NULL)
-       RETURN_FALSE;
+        RETURN_NULL();
 
     mapscript_create_shape(shape, NULL, NULL, return_value TSRMLS_CC);
 }
@@ -1086,7 +1086,7 @@
 
     shape = shapeObj_topologypreservingsimplify(php_shape->shape, tolerance);
     if (shape  == NULL)
-       RETURN_FALSE;
+        RETURN_NULL();
 
     mapscript_create_shape(shape, NULL, NULL, return_value TSRMLS_CC);
 }

Modified: trunk/mapserver/mapscript/php/symbol.c
===================================================================
--- trunk/mapserver/mapscript/php/symbol.c	2010-03-31 23:03:06 UTC (rev 10035)
+++ trunk/mapserver/mapscript/php/symbol.c	2010-04-01 13:17:20 UTC (rev 10036)
@@ -127,7 +127,6 @@
     else IF_GET_STRING("character", php_symbol->symbol->character)
     else IF_GET_LONG("antialias", php_symbol->symbol->antialias) 
     else IF_GET_STRING("font", php_symbol->symbol->font)
-    else IF_GET_LONG("gap", php_symbol->symbol->gap) 
     else IF_GET_LONG("position", php_symbol->symbol->position) 
     else 
     {
@@ -164,7 +163,6 @@
     else IF_SET_STRING("character", php_symbol->symbol->character, value)
     else IF_SET_LONG("antialias", php_symbol->symbol->antialias, value) 
     else IF_SET_STRING("font", php_symbol->symbol->font, value)
-    else IF_SET_LONG("gap", php_symbol->symbol->gap, value) 
     else IF_SET_LONG("position", php_symbol->symbol->position, value) 
     if ( (STRING_EQUAL("numpoints", property)) ||
          (STRING_EQUAL("patternlength", property)) ||