diff --git a/bt5/erp5_wendelin_examples/ExtensionTemplateItem/portal_components/extension.erp5.WendelinExamples.py b/bt5/erp5_wendelin_examples/ExtensionTemplateItem/portal_components/extension.erp5.WendelinExamples.py index 568eff232b302bdf5d8b84879800a10fe47b98b2..3f501ed270985f066727837343398dab2b922cae 100644 --- a/bt5/erp5_wendelin_examples/ExtensionTemplateItem/portal_components/extension.erp5.WendelinExamples.py +++ b/bt5/erp5_wendelin_examples/ExtensionTemplateItem/portal_components/extension.erp5.WendelinExamples.py @@ -12,7 +12,7 @@ import string def getRandomString(): return 'test_%s' %''.join([random.choice(string.ascii_letters + string.digits) \ for n in xrange(32)]) - + # Game of Life examples default_input_ndarray = np.array([[0,0,0,0,0,0], [0,0,0,1,0,0], @@ -46,7 +46,7 @@ def game_of_life_out_of_core(self): reference = array_reference, version = '001') data_array.initArray((6,6), uint8) - + life_area = data_array.getArray()[:,:] # ZBigArray -> ndarray view of it # change the data, exactly as if working with numpy.ndarray but @@ -55,10 +55,10 @@ def game_of_life_out_of_core(self): transaction.commit() print_list.append(str(life_area)) - for i in range(4): + for i in range(4): iterate_2(life_area) print_list.append(str(life_area)) - + return '\n\n'.join(print_list) def ERP5Site_gameOfLife(self, array_reference): @@ -69,14 +69,14 @@ def ERP5Site_gameOfLife(self, array_reference): portal_type = 'Data Array', reference = array_reference) life_area = data_array.getArray()[:,:] # ZBigArray -> ndarray view of it - + # we make a copy, with big volumes maybe not wise input_life_area = np.copy(life_area) - + # do real calculation on ndarray iterate_2(life_area) self.log(str(life_area)) - + if not (input_life_area==life_area).all(): # input array not equals output array, in this case we can continue # until we find a solution or an end stage @@ -97,10 +97,10 @@ def game_of_life_out_of_core_activities(self): data_array.initArray((6,6), uint8) life_area = data_array.getArray()[:,:] # ZBigArray -> ndarray view of it - + # initialise life_area[:,:] = default_input_ndarray - + transaction.commit() # start calculation in background using activities @@ -117,12 +117,12 @@ def game_of_life(self): Z = default_input_ndarray print_list.append(str(Z)) - for i in range(4): + for i in range(4): iterate_2(Z) print_list.append(str(Z)) return '\n\n'.join(print_list) - + def DataArray_calculateArraySliceAverageAndStore(self, start, end): """ Compute average on a data array slice and store result on an Active Process. diff --git a/bt5/erp5_wendelin_examples/ExtensionTemplateItem/portal_components/extension.erp5.WendelinExamples.xml b/bt5/erp5_wendelin_examples/ExtensionTemplateItem/portal_components/extension.erp5.WendelinExamples.xml index 5c33287f3de263fc8e4a2485032360320ff8b099..b468f287662533aad6da9b43d33d77deec64c98d 100644 --- a/bt5/erp5_wendelin_examples/ExtensionTemplateItem/portal_components/extension.erp5.WendelinExamples.xml +++ b/bt5/erp5_wendelin_examples/ExtensionTemplateItem/portal_components/extension.erp5.WendelinExamples.xml @@ -6,12 +6,6 @@ </pickle> <pickle> <dictionary> - <item> - <key> <string>_recorded_property_dict</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> <item> <key> <string>default_reference</string> </key> <value> <string>WendelinExamples</string> </value> @@ -59,28 +53,13 @@ <item> <key> <string>workflow_history</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> </dictionary> </pickle> </record> <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <global name="PersistentMapping" module="Persistence.mapping"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>data</string> </key> - <value> - <dictionary/> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> <pickle> <global name="PersistentMapping" module="Persistence.mapping"/> </pickle> @@ -93,7 +72,7 @@ <item> <key> <string>component_validation_workflow</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> </dictionary> @@ -102,26 +81,30 @@ </dictionary> </pickle> </record> - <record id="4" aka="AAAAAAAAAAQ="> + <record id="3" aka="AAAAAAAAAAM="> <pickle> - <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> + <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/> </pickle> <pickle> - <tuple> - <none/> - <list> - <dictionary> - <item> - <key> <string>action</string> </key> - <value> <string>validate</string> </value> - </item> - <item> - <key> <string>validation_state</string> </key> - <value> <string>validated</string> </value> - </item> - </dictionary> - </list> - </tuple> + <dictionary> + <item> + <key> <string>_log</string> </key> + <value> + <list> + <dictionary> + <item> + <key> <string>action</string> </key> + <value> <string>validate</string> </value> + </item> + <item> + <key> <string>validation_state</string> </key> + <value> <string>validated</string> </value> + </item> + </dictionary> + </list> + </value> + </item> + </dictionary> </pickle> </record> </ZopeData>