[cwscore-commit] CVS update: MODIFIED: source, query_resource_properties_impl_branch

[Joe Bester]

, wsnt_NotificationProducer_provider.c
 ...

  User: bester  
  Date: 06/05/10 14:22:22

  Modified:    c/core/providers/source Tag:
                        query_resource_properties_impl_branch
                        wsnt_NotificationProducer_provider.c
  Log:
  Initial semi-working XPATH integration with QueryResourceProperties (some
  trouble serializing XPATH queries currently)
  Added support for topic hierarchies for notification producer.
  Added support for the Concrete topic expression dialect.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.1   +16 -11    wsrf/c/core/providers/source/wsnt_NotificationProducer_provider.c
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: wsnt_NotificationProducer_provider.c
  ===================================================================
  RCS file: /home/globdev/CVS/globus-packages/wsrf/c/core/providers/source/wsnt_NotificationProducer_provider.c,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -b -r1.7 -r1.7.2.1
  --- wsnt_NotificationProducer_provider.c	7 Apr 2006 19:05:21 -0000	1.7
  +++ wsnt_NotificationProducer_provider.c	10 May 2006 19:22:22 -0000	1.7.2.1
  @@ -47,9 +47,13 @@
   }
   globus_l_notification_producer_operation_t;
   
  -#define SIMPLE_TOPIC_EXPRESSION_DIALECT \
  -    "http://docs.oasis-open.org/wsn/2004/06/TopicExpression/Simple"
  -
  +static
  +xsd_anyURI globus_l_notification_dialects[] =
  +{
  +    "http://docs.oasis-open.org/wsn/2004/06/TopicExpression/Simple",
  +    "http://docs.oasis-open.org/wsn/2004/06/TopicExpression/Concrete",
  +    NULL
  +};
   
   /* Prototypes */
   static
  @@ -274,13 +278,16 @@
           goto destroy_fixed_topic_set_property_out;
       }
   
  +    for (i = 0; globus_l_notification_dialects[i] != NULL; i++)
  +    {
       dialect = xsd_anyURI_array_push(topic_expression_dialects);
  -
       if (dialect == NULL)
       {
           goto destroy_topic_expression_dialects_out;
       }
  -    *dialect = globus_libc_strdup(SIMPLE_TOPIC_EXPRESSION_DIALECT);
  +
  +        *dialect = globus_libc_strdup(globus_l_notification_dialects[i]);
  +    }
   
       result = globus_resource_create_property(
           resource,
  @@ -522,8 +529,6 @@
       wsrp_NewValueType *                 new_value = NULL;
       notif_ResourcePropertyValueChangeNotificationElementType *
                                           value_changed_notification = NULL;
  -    static xsd_anyURI                   dialect =
  -                                            SIMPLE_TOPIC_EXPRESSION_DIALECT;
   
       result = globus_resource_get_id(resource, &resource_id);
       if (result != GLOBUS_SUCCESS)
  @@ -539,7 +544,7 @@
   
       topic_expression.any->any_info = &xsd_QName_contents_info;
       topic_expression.any->value = (xsd_QName *) qname;
  -    topic_expression._Dialect = &dialect;
  +    topic_expression._Dialect = &globus_l_notification_dialects[0];
   
       if (new_property)
       {