WebSVN – svn1-original – Diff – /Mara/branches/2008Work1/upload.c

 unsigned char manstart;                          /* Manual start time entry */
 menu_table  sup_menu[] = {
     { '1', "Load team information from external file", tupload },
+    { '2', "Store team information from external file", tdnload_store },
-    { '2', "Create external team information file", tdnload },
+    { '3', "Create external team information file", tdnload },
-    { '3', "Create external leg data file", dnload },
+    { '4', "Create external leg data file", dnload },
-    { '4', "Upload time information", upload },
+    { '5', "Upload time information", upload },
     { 'q', "Return to main menu", 0 },
     { '\0' }
 };
 /*========================================================================
         /*
         **  The first entry on the line should be team number
         **  If it is not a valid team number then skip
         */
         if( ! t_parse_number( &linep, &team ) )
+        {
             printf( "No team number: %-30s.\n", line );
             error++;
+        }
 bool t_parse_number( char **linep, int *number )
+{
     long    lnumber;
     char    *work = *linep;
+    char    *endp;
     /*
-    **  Expecting a number
+    **  Extract data from the CSV field
-    **  strtol will remove leading white space
+    **  May need to remove quotes
+    **  Use temp work space
     */
-    lnumber = strtol( work, &work, 10 );
+    t_parse_text( &work, line_text);
     /*
-    **  Skip the trailing delimiter(s)
+    **  Expecting a number
+    **  strtol will remove leading white space
     */
-    while ( p_del(work) )
+    lnumber = strtol( line_text, &endp, 10 );
-    {
-        work++;
-    }
     /*
     **  A valid number ?
+    **  All the field must be numeric, otherwise it wasn't a number
     */
-    if ( lnumber == 0 )
+    if ( lnumber == 0 || *endp  )
         return FALSE;
     *number = (int) lnumber;
     *linep = work;
     return TRUE;
             continue;
+        }
         /*
-        **  A quoted " may be en embedded quote or the end of a quote
+        **  A quoted " may be an embedded quote or the end of a quote
         */
         if ( quoted && uch == '"' )
+        {
             if ( **linep != '"' )
+            {
 /*========================================================================
+ *
  *  Generate team name file
+ *
  *  Purpose:
+ *      This function is called to Generate team name file in the format
+ *      that can be read by the load command
+ *
+ *      The file contains team number,Team name,Team class
+ *      The operator is prompted to enter the name of the file
+ *
+ *  Parameters:
+ *      None
+ *
+ *  Returns:
+ *      Nothing
+ *
+ *========================================================================*/
+void tdnload_store(void)
+{
+    int         i;
+    int         j;
+    cur( 0, 5 );
+    printf( "Create text file of team information" );
+    if( !getfname( "Enter name of the file to create :", ".csv.txt" ) )
+        return;
+    printf( "\n" );
+    /*
+    **  Open printer, with known filename
+    */
+    if( !open_printer_name( ufilename, 2000, FALSE, NULL ) )
+    {
+        beep();
+        sleep( 5 );
+        return;
+    }
+    /*
+    **  Print headings
+    */
+    csv_print( "%s",   "Team Number" );
+    csv_print( "%s",   "Team Name" );
+    csv_print( "%s",   "Class Abr");
+    for( j = 1; j <= config.num_legs; j++ )
+    {
+        csv_print( "%s", "Competitor Name");
+        csv_print( "%s", "Age");
+    }
+    csv_print("\n");
+    /*
+     * Put the data into the file
+     */
+    for( i = config.min_team; i <= config.max_team; i++ )
+    {
+        if( valid_field( i ) && g_record( i, &team_buf ) )
+        {
+            /*
+            **  Basic information
+            **      - Team number
+            **      - Full team name
+            */
+            csv_print( "%d",   team_buf.numb );
+            csv_print( "%s",   team_buf.name );
+            csv_print( "%s",    team_buf.class == 0 ? "" : config.team_class[team_buf.class - 1].abr );
+            for( j = 1; j <= config.num_legs; j++ )
+            {
+                csv_print( "%s", team_buf.members[j-1].name );
+                csv_print( "%d", team_buf.members[j-1].age );
+            }
+            csv_print( "\n" );
+        }
+    }
+    close_printer();
+}
+/*========================================================================
+ *
+ *  Generate team name file
+ *
+ *  Purpose:
  *      This function is called to Generate team name file
+ *
  *      The file contains team number,Team name,Team class
  *      The operator is prompted to enter the name of the file
+ *
         sleep( 5 );
         return;
+    }
     /*
      * Put the data into the file
      */
     for( i = config.min_team; i <= config.max_team; i++ )
+    {
         if( valid_field( i ) && g_record( i, &team_buf ) )
+    }
     /*
      * Find out if Start or End of leg times to be saved
      */
     do
+    {
         d_field( 0, 7, "Start of End of leg to save :", D_USTRING, 1, stend,
                  TRUE, M_UPDATE );
     } while( ( stend[0] != 'S' ) && ( stend[0] != 'E' ) );
     manstart = ( stend[0] == 'S' ? TRUE : FALSE );
     /*
      * Locate the required data file and prepare for processing
      */
     printf( "\n" );
     sprintf( ufilename, ( manstart ? "Sleg%d" : "leg%d" ), leg );   /* Create the file name */
     ufile = fopen( ufilename, "wt" );             /* Open the file for writing */
         sleep( 5 );
         return;
+    }
     /*
      * Write the data to the data file
      */
     for( i = config.min_team; i <= config.max_team; i++ )
+    {
         if( valid_field( i ) && g_record( i, &team_buf ) )

Subversion Repositories svn1-original

(root)/Mara/branches/2008Work1/upload.c – Rev 46 → 54