[zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - synchronizeSkeleton.py:1.31

[Sidnei da Silva]

Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions
In directory cvs.zope.org:/tmp/cvs-serv22483/Extensions

Modified Files:
	synchronizeSkeleton.py 
Log Message:
One error in form action

=== Products/ZopeOrg-NV/Extensions/synchronizeSkeleton.py 1.30 => 1.31 ===
             fs_file = os.path.join( skel_path, elem_path )
             (elem_id, elem_ext) = os.path.splitext( elem )
 
-            if hasattr( aq_base( cur_obj ), elem_id ):
+            __traceback_info__ = (fs_file, elem)
+            if hasattr( aq_base( cur_obj ), elem_id ) and getattr(cur_obj, elem_id) is not None:
                 if not os.path.isdir( fs_file ):
                     cur_obj._delObject( elem_id )
                 else:
@@ -66,11 +67,11 @@
                                    , description=prop_dict.get( 'description', '' )
                                    )
 
-            if not hasattr( aq_base( cur_obj ), elem_id ):
+            if not hasattr( aq_base( cur_obj ), elem_id ) or getattr(cur_obj, elem_id) is None:
                 _createObject( cur_obj, path )
-            
+
             cur_obj = getattr( cur_obj, elem_id )
-    
+
     return string.join( log, '\n' )
 
 
@@ -92,13 +93,13 @@
     f_name, f_ext = os.path.splitext( os.path.split( path )[1] )
 
     if os.path.isdir( path ):
-        container_obj.manage_addPortalFolder( f_name )
+        container_obj.manage_addPloneFolder( f_name )
         prop_dict = _getProps( path )
         folder_obj = getattr( container_obj, f_name )
         folder_obj.edit( title=prop_dict.get( 'title', '' )
                        , description=prop_dict.get( 'description', '' )
                        )
-                
+
     else:
         f_handle = open( path, 'r' )
         f_data = f_handle.read()
@@ -110,11 +111,10 @@
             wf_tool = getattr(container_obj, 'portal_workflow')
             wf_objs = wf_tool.getWorkflowsFor(obj)
             for wf_obj in wf_objs:
-                wf_obj.setReviewStateOf(ob=obj
-                                      , review_state='published'
-                                      , action='publish'
-                                      , comment=''
-                                       )
+                wf_obj.doActionFor(ob=obj
+                                   , action='publish'
+                                   , comment=''
+                                   )
         elif f_ext == '.ps' or f_ext == '.py':
             py_obj = PythonScript( id=f_name )
             py_obj.write( f_data )
@@ -152,13 +152,12 @@
             wf_tool = getattr(container_obj, 'portal_workflow')
             wf_objs = wf_tool.getWorkflowsFor(obj)
             for wf_obj in wf_objs:
-                wf_obj.setReviewStateOf(ob=obj
-                                      , review_state='published'
-                                      , action='publish'
-                                      , comment=''
-                                       )
+                wf_obj.doActionFor(ob=obj
+                                   , action='publish'
+                                   , comment=''
+                                   )
             obj.reindexObject()
-            
+
         elif f_ext == '.link':
             link_dict = eval(f_data)
             container_obj.invokeFactory(id=f_name
@@ -171,11 +170,10 @@
             wf_tool = getattr(container_obj, 'portal_workflow')
             wf_objs = wf_tool.getWorkflowsFor(obj)
             for wf_obj in wf_objs:
-                wf_obj.setReviewStateOf(ob=obj
-                                      , review_state='published'
-                                      , action='publish'
-                                      , comment=''
-                                       )
+                wf_obj.doActionFor(ob=obj
+                                   , action='publish'
+                                   , comment=''
+                                   )
             obj.reindexObject()
 
         elif f_ext == '.html':
@@ -185,15 +183,14 @@
             h, b, f = obj.handleText(f_data, format="html")
             obj.setMetadata(h)
             obj._edit(text=b)
-            
+
             wf_tool = getattr(container_obj, 'portal_workflow')
             wf_objs = wf_tool.getWorkflowsFor(obj)
             for wf_obj in wf_objs:
-                wf_obj.setReviewStateOf(ob=obj
-                                      , review_state='published'
-                                      , action='publish'
-                                      , comment=''
-                                       )
+                wf_obj.doActionFor(ob=obj
+                                   , action='publish'
+                                   , comment=''
+                                   )
             obj.reindexObject()
         elif f_ext == '.cl':
             container_obj.invokeFactory(id=f_name, type_name='Content List')
@@ -203,11 +200,10 @@
             wf_tool = getattr(container_obj, 'portal_workflow')
             wf_objs = wf_tool.getWorkflowsFor(obj)
             for wf_obj in wf_objs:
-                wf_obj.setReviewStateOf(ob=obj
-                                      , review_state='published'
-                                      , action='publish'
-                                      , comment=''
-                                       )
+                wf_obj.doActionFor(ob=obj
+                                   , action='publish'
+                                   , comment=''
+                                   )
             obj.reindexObject()