[srm-cvs] CVS Update: - Stop using the srm_*_data functions, and use srm_do_command instead.

Date: Wed Mar 19 04:57:02 CET 2003
User: Derick Rethans
Directory: php_srm

Log Message:
 [0.25]
 - Stop using the srm_*_data functions, and use srm_do_command instead.
 
Modified files:
           php_srm/srm.c (version: 1.45)

[FILE: /php_srm/srm.c]

--- php_srm/srm.c:1.44 Sat Jan 18 21:39:31 2003 GMT
+++ php_srm/srm.c Wed Mar 19 02:57:02 2003 GMT
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: cvstemp,v 1.44 2003/01/18 22:39:31 derick Exp $ */
+/* $Id: cvstemp,v 1.45 2003/03/19 03:57:02 derick Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -217,6 +217,8 @@
         srm_value *data;
         char *index;
         zval **conn_id;
+ SRM_LIST(params)
+ SRM_LIST(indices)
 
         TSRMLS_FETCH();
 
@@ -228,7 +230,18 @@
         if (index != NULL) {
                 FETCH_CONN_ID(connect_data, connect_data_t *, conn_id, -1, "SRM link", le_srm);
                 if (connect_data) {
- data = srm_data_retrieve(SRM_ST_APPLICATION, *connect_data, index, strlen(index));
+ SRM_LIST_INIT(params);
+ SRM_LIST_ADD(STR, params, "globals");
+
+ SRM_LIST_INIT(indices);
+ SRM_LIST_ADD(STR, indices, index);
+ indices->ref_count++;
+ SRM_LIST_ADD_LST(params, indices);
+
+ data = srm_do_command(*connect_data, "get_data", params);
+
+ srm_value_free(params);
+ srm_value_free(indices);
 
                         if (SRM_IS_ERROR(data)) {
                                 php_error(E_WARNING, "srm_data_retrieve() failed: %s", data->s_value);
@@ -255,6 +268,8 @@
         int ok = FALSE;
         char *index;
         zval **conn_id;
+ SRM_LIST(params)
+ SRM_LIST(indices)
 
         TSRMLS_FETCH();
 
@@ -263,16 +278,28 @@
         if (index != NULL) {
                 FETCH_CONN_ID(connect_data, connect_data_t *, conn_id, -1, "SRM link", le_srm);
                 if (connect_data) {
+ SRM_LIST_INIT(params);
+ SRM_LIST_ADD(STR, params, "globals");
+
+ SRM_LIST_INIT(indices);
+ SRM_LIST_ADD(STR, indices, index);
+ indices->ref_count++;
+ SRM_LIST_ADD_LST(params, indices);
+
                         data = zval_to_srmval (value);
+ SRM_LIST_ADD_SVAL(params, data);
                         
- ret_val = srm_data_store(SRM_ST_APPLICATION, *connect_data, index, strlen(index), data);
+ ret_val = srm_do_command(*connect_data, "set_data", params);
+
+ srm_value_free(params);
+ srm_value_free(indices);
+ srm_value_free(data);
 
                         if (SRM_IS_ERROR(ret_val)) {
                                 php_error(E_WARNING, "srm_data_store() failed: %s", ret_val->s_value);
                         } else {
                                 ok = TRUE;
                         }
- srm_value_free(data);
                 } else {
                         php_error (E_WARNING, "The connection data is not valid");
                 }
Received on Wed Mar 19 04:57:04 2003