[OFBiz] SVN: r7887 - in trunk/applications/content: script/org/ofbiz/content servicedef

[hansbak@svn.ofbiz.org]

Author: hansbak
Date: 2006-06-28 01:14:47 -0500 (Wed, 28 Jun 2006)
New Revision: 7887

Modified:
   trunk/applications/content/script/org/ofbiz/content/SubscriptionServices.xml
   trunk/applications/content/servicedef/services_subscription.xml
Log:
update to the subscriptionservices

Modified: trunk/applications/content/script/org/ofbiz/content/SubscriptionServices.xml
===================================================================
--- trunk/applications/content/script/org/ofbiz/content/SubscriptionServices.xml	2006-06-28 05:56:15 UTC (rev 7886)
+++ trunk/applications/content/script/org/ofbiz/content/SubscriptionServices.xml	2006-06-28 06:14:47 UTC (rev 7887)
@@ -65,12 +65,23 @@
       <set field="found" value="false" type="Boolean"/>
       <else>
         <set field="found" value="true" type="Boolean"/>
+        <first-from-list entry-name="subscription" list-name="pfResultList"/>
+        <field-to-result field-name="subscription.subscriptionId" result-name="subscriptionId"/>
       </else>
     </if-empty>
     
     <field-to-result field-name="found" result-name="isSubscribed"/>
-    <first-from-list entry-name="subscription" list-name="pfResultList"/>
-    <field-to-result field-name="subscription.subscriptionId" result-name="subscriptionId"/>
   </simple-method>
-      
+
+  <simple-method method-name="getSubscription" short-description="get Subscription data">
+    <set value="_READ" field="securityAction"/>
+    <check-permission permission="CONTENTMGR" action="${securityAction}"><accept-userlogin-party/><fail-property resource="ContentUiLabels" property="SubscriptionPermissionError"/></check-permission>
+    <check-errors/>
+    <entity-one entity-name="Subscription" value-name="subscription"/>
+    <field-to-result field-name="parameters.subscriptionId" result-name="subscriptionId"/>
+    <if-not-empty field-name="subscription">
+      <field-to-result field-name="subscription" result-name="subscription"/>
+    </if-not-empty>
+  </simple-method>
+  
 </simple-methods>
\ No newline at end of file

Modified: trunk/applications/content/servicedef/services_subscription.xml
===================================================================
--- trunk/applications/content/servicedef/services_subscription.xml	2006-06-28 05:56:15 UTC (rev 7886)
+++ trunk/applications/content/servicedef/services_subscription.xml	2006-06-28 06:14:47 UTC (rev 7887)
@@ -40,9 +40,16 @@
         location="org/ofbiz/content/SubscriptionServices.xml" invoke="isSubscribed">
         <description>check if a particular party has at this moment a subscription</description>
         <auto-attributes include="all" mode="IN" optional="true"/>
-        <attribute name="filterByDate" type="String" mode="IN"/>
+        <attribute name="filterByDate" type="String" mode="IN" optional="true"/><!-- default is "Y" -->
         <attribute name="isSubscribed" type="Boolean" mode="OUT"/>
+        <attribute name="subscriptionId" type="String" mode="OUT" optional="true"/>
         <override name="partyId" optional="false" mode="IN"/>
     </service>
     
+    <service name="getSubscriptionEnt" default-entity-name="Subscription" auth="true" engine="simple"
+        location="org/ofbiz/content/SubscriptionServices.xml" invoke="getSubscription">
+        <description>Retrieve a single Subscription Entity Record</description>
+        <auto-attributes include="pk" mode="INOUT" optional="false"/>
+        <attribute name="subscription" type="GenericValue" mode="OUT" optional="true"/>
+    </service>
 </services>        
\ No newline at end of file