[grisbi-cvs] grisbi/src gsb_file_load.c, 1.200, 1.201 gsb_scheduler_list.c, 1.76, 1.77 import_csv.c, 1.60, 1.61

[Pierre Biava]

Update of /cvsroot/grisbi/grisbi/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv1751/src

Modified Files:
	gsb_file_load.c gsb_scheduler_list.c import_csv.c 
Log Message:
correction du test de validité des colonnes du fichier CSV

Index: gsb_scheduler_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_scheduler_list.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- gsb_scheduler_list.c	28 Dec 2009 20:29:47 -0000	1.76
+++ gsb_scheduler_list.c	29 Dec 2009 21:32:09 -0000	1.77
@@ -604,7 +604,7 @@
             tmp_list = tmp_list -> next;
         }
 
-        /* if orphan_scheduled is not null, there is still some children
+        /* if string is not null, there is still some children
          * wich didn't find their mother. show them now */
         if ( string )
         {

Index: gsb_file_load.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_load.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- gsb_file_load.c	28 Dec 2009 20:29:47 -0000	1.200
+++ gsb_file_load.c	29 Dec 2009 21:32:09 -0000	1.201
@@ -6162,7 +6162,8 @@
     else
         gsb_data_account_set_init_balance ( account_number, number );
 
-        if (tmp_string) g_free (tmp_string);
+    if (tmp_string)
+        g_free (tmp_string);
     return;
     }
 
@@ -7543,7 +7544,6 @@
         }
 
         /* if t's a child, fix the values to be the same as for mother */
-        //~ mother_number = gsb_data_scheduled_get_mother_scheduled_number (transaction_number);
         mother_number = gsb_data_transaction_get_mother_transaction_number ( transaction_number );
         if (mother_number)
         {
@@ -7671,7 +7671,7 @@
         }
         }
 
-        /* on procède de même pour les opérations planifiées */
+        /* we shall do so for the planned operations */
         list_tmp = gsb_data_scheduled_get_scheduled_list ();
         tmpstr = NULL;
 

Index: import_csv.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import_csv.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- import_csv.c	27 Dec 2009 19:29:18 -0000	1.60
+++ import_csv.c	29 Dec 2009 21:32:09 -0000	1.61
@@ -907,8 +907,12 @@
 
     /** After checking all required fields, check the conformity of
      * transaction amount, which is somewhat complicated. */
-    if ( ! csv_find_field_config ( 11 ) ||
-	 ( csv_find_field_config ( 12 ) && !csv_find_field_config ( 13 ) ) )
+    if ( !( ( csv_find_field_config ( 11 ) && !csv_find_field_config ( 12 ) &&
+           !csv_find_field_config ( 13 ) && !csv_find_field_config ( 14 ) )
+     ||
+     ( !csv_find_field_config ( 11 ) &&  csv_find_field_config ( 12 ) && 
+       ( csv_find_field_config ( 13 ) || csv_find_field_config ( 14 ) ) &&
+       !( csv_find_field_config ( 13 ) && csv_find_field_config ( 14 ) ) ) ) )
     {
         if ( label )
         {
@@ -926,7 +930,7 @@
     {
 	gtk_label_set_markup ( g_object_get_data ( G_OBJECT(assistant), "validity_label" ),
                         g_markup_printf_escaped (
-                        _("<b>Following fields are missing:</b> %s"),
+                        _("<b>The following fields are missing or inconsistent:</b> %s"),
                         label ) );
 	gtk_widget_show ( g_object_get_data ( G_OBJECT(assistant), "validity_icon" ) );
 	gtk_widget_set_sensitive ( g_object_get_data ( G_OBJECT (assistant),
@@ -1134,7 +1138,7 @@
     compte -> origine = my_strdup ( "CSV" );
     compte -> filename = my_strdup ( imported -> name );
 
-    g_file_get_contents ( compte -> filename, &contents, NULL, NULL );
+    contents = g_object_get_data ( G_OBJECT(assistant), "contents" );
     separator = g_object_get_data ( G_OBJECT(assistant), "separator" );
 
     if ( ! csv_fields_config || ! contents )
@@ -1144,8 +1148,6 @@
 	return FALSE;
     }
 
-    contents = g_object_get_data ( G_OBJECT(assistant), "contents" );
-
     list = csv_get_next_line ( &contents, separator );
 
     do