WebSVN – svn1 – Diff – /Mara/trunk/report.c

 #endif
 #include    "consts.h"
 #include    "structs.h"
 #include    "proto.h"
+void pri_awards_html(void);
 void pri_awards(void);
 void pri_master_index(void);
 char *placing ( int place );
 void pri_name_index(void);
 void pri_name_index_body( void );
 void pri_all_reports (void );
 void pri_leg_body(int leg);
 void pri_eleg_body(int leg);
+void pri_csv_data ( void );
 menu_table  rpt_menu[] = {
     { '1', "Print team order", pri_team },
     { '2', "Print end leg times", pri_leg },
     { '5', "Print final results(All-HTML)", pri_final_html },
     { '6', "Print Interim results", pri_interim },
     { '7', "Update event and class placings", srt_place },
     { '8', "Display summary information", display_summary },
     { '9', "Print summary information", pri_summary },
-    { 'a', "Print Awards only", pri_awards },
+    { 'a', "Print Awards only", pri_awards_html },
     { 'b', "Print Master Index only", pri_master_index },
     { 'c', "Print Name Index only", pri_name_index },
+    { 'e', "Export CSV Report Data", pri_csv_data },
     { 'z', "Print all reports", pri_all_reports },
 #if defined(HI_TECH_C) || defined(__TURBOC__)
     { 'S', "MS-DOS system", ms_system },
 #endif
+        {
             print( "<A NAME=\"Team_%04d\"></A>",team_buf.numb );
+        }
         /*
-        **  Print the basics
+        **  Print the basics (Finishing order)
         **      - Place within complete field
         **      - Team number - with HTML reference to team file
         **      - Class
         */
         print( "%4.4s ", pr_place( team_buf.leg[0].l_place, ptr->flags.bad_times ) );
             /*
             **  Ensure that non-equestrian leg data is not displayed
             */
             if ( j == config.equestrian_leg && team_buf.flags.non_equestrian )
+            {
-                print( "  %-8s %4.4s %4.4s", "-- NE --", "-","-");
+                print( "  %-8s %4.4s %4.4s", "-- NE --", "NE","NE");
+            }
             else
+            {
                 print( "  %-8s %4.4s %4.4s",
                     time_a( team_buf.leg[j].elapsed ),
                   );
+            }
+        }
        /*
-        **  Print the trailer
+        **  Print the trailer (Finishing order)
         **      - Total time
         **      - Category place - with reference to category file
         */
-        print( "  %-8s ",  time_a( team_buf.leg[0].elapsed ) );
+//        print( "  %-8s ",  time_a( team_buf.leg[0].elapsed ) );
+        print( "  %-8s ", time_a( ptr->lege[0] ) );
         if ( report_html ) print( "<A HREF=\"%s#Team_%04d\">",p_filename(filebase, config.team_class[team_buf.class - 1].abr ,"html"), team_buf.numb );
-        print( "%-4.4s", pr_place( team_buf.leg[0].lc_place, ptr->flags.bad_times ) );
+        print( "%-4.4s", pr_place_ne( team_buf.leg[0].lc_place, ptr->flags.bad_times, ptr->flags.non_equestrian ) );
         if ( report_html ) print( "</A>" );
         print( "\n" );
+    }
         for( j = 1; j <= config.num_legs; j++ )
+        {
             /*
             **  Ensure that non-equestrian leg data is not displayed
             */
-            if ( j == config.equestrian_leg && ptr->class == config.nonequestrian_class)
+            if ( j == config.equestrian_leg && (ptr->class == config.nonequestrian_class || ptr->flags.non_equestrian) )
+            {
-                print( "  %-8s %4.4s %4.4s", "-- NE --", "-","-");
+                print( "  %-8s %4.4s %4.4s", "-- NE --", "NE","NE");
+            }
             else
+            {
                 print( "  %-8s %4.4s %4.4s", time_a( team_buf.leg[j].elapsed ),
-                       pr_place( team_buf.leg[j].lc_place, ptr->flags.bad_times ),
+                       pr_place( team_buf.leg[j].lc_place,  ptr->flags.bad_times ),
                        pr_place( team_buf.leg[j].lec_place, ptr->flags.bad_times ) );
+            }
+        }
         /*
         */
         /* print( "  %-8s ", time_a( team_buf.leg[0].elapsed ) ); */
         print( "  %-8s ", time_a( ptr->lege[0] ) );
         if ( report_html ) print( "<A HREF=\"%s#Team_%04d\">", p_filename(filebase, "finish" ,"html"), team_buf.numb );
-        print( "%4.4s", pr_place( team_buf.leg[0].l_place, ptr->flags.bad_times | (ptr->class == config.nonequestrian_class) ) );
+        print( "%4.4s", pr_place( team_buf.leg[0].l_place, ptr->flags.bad_times || (ptr->class == config.nonequestrian_class)));
         if ( report_html ) print( "</A>" );
         print( "\n" );
+    }
     **  Generate the awards report.
     **  This is only available as an HTML report
     */
     if ( report_html )
+    {
-        pri_awards();
+        pri_awards_html();
+    }
     /*
     **  Generate the master index page
     */
+ *
  *  Returns:
  *      Nothing
+ *
  *========================================================================*/
+void pri_awards_html(void)
+{
+    /*
+    **  Generate ALL results with HTML tags
+    */
+    report_html = TRUE;
+    pri_awards();
+    report_html = FALSE;
+}
+/*========================================================================
+ *
+ *  Print award results
+ *
+ *  Purpose:
+ *      This function is called to Print award results
+ *      Keep the page to 80 cols, so that it can be pronted on A4
+ *
+ *  Parameters:
+ *      None
+ *
+ *  Returns:
+ *      Nothing
+ *
+ *========================================================================*/
 void pri_awards(void)
+{
     int j;
     int i;
     int k;
     int windex;
     ty_s_data  *ptr;
     int         last_class;
-    report_html = 1;
     if( !open_printer( "", "awards", 80, report_html, "Prizes and Awards" ) )
         return;
     /*
     **  Generate an index for this page
     */
     print( "\n");
+    if ( report_html )
+    {
-    print( "<hr>" );
+        print( "<hr>" );
-    print( "<A NAME=\"%s\"></A>","INDEX");
+        print( "<A NAME=\"%s\"></A>","INDEX");
+    }
     print( "Award Categories");
     for( j = 1; j <= config.num_class; j++ )
+    {
         /*
         */
         if ( config.class_winners[j-1] <= 0 )
             continue;
         print( "\n");
+        print( "    ");
-        print( "    <A HREF=\"#%s\">",config.team_class[j-1].full_name);
+        if ( report_html ) print( "<A HREF=\"#%s\">",config.team_class[j-1].full_name);
         print( "%s",  config.team_class[j-1].full_name );
-        print( "</A>" );
+        if ( report_html ) print( "</A>" );
+    }
     /*
     **  Manual entries
     */
     print( "\n");
+    print( "    ");
-    print( "    <A HREF=\"#%s\">","Hall Of Fame");
+    if ( report_html ) print( "<A HREF=\"#%s\">","Hall Of Fame");
     print( "%s",  "Hall Of Fame" );
-    print( "</A>" );
+    if ( report_html ) print( "</A>" );
     print( "\n");
+    print( "    ");
-    print( "    <A HREF=\"#%s\">","FASTEST");
+    if ( report_html ) print( "<A HREF=\"#%s\">","FASTEST");
     print( "%s",  "FASTEST" );
-    print( "</A>" );
+    if ( report_html ) print( "</A>" );
     /*
     **  Sort the data by class
     */
     sort_team_data( 0, S_LC );      /* Generate class placement data */
+    {
         /*
         **  Tail for previous entry
         */
         if ( j != 1 )
-            print( "<A HREF=\"#%s\">Awards Index</A>","INDEX");
+            if ( report_html ) print( "<A HREF=\"#%s\">Awards Index</A>","INDEX");
         if ( j > config.num_class  )
             break;
         /*
         **  Header for the class
         */
         print( "\n");
+        if ( report_html )
+        {
-        print( "<hr>" );
+            print( "<hr>" );
-        print( "<A name=\"%s\"></A>",config.team_class[j-1].full_name);
+            print( "<A name=\"%s\"></A>",config.team_class[j-1].full_name);
+        }
+        else
+        {
+            print( "\n");
+        }
+        print( "Category: ");
-        print( "<A HREF=\"%s\">",p_filename(filebase, config.team_class[j - 1].abr ,"html"));
+        if ( report_html ) print( "<A HREF=\"%s\">",p_filename(filebase, config.team_class[j - 1].abr ,"html"));
         print( "%s",  config.team_class[j-1].full_name );
-        print( "</A>" );
+        if ( report_html ) print( "</A>" );
-                if ( config.class_winners[j-1] <= 0 )
+        if ( config.class_winners[j-1] <= 0 )
+        {
             print( "\n");
             print( "No winners awarded" );
             continue;
+        }
                 /*
                 **  If printing an HTML report then we need to mark
                 **  the entry with a reference so that we can link to it
                 */
                 print( "\n");
+                if ( report_html )
+                {
-                print( "<A NAME=\"Team_%04d\">",team_buf.numb );
+                    print( "<A NAME=\"Team_%04d\">",team_buf.numb );
-                print( "</A>" );
+                    print( "</A>" );
+                }
                 /*
                 **  Basic information
                 **      - Team number - with Xref back to full result
                 **      - Full team name
                 **      - Full categoray name
                 */
                 print( "%s", placing(windex) );
+                print( "  Team Name: ");
-                print( "  Team Name: <A HREF=\"%s#Team_%04d\">", p_filename(filebase, "name" ,"html"), team_buf.numb );
+                if ( report_html ) print( "<A HREF=\"%s#Team_%04d\">", p_filename(filebase, "name" ,"html"), team_buf.numb );
                 print( "%-*s ",     MAX_TM_NAME, team_buf.name );
-                print( "</A>" );
+                    if ( report_html ) print( "</A>" );
+                print( "  Number: ");
-                print( "  Number: <A HREF=\"%s#Team_%04d\">", p_filename(filebase, "finish" ,"html"), team_buf.numb );
+                if ( report_html ) print( "<A HREF=\"%s#Team_%04d\">", p_filename(filebase, "finish" ,"html"), team_buf.numb );
                 print( "%4d",       team_buf.numb );
-                print( "</A>" );
+                if ( report_html ) print( "</A>" );
                 for( k = 0; k < MAX_MEMB; k++ )
+                {
     /*
     **  Generate the Hall of Fame information
     */
     print( "\n");
+    if ( report_html )
+    {
-    print( "<hr>" );
+        print( "<hr>" );
-    print( "<A name=\"%s\"></A>","Hall Of Fame");
+        print( "<A name=\"%s\"></A>","Hall Of Fame");
+    }
     print( "%s",  "Hall of Fame" );
     if ( config.num_fame  )
+    {
         for( i = 1; i <= config.num_fame; i++ )
+        {
+            print( "\n");
-            print( "\n    %-*s", MAX_PERSON_NAME, config.hall_fame[i-1] );
+            print( "    %-*s", MAX_PERSON_NAME, config.hall_fame[i-1] );
+        }
+    }
     else
+    {
         printf( "\n    There are no new stars for the Hall of Fame");
+    }
-    print( "<p><A HREF=\"#%s\">Awards Index</A>","INDEX");
+    if ( report_html ) print( "<p><A HREF=\"#%s\">Awards Index</A>","INDEX");
     /*
     **  Generate the FASTEST information
     */
+    print( "\n" );
+    if ( report_html )
+    {
-    print( "<hr>" );
+        print( "<hr>" );
-    print( "<A name=\"%s\"></A>","FASTEST");
+        print( "<A name=\"%s\"></A>","FASTEST");
+    }
+    else
+    {
+        print( "\n" );
+    }
     print( "%s",  "FASTEST" );
     /*
     **  Sort the data and then generate the stats - again
     */
+    {
         g_record( stats.fast.team[i][0], &team_buf );
         print( "\n");
         print( "    %-13s ", config.leg_name[i - 1] );
+        print( "  Name: ");
-        print( "  Name: <A HREF=\"%s#Team_%04d\">", p_filename(filebase, "name" ,"html"), team_buf.numb );
+        if ( report_html ) print( "<A HREF=\"%s#Team_%04d\">", p_filename(filebase, "name" ,"html"), team_buf.numb );
         print( "%-*s", MAX_PERSON_NAME, team_buf.members[i-1].name );
+        if ( report_html ) print( "</A>" );
-        print( "</A>" );
+        print( "  Team :");
-        print( "  Team :<A HREF=\"%s#Team_%04d\">", p_filename(filebase, "finish" ,"html"), team_buf.numb );
+        if ( report_html ) print( "<A HREF=\"%s#Team_%04d\">", p_filename(filebase, "finish" ,"html"), team_buf.numb );
         print( "%4d" , stats.fast.team[i][0] );
-        print( "</A> " );
+        if ( report_html ) print( "</A> " );
         print( "Time:%s ", time_a( stats.fast.time[i][0] ) );
+    }
-    print( "<p><A HREF=\"#%s\">Awards Index</A>","INDEX");
+    if ( report_html ) print( "<p><A HREF=\"#%s\">Awards Index</A>","INDEX");
+    print( "\n");
     close_printer();
+}
 /*========================================================================
+ *
     print_legend(last_class, 1);
     close_printer();
+}
+/*----------------------------------------------------------------------------
+** FUNCTION           : pri_csv_data
+**
+** DESCRIPTION        : Generate a CSV file of all the report data
+**                      It can then be used to play with the data externally
+**
+**
+** INPUTS             : None
+**
+** RETURNS            : Yes it does
+**
+----------------------------------------------------------------------------*/
+void pri_csv_data ( void )
+{
+    int i;
+    int j;
+    int age_sum;
+    /*
+    **  Sort on every thing
+    **  Then generate all the stats too
+    */
+    printf( "\nSorting the data\n" );
+    do_big_sort();
+    gen_stats();
+    /*
+     * Now print the data on the printer
+     */
+    if( !open_printer( "full_data", "csv", 2000, FALSE, NULL ) )
+        return;
+    printf( "\nGenerating the printed output\n" );
+    /*
+    **  Print headings
+    */
+    csv_print( "%s",   "Team Number" );
+    csv_print( "%s",   "Team Name" );
+    csv_print( "%s",    "Class Full");
+    csv_print( "%s",    "Class Abr");
+    csv_print( "%s",    "Class Start Time");
+    csv_print( "%s",    "Class Start Time Number");
+    csv_print( "%s",    "Team Country");
+    for( j = 1; j <= config.num_legs; j++ )
+    {
+        csv_print( "%s", "Leg Number" );
+        csv_print( "%s", "Leg Name");
+        csv_print( "%s", "Competitor Name");
+        csv_print( "%s", "Sex" );
+        csv_print( "%s", "Age");
+        csv_print( "%s", "Start Time");
+        csv_print( "%s", "Start Time Number");
+        csv_print( "%s", "End Time" );
+        csv_print( "%s", "End Time Number" );
+        csv_print( "%s", "Elapsed Time");
+        csv_print( "%s", "Elapsed Time Number");
+        csv_print( "%s", "Leg Place");
+        csv_print( "%s", "Leg End Place");
+        csv_print( "%s", "Leg Class Place");
+        csv_print( "%s", "Leg End Class Place");
+        csv_print( "%s", "Manual");
+    }
+    j = 0;
+    csv_print( "%s", "Team Start Time");
+    csv_print( "%s", "Team Start Time Number");
+    csv_print( "%s", "Team End Time");
+    csv_print( "%s", "Team End Time Number");
+    csv_print( "%s", "Team Elapsed Time");
+    csv_print( "%s", "Team Elapsed Time Number");
+//            csv_print( "%s", team_buf.leg[j].l_place );
+    csv_print( "%s", "Team Leg End Place");
+//            csv_print( "%s", team_buf.leg[j].lc_place );
+    csv_print( "%s", "Team Leg Class Place");
+//            csv_print( "%s", team_buf.leg[j].manual );
+    csv_print( "%s", "Total Team Age");
+    csv_print( "%s", "Flag:valid Team");
+    csv_print( "%s", "Flag:bad_times" );
+    csv_print( "%s", "Flag:disqualified" );
+    csv_print( "%s", "Flag:non_equestrian" );
+    csv_print("\n");
+    for( i = config.min_team; i <= config.max_team; i++ )
+    {
+        if( valid_field( i ) && g_record( i, &team_buf ) )
+        {
+            /*
+            **  Basic information
+            **      - Team number - with Xref back to full result
+            **      - Full team name
+            **      - Full categoray name - with Xref to category results
+            **      - Country 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].full_name );
+            csv_print( "%s",    team_buf.class == 0 ? "" : config.team_class[team_buf.class - 1].abr );
+            csv_print( "%s",    time_a (team_buf.class == 0 ? 0 : config.team_class[team_buf.class - 1].start ));
+            csv_print( "%d",    team_buf.class == 0 ? 0 : config.team_class[team_buf.class - 1].start );
+            csv_print( "%s",    config.num_countries == 0
+                                || team_buf.country ==
+? "" : config.country_name[team_buf.country - 1].full_name );
+            age_sum = 0;
+            for( j = 1; j <= config.num_legs; j++ )
+            {
+                csv_print( "%d", j );
+                csv_print( "%s", config.leg_name[j - 1] );
+                csv_print( "%s", team_buf.members[j-1].name );
+                csv_print( "%s", ( team_buf.members[j-1].sex == male ) ? "Male" : "Female" );
+                csv_print( "%d", team_buf.members[j-1].age );
+                if ( age_sum >= 0 )
+                {
+                    ushort age = team_buf.members[j-1].age;
+                    if ( age > 0 && age < 255 )
+                    {
+                        age_sum += age;
+                    }
+                    else
+                    {
+                        age_sum = -1;
+                    }
+                }
+                csv_print( "%s", time_a(team_buf.leg[j].start ));
+                csv_print( "%d", team_buf.leg[j].start );
+                csv_print( "%s", time_a(team_buf.leg[j].end ));
+                csv_print( "%d", team_buf.leg[j].end );
+                csv_print( "%s", time_a(team_buf.leg[j].elapsed ));
+                csv_print( "%d", team_buf.leg[j].elapsed );
+                csv_print( "%d", team_buf.leg[j].l_place );
+                csv_print( "%d", team_buf.leg[j].le_place );
+                csv_print( "%d", team_buf.leg[j].lc_place );
+                csv_print( "%d", team_buf.leg[j].lec_place );
+                csv_print( "%d", team_buf.leg[j].manual );
+            }
+            j = 0;
+            csv_print( "%s", time_a(team_buf.leg[j].start ));
+            csv_print( "%d", team_buf.leg[j].start );
+            csv_print( "%s", time_a(team_buf.leg[j].end ));
+            csv_print( "%d", team_buf.leg[j].end );
+            csv_print( "%s", time_a(team_buf.leg[j].elapsed ));
+            csv_print( "%d", team_buf.leg[j].elapsed );
+//            csv_print( "%d", team_buf.leg[j].l_place );
+            csv_print( "%d", team_buf.leg[j].le_place );
+//            csv_print( "%d", team_buf.leg[j].lc_place );
+            csv_print( "%d", team_buf.leg[j].lec_place );
+//            csv_print( "%d", team_buf.leg[j].manual );
+            csv_print( "%d", age_sum );
+            csv_print( "%d", team_buf.flags.valid );
+            csv_print( "%d", team_buf.flags.bad_times );
+            csv_print( "%d", team_buf.flags.disqualified );
+            csv_print( "%d", team_buf.flags.non_equestrian );
+//How about class placings
+            csv_print( "\n" );
+        }
+    }
+    close_printer();
+}
 /*========================================================================
+ *
  *  Print all reports at once
- ^  Its all so fast, these days ...
+ *  Its all so fast, these days ...
+ *
  *  Purpose:
  *      This function is called to print all reports at once
+ *
  *  Parameters:
         report_html = FALSE;
+    }
     pri_final();
     pri_final_html();
+    pri_csv_data();
     pri_summary();
+    pri_awards_html();
     pri_awards();
     pri_master_index();
     report_all = FALSE;
+}
     if ( full )
+    {
         print( "\nPlace numbers (LP and EP)\n" );
         print( "LP - Placing based on elapsed time within the leg.                Cat Plce - Placing within the category.\n" );
         print( "EP - Placing based on accumulated times to the end of that leg.   Fin Plce - Overall placing within the event.\n" );
+        print( "U  - Placing not available.\n" );
+    }
     /*
      *  Insert the contents of the config.addendum file
      *  or a defualt message
+}
 /*========================================================================
+ *
+ *  Return place data
+ *
+ *  Purpose:
+ *      This function is called to Return place data
+ *
+ *      This routine is called to fill a print team_buffer - to allow for
+ *      multiple calls to this function ( before the data is used ) a number
+ *      of static team_buffers are maintained
+ *
+ *  Parameters:
+ *      num         place - if not bad_times
+ *      disq        Disqualified flag
+ *      ne          Non Equestrian Flag
+ *
+ *  Returns:
+ *      This function returns a pointer to the character string for the
+ *      number or a pointer to a bad_times string.
+ *
+ *========================================================================*/
+char *pr_place_ne( int num, int disq, int ne )
+{
+    static char store[2][5];                     /* 2 stores for 4 digit numbers */
+    static int  i = 0;                           /* Current index into store */
+    static char *dis = "U";
+    if( disq && ! ne )
+         return ( dis );
+    if( ++i >= 2 )
+        i = 0;                                   /* Select next entry */
+    sprintf( store[i], "%4d", num );
+    return ( store[i] );
+}
+/*========================================================================
+ *
  *  Check data for bad times
+ *
  *  Purpose:
  *      This function is called to Check data for bad times
  *      Scan the sort data structure and locate entries that have incorrect
         if( mode == C_ELAPSED )
             t = ptr->lege;
         else
             t = ptr->leg;
+        if ( leg >= 0 )
+        {
+            ptr->flags.bad_times = (ptr->flags.disqualified && ! ptr->flags.non_equestrian);
+        }
+        else
+        {
-        if( ( ptr->flags.bad_times = ptr->flags.disqualified ) == FALSE )
+            ptr->flags.bad_times = ptr->flags.disqualified;
+        }
+        if( ! ptr->flags.bad_times )
+        {
             if( leg <= 0 )
+            {
                 for( k = 0; k <= config.num_legs; k++ )
+                {
     for( i = 0; i <= config.num_legs; i++ )
+    {
         /*
         **  Sort on leg elapsed time
-        **  The save the teams elapsed place in each leg
+        **  Then save the teams elapsed place in each leg
         */
         sort_team_data( i, S_L );
-        for( j = 1, ptr = sort_data; j <= sort_num; j++, ptr++ )
+        for( j = 1, k = 1, ptr = sort_data; j <= sort_num; ptr++, j++ )
+        {
+            if ( ptr->class == config.nonequestrian_class )
+                continue;
-            sort_aux[ptr->team].l_place[i] = j;
+            sort_aux[ptr->team].l_place[i] = k++;
             sort_aux[ptr->team].team = ptr->team;
+        }
         /*
         **  Sort on leg end time
         **  Then save the teams place at the end of each leg
         */
         sort_team_data( i, S_LE );
-        for( j = 1, ptr = sort_data; j <= sort_num; j++, ptr++ )
+        for( j = 1, k = 1, ptr = sort_data; j <= sort_num; ptr++, j++ )
+        {
+            if ( ptr->class == config.nonequestrian_class )
+                continue;
-            sort_aux[ptr->team].le_place[i] = j;
+            sort_aux[ptr->team].le_place[i] = k++;
+        }
         /*
         **  Sort on elapsed time per class
         **  The save the teams elapsed place in each leg per class
         */
     */
     if( sort_mode == S_LEC || sort_mode == S_LC )   /* Sort within a class */
         if( a->class != b->class )
             return ( a->class - b->class );
+#if 1
+    /*
+    **  Always put the nonequestrian_class at the end
+    **  Simplifies the creation of ordered lists as these
+    **  Entries are not present in the main body
+    */
+    if ( a->class == config.nonequestrian_class ||  b->class == config.nonequestrian_class )
+    {
+        if ( a->class == config.nonequestrian_class &&  b->class == config.nonequestrian_class )
+        {
+        }
+        else
+        {
+            return ( a->class == config.nonequestrian_class ? 1 : -1 );
+        }
+    }
+#endif
     /*
     **  Now we need to examine the times as we have sorted
     **  on every thing else.
     **
     **  If one of the teams has bad_times, then that team is placed
     **  lower in the sorting order. If both teams have bad times
     **  then sort on team number. ie: Unplaced teams are sorted on
     **  team number
+    **
+    **  If not sorting within a class (ie Overall), then Non_Equestrian
+    **  is better than a bad time. Places NE before disqualified
+    **
+    **
+    **  Note: NE also have bad_times set
     */
+#if 1
+    if( a->flags.bad_times || b->flags.bad_times )  /* Valid data has precedence */
+    {
+        if( a->flags.bad_times && b->flags.bad_times )
+        {
+            if( a->flags.non_equestrian || b->flags.non_equestrian )
+            {
+                if( a->flags.non_equestrian && b->flags.non_equestrian )
+                {
+                    /*
+                    **  Both are non equestrian
+                    **  Let the time sort operate ...
+                    */
+                    //return ( a->team - b->team );
+                }
+                else
+                {
+                    /* One is equestrian */
+                    /* Good times better than NE */
+                    return ( a->flags.non_equestrian ? -1 : 1 );
+                }
+            }
+            else
+            {
+                /* Neither is equestrian */
+                return ( a->team - b->team );
+            }
+        }
+        else
+            return ( a->flags.bad_times ? 1 : -1 );
+    }
+#else
     if( a->flags.bad_times || b->flags.bad_times )  /* Valid data has precedence */
+    {
         if( a->flags.bad_times && b->flags.bad_times )
             return ( a->team - b->team );
         else
                 return ( a->team - b->team );
             else
                 return ( a->flags.non_equestrian ? 1 : -1 );
+        }
+    }
+#endif
     /*
     **  Before we sort on times we must determine which time to
     **  use. Finish time, Leg end times, Leg Elapsed times.
     */
 bool load_report_data(void)
+{
     ty_s_data  *ptr;                             /* pointer to sort data type */
+    ty_s_data  *last;
     int         j;
     unsigned    num;
     printf( "Loading team information - This will not hurt" );
     flush_out();
         if( valid_field( team ) )
+        {
             g_record( team, &team_buf );
             if( team_buf.flags.valid )
+            {
+                last = ptr;
                 ptr->team = team;
                 for( j = 0; j < MAX_LEGS + 1; j++ )
+                {
                     ptr->lege[j] = team_buf.leg[j].elapsed;
                     ptr->leg[j] = team_buf.leg[j].end;
                 **  If non-equestrian support is enabled then
                 **  duplicate and modify data for the non-equestrian teams
                 **      - Change the class
                 **      - Modify the leg time
                 */
+#if 1
                 if ( config.nonequestrian_class && team_buf.flags.non_equestrian )
+                {
                     ptr->team = team;
                     ptr->lege[0] = 0;
                     for( j = 0; j < MAX_LEGS + 1; j++ )
+                    {
                         if ( j == config.equestrian_leg )
+                        {
-                            ptr->lege[j] = 0;
+                            last->lege[j] = ptr->lege[j] = 0;
                             if ( config.equestrian_leg > 1 )
-                                ptr->leg[j] = ptr->leg[j-1];
+                                last->leg[j] = ptr->leg[j] = ptr->leg[j-1];
+                        }
                         else
+                        {
                             if ( j )
-                                ptr->lege[j] = team_buf.leg[j].elapsed;
+                                last-> lege[j] = ptr->lege[j] = team_buf.leg[j].elapsed;
-                            ptr->leg[j] = team_buf.leg[j].end;
+                            last->leg[j] = ptr->leg[j] = team_buf.leg[j].end;
                             ptr->lege[0] += ptr->lege[j] ;
+                            last->lege[0] = ptr->lege[0] ;
+                        }
+                    }
-                    ptr->start = team_buf.leg[0].start;
+                    last->start = ptr->start = team_buf.leg[0].start;
                     ptr->class = config.nonequestrian_class;
                     ptr->flags = team_buf.flags;
                     ptr->flags.disqualified = 0;
                     ptr++;
                     sort_num++;
+                }
+#endif
+            }
+        }
+    }
     return ( TRUE );
+}

Subversion Repositories svn1

(root)/Mara/trunk/report.c @ 61 – Rev 33 → 61