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

[svn at osgeo.org]

Author: aboudreault
Date: 2012-02-14 07:54:28 -0800 (Tue, 14 Feb 2012)
New Revision: 13149

Modified:
   trunk/mapserver/mapscript/php/class.c
   trunk/mapserver/mapscript/php/labelcachemember.c
   trunk/mapserver/mapscript/php/php_mapscript.h
Log:
make php/mapscript to compile.... against multi-labeling rfc

Modified: trunk/mapserver/mapscript/php/class.c
===================================================================
--- trunk/mapserver/mapscript/php/class.c	2012-02-14 14:55:32 UTC (rev 13148)
+++ trunk/mapserver/mapscript/php/class.c	2012-02-14 15:54:28 UTC (rev 13149)
@@ -169,8 +169,7 @@
     else IF_GET_STRING("template", php_class->class->template)
     else IF_GET_STRING("keyimage", php_class->class->keyimage)
     else IF_GET_STRING("group", php_class->class->group)
-    else IF_GET_LONG("numstyles", php_class->class->numstyles) 
-    else IF_GET_OBJECT("label", mapscript_ce_label, php_class->label, &php_class->class->label) 
+    else IF_GET_LONG("numstyles", php_class->class->numstyles)
     else IF_GET_OBJECT("metadata", mapscript_ce_hashtable, php_class->metadata, &php_class->class->metadata) 
     else 
     {
@@ -206,8 +205,7 @@
     else IF_SET_STRING("template", php_class->class->template, value)
     else IF_SET_STRING("keyimage", php_class->class->keyimage, value)
     else IF_SET_STRING("group", php_class->class->group, value)
-    else if ( (STRING_EQUAL("label", property)) ||
-              (STRING_EQUAL("metadata", property)))
+    else if ( (STRING_EQUAL("metadata", property)))
     {
         mapscript_throw_exception("Property '%s' is an object and can only be modified through its accessors." TSRMLS_CC, property);
     }
@@ -686,7 +684,6 @@
     
     php_class = (php_class_object *) zend_object_store_get_object(zobj TSRMLS_CC);
 
-    MAPSCRIPT_DELREF(php_class->label);
     MAPSCRIPT_DELREF(php_class->metadata);
 }
 /* }}} */
@@ -733,7 +730,6 @@
 
     MAPSCRIPT_FREE_PARENT(php_class->parent);
 
-    MAPSCRIPT_DELREF(php_class->label);
     MAPSCRIPT_DELREF(php_class->metadata);
 
     /* We don't need to free the classObj */ 
@@ -757,7 +753,6 @@
 
     MAPSCRIPT_INIT_PARENT(php_class->parent);
 
-    php_class->label = NULL;
     php_class->metadata = NULL;
 
     return retval;

Modified: trunk/mapserver/mapscript/php/labelcachemember.c
===================================================================
--- trunk/mapserver/mapscript/php/labelcachemember.c	2012-02-14 14:55:32 UTC (rev 13148)
+++ trunk/mapserver/mapscript/php/labelcachemember.c	2012-02-14 15:54:28 UTC (rev 13149)
@@ -67,17 +67,17 @@
     
     php_labelcachemember = (php_labelcachemember_object *) zend_object_store_get_object(zobj TSRMLS_CC);
 
-    IF_GET_STRING("text", php_labelcachemember->labelcachemember->text)
-    else IF_GET_LONG("classindex", php_labelcachemember->labelcachemember->classindex)
+    IF_GET_LONG("classindex", php_labelcachemember->labelcachemember->classindex)
     else IF_GET_LONG("featuresize", php_labelcachemember->labelcachemember->featuresize) 
     else IF_GET_LONG("layerindex", php_labelcachemember->labelcachemember->layerindex) 
     else IF_GET_LONG("numstyles", php_labelcachemember->labelcachemember->numstyles) 
+    else IF_GET_LONG("numlabels", php_labelcachemember->labelcachemember->numlabels) 
     else IF_GET_LONG("shapeindex", php_labelcachemember->labelcachemember->shapeindex) 
     else IF_GET_LONG("status", php_labelcachemember->labelcachemember->status) 
     else IF_GET_LONG("markerid", php_labelcachemember->labelcachemember->markerid) 
     else IF_GET_LONG("tileindex", php_labelcachemember->labelcachemember->tileindex) 
     else IF_GET_OBJECT("point", mapscript_ce_point, php_labelcachemember->point, &php_labelcachemember->labelcachemember->point) 
-    else IF_GET_OBJECT("label", mapscript_ce_label, php_labelcachemember->label, &php_labelcachemember->labelcachemember->label) 
+    else IF_GET_OBJECT("labels", mapscript_ce_label, php_labelcachemember->labels, &php_labelcachemember->labelcachemember->labels) 
     else IF_GET_OBJECT("styles", mapscript_ce_style, php_labelcachemember->styles, php_labelcachemember->labelcachemember->styles) 
     else IF_GET_OBJECT("poly", mapscript_ce_shape, php_labelcachemember->poly, php_labelcachemember->labelcachemember->poly) 
     else 
@@ -104,16 +104,16 @@
     
     php_labelcachemember = (php_labelcachemember_object *) zend_object_store_get_object(zobj TSRMLS_CC);
 
-    if ( (STRING_EQUAL("text", property)) ||
-         (STRING_EQUAL("classindex", property)) ||
+    if ( (STRING_EQUAL("classindex", property)) ||
          (STRING_EQUAL("featuresize", property)) ||
          (STRING_EQUAL("layerindex", property)) ||
          (STRING_EQUAL("numstyles", property)) ||
+         (STRING_EQUAL("numlabels", property)) ||
          (STRING_EQUAL("shapeindex", property)) ||
          (STRING_EQUAL("status", property)) ||
          (STRING_EQUAL("markerid", property)) ||
          (STRING_EQUAL("tileindex", property)) ||
-         (STRING_EQUAL("label", property)) ||
+         (STRING_EQUAL("labels", property)) ||
          (STRING_EQUAL("styles", property)) ||
          (STRING_EQUAL("poly", property)) ||
          (STRING_EQUAL("point", property)))
@@ -143,7 +143,7 @@
     php_labelcachemember = (php_labelcachemember_object *) zend_object_store_get_object(zobj TSRMLS_CC);
 
     MAPSCRIPT_DELREF(php_labelcachemember->point);
-    MAPSCRIPT_DELREF(php_labelcachemember->label);
+    MAPSCRIPT_DELREF(php_labelcachemember->labels);
     MAPSCRIPT_DELREF(php_labelcachemember->styles);
     MAPSCRIPT_DELREF(php_labelcachemember->poly);
 }
@@ -180,7 +180,7 @@
 
     MAPSCRIPT_FREE_PARENT(php_labelcachemember->parent);
     MAPSCRIPT_DELREF(php_labelcachemember->point);
-    MAPSCRIPT_DELREF(php_labelcachemember->label);
+    MAPSCRIPT_DELREF(php_labelcachemember->labels);
     MAPSCRIPT_DELREF(php_labelcachemember->styles);
     MAPSCRIPT_DELREF(php_labelcachemember->poly);
 
@@ -201,7 +201,7 @@
 
     MAPSCRIPT_INIT_PARENT(php_labelcachemember->parent);
     php_labelcachemember->point = NULL;
-    php_labelcachemember->label = NULL;
+    php_labelcachemember->labels = NULL;
     php_labelcachemember->styles = NULL;
     php_labelcachemember->poly = NULL;
 

Modified: trunk/mapserver/mapscript/php/php_mapscript.h
===================================================================
--- trunk/mapserver/mapscript/php/php_mapscript.h	2012-02-14 14:55:32 UTC (rev 13148)
+++ trunk/mapserver/mapscript/php/php_mapscript.h	2012-02-14 15:54:28 UTC (rev 13149)
@@ -138,7 +138,6 @@
     zend_object std;
     parent_object parent; //old layer
     zval *metadata;
-    zval *label;
     classObj *class;
 } php_class_object;
 
@@ -264,7 +263,7 @@
 typedef struct _php_labelcachemember_object {
     zend_object std;
     parent_object parent;
-    zval *label; /* should be immutable */
+    zval *labels; /* should be immutable */
     zval *point; /* should be immutable */
     zval *styles; /* should be immutable */
     zval *poly; /* should be immutable */