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

[byersa@svn.ofbiz.org]

Author: byersa
Date: 2006-03-05 00:49:14 -0600 (Sun, 05 Mar 2006)
New Revision: 6921

Modified:
   trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
   trunk/applications/content/servicedef/services.xml
Log:
Fixed some bugs in persistCompDocPdf2Survey.


Modified: trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
===================================================================
--- trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml	2006-03-05 05:31:07 UTC (rev 6920)
+++ trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml	2006-03-05 06:49:14 UTC (rev 6921)
@@ -292,10 +292,10 @@
     
     <simple-method method-name="persistCompDocPdf2Survey" short-description="Upload/save PDF, create Survey, populate Content">
         
-		<set field="pdfMap.contentTypeId" value="DOCUMENT"/>
+		<set field="pdfMap.contentTypeId" value="TEMPLATE"/>
 		<set field="pdfMap.dataResourceTypeId" value="IMAGE_OBJECT"/>
-		<set field="pdfMap.mimeTypeId" value="application/pdf"/>
-		<set field="pdfMap.drMimeTypeId" value="application/pdf"/>
+		<set field="pdfMap.mimeTypeId" value="application/vnd.ofbiz.survey"/>
+		<set field="pdfMap.drMimeTypeId" value="application/vnd.ofbiz.survey"/>
         <set field="pdfMap.imageData" from-field="parameters.imageData"/>
         <set field="pdfMap._imageData_contentType" from-field="parameters._imageData_contentType"/>
         <set field="pdfMap._imageData_fileName" from-field="parameters._imageData_fileName"/>
@@ -314,7 +314,10 @@
 		
         <set-service-fields service-name="persistCompDocContent" map-name="parameters" to-map-name="persistMap"/>
         <set field="persistMap.relatedDetailId" from-field="surveyId"/>
-        <set field="persistMap.drMimeTypeId" value="application/vnd.ofbiz.survey"/>
+        <set field="persistMap.mimeTypeId" value="application/vnd.ofbiz.survey"/>
+		<clear-field field-name="persistMap._imageData_contentType"/>
+		<clear-field field-name="persistMap._imageData_fileName"/>
+		<clear-field field-name="persistMap.imageData"/>
         <log level="info" message="persistCompDocPdf2Survey(4)persistMap : ${persistMap}"/>
         <call-service service-name="persistCompDocContent" in-map-name="persistMap">
         </call-service>

Modified: trunk/applications/content/servicedef/services.xml
===================================================================
--- trunk/applications/content/servicedef/services.xml	2006-03-05 05:31:07 UTC (rev 6920)
+++ trunk/applications/content/servicedef/services.xml	2006-03-05 06:49:14 UTC (rev 6921)
@@ -829,7 +829,7 @@
         transaction-timout="72000" 
             location="org.ofbiz.content.ContentManagementServices" invoke="persistDataResourceAndData" auth="true">
         <description>Persist a  DataResource and data</description>
-        <auto-attributes entity-name="DataResource" include="all" mode="IN" optional="true">
+        <auto-attributes entity-name="DataResource" include="all" mode="IN" optional="true" >
             <exclude field-name="dataResourceId"/>
         </auto-attributes>
         <auto-attributes entity-name="ElectronicText" include="all" mode="IN" optional="true">