[Erp5-report] r20802 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Apr 24 17:39:47 2008
New Revision: 20802

URL: http://svn.erp5.org?rev=20802&view=rev
Log:
pass no_empty_lines=True to getSpreadsheetsMapping, so that we don't get empty lines (they are skipped later anyway)

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml?rev=20802&r1=20801&r2=20802&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryTool_importCategoryFile.xml Thu Apr 24 17:39:47 2008
@@ -155,7 +155,7 @@
 \n
 # Extract tables from the speadsheet file\n
 filename = OOoParser.getFilename()\n
-spreadsheets = OOoParser.getSpreadsheetsMapping()\n
+spreadsheets = OOoParser.getSpreadsheetsMapping(no_empty_lines=True)\n
 \n
 # Some statistics\n
 new_category_counter = 0\n
@@ -166,7 +166,6 @@
 kept_category_counter = 0\n
 \n
 for table_name in spreadsheets.keys():\n
-\n
   # Get the header of the table\n
   columns_header = spreadsheets[table_name][0]\n
   # Get the mapping to help us know the property according a cell index\n
@@ -476,6 +475,7 @@
                             <string>import_file_content</string>
                             <string>str</string>
                             <string>filename</string>
+                            <string>True</string>
                             <string>spreadsheets</string>
                             <string>new_category_counter</string>
                             <string>updated_category_counter</string>
@@ -521,7 +521,6 @@
                             <string>is_new_category</string>
                             <string>keys</string>
                             <string>base_path_obj</string>
-                            <string>True</string>
                             <string>is_base_category</string>
                             <string>is_valid_category</string>
                             <string>category_id</string>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=20802&r1=20801&r2=20802&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Thu Apr 24 17:39:47 2008
@@ -1,1 +1,1 @@
-816
+817