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

 *       pri_final               - Print final results
 *       pri_interim             - Print interim results
 *       print_class_header      - Print a class header
 *       print_class_stats       - Generate the class stats
 *       print_legend            - Print the legend
-*       pi_place                - Return place data
-*       pr_place                - Return place data
+*       px_place                - Return place data with NE and V indication
 *       ck_data                 - Check data for bad times
 *       srt_place               - Update placing information
 *       do_big_sort             - Main sort routine for final data
 *       sort                    - Sort in memory buffer
 *       sort_comp               - qsort comparison function
 #include    "structs.h"
 #include    "proto.h"
 #include    "mainwindow.h"
 void pri_awards_html(void);
+void pri_summary_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 );
     "Eleventh"
 };
 int         sort_leg;
 int         sort_mode;
+bool        sort_withEquestrian;
+bool        sort_afterEquestrianLeg;
 report_type report_html = text;
 bool        report_all = FALSE;
 /* Parameters used by the sort routine to govern its actions */
 #define S_LEC   4                                /* Leg end time per class */
 #define S_FIN   5                                /* Sort on finish time at given leg */
 #define S_TEAM  6                                /* Sort on team order */
 #define S_CLASS 7                                /* Sort on class/team order */
 #define S_LC_NE 8                                /* Elapsed times per class, with NE sorted by real class */
+#define S_IFIN  9                                /* Sort on elapsed time at given leg */
 /*
 **  Various checking modes
 */
 #define C_ELAPSED   1                            /* Check elapsed times */
             **      - Team number - with Xref back to full result
             **      - Full team name
             **      - Full categoray name - with Xref to category results
             **      - Country name
             */
-            if ( report_html == html ) print( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "finish" ,"html")), team_buf.numb );
+            if ( report_html == html ) setHref( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "finish" ,"html")), team_buf.numb );
             print( "%4d",       team_buf.numb );
-            if ( report_html == html ) print( "</A>" );
             print( " %-*s ",     MAX_TM_NAME, team_buf.name );
-            if ( report_html == html ) print( "<A HREF=\"%s#Team_%04d\">",url_encode(p_filename(filebase, config.team_class[team_buf.teamclass - 1].abr ,"html")), team_buf.numb );
+            if ( report_html == html ) setHref( "<A HREF=\"%s#Team_%04d\">",url_encode(p_filename(filebase, config.team_class[team_buf.teamclass - 1].abr ,"html")), team_buf.numb );
             print( "%-*s",     LEN_CLASS_NAME, team_buf.teamclass == 0 ? "" : config.team_class[team_buf.teamclass - 1].full_name );
-            if ( report_html == html ) print( "</A>" );
             print( " %-*s",     config.num_countries == 0 ? 1 : LEN_CNTRY_NAME,
                                 config.num_countries == 0
                                 || team_buf.country ==
 ? "" : config.country_name[team_buf.country - 1].full_name );
      * Print out the header
      */
     print( "\n" );
     print_underline( TRUE );
-    print( "%-*s %-*s %-*s %-*s", MAX_TM_NAME + 5, "Competitor name",
+    print( "%-*s %*s %*s %-*s", MAX_TM_NAME + 5, "Competitor name",
 , "Leg",
 , "Team",
                LEN_CLASS_NAME, "Category"
                );
     print_underline( FALSE ) ;
     for( k = 1; k <= sort_num_data; k++, ptr++ )
+    {
         print( "%-*s", MAX_TM_NAME + 5, ptr->name );
         print( " " );
-        if ( report_html == html ) print( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "finish" ,"html")), ptr->team );
+        if ( report_html == html ) setHref( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "finish" ,"html")), ptr->team );
-        print( "%-*d", 6, ptr->leg + 1 );
+        print( "%*d", 6, ptr->leg + 1 );
-        if ( report_html == html ) print( "</A>" );
         print( " " );
-        if ( report_html == html ) print( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "name" ,"html")), ptr->team );
+        if ( report_html == html ) setHref( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "name" ,"html")), ptr->team );
-        print( "%-*d", 5, ptr->team );
+        print( "%*d", 5, ptr->team );
-        if ( report_html == html ) print( "</A>" );
         print( " " );
-        if ( report_html == html ) print( "<A HREF=\"%s#Team_%04d\">",(p_filename(filebase, config.team_class[ptr->teamclass - 1].abr ,"html")), ptr->team );
+        if ( report_html == html ) setHref( "<A HREF=\"%s#Team_%04d\">",(p_filename(filebase, config.team_class[ptr->teamclass - 1].abr ,"html")), ptr->team );
         print( "%-*s", LEN_CLASS_NAME, ptr->teamclass == 0 ? "" : config.team_class[ptr->teamclass - 1].abr );
-        if ( report_html == html ) print( "</A>" );
         print( " " );
         if ( ptr->multi ) print( "* ");
         print( "\n" );
+    }
     /*
      * Sort the data in finishing order
      */
-    if( ck_data( leg, C_END ) )
-        return;                                  /* Check data for this leg */
+    ck_data( leg, C_END );                      /* Check data for this leg */
-    sort_team_data( leg, S_FIN );                /* Sort the data */
+    sort_team_data( leg, S_FIN, true );         /* Sort the data */
     /*
      * Now print the data on the printer
      */
     for( ptr = sort_data, k = 0, i = config.min_team; i <= config.max_team; )
+    {
         p_place( ptr++, leg, k++ );
         p_place( ptr++, leg, k++ );
         print( "|" );
         while( i <= config.max_team && !valid_field( i ) )
             i++;
         p_team( i++, leg );
         while( i <= config.max_team && !valid_field( i ) )
 void p_place( ty_s_data * ptr, int leg, unsigned k )
+{
     if( k < sort_num )
+    {
         print( "%4.4s %4d %8s  ",
-               pr_place( ptr->place, ptr->flags.bad_times ),
+               px_place(-1, ptr->place, false, false, ptr->flags ),
                ptr->team, time_fa( ptr->leg[leg], ptr->flags.disqualified ) );
+    }
     else
+    {
         print( "%20s", "" );
+    }
     if( found )
+    {
         print( "%4d %4.4s %8s  ",
                ptra->team,
-               pr_place( ptra->place, ptra->flags.bad_times ),
+               px_place( -1, ptra->place, false, false, ptra->flags ),
                time_fa( ptra->leg[leg], ptra->flags.disqualified ) );
+    }
     else
+    {
         print( "%20s", "" );
     /*
      * Sort the data in finishing order
      */
-    if( ck_data( leg, C_ELAPSED ) )
-        return;                                  /* Check data for this leg */
+    ck_data( leg, C_ELAPSED );                      /* Check data for this leg */
-    sort_team_data( leg, S_L );                  /* Sort the data on elapsed time */
+    sort_team_data( leg, S_IFIN, true );            /* Sort the data on elapsed time */
     /*
      * Now print the data on the printer
      */
 // *
 // *  Print place information
 // *
 // *  Purpose:
 // *      This helper function is called to Print place and elapsed information
-// *      in a 20-character field
+// *      in a 20-character field: Place:Team:ElapsedTime
 // *
 // *  Parameters:
 // *      ptr         Address of the place data
 // *      leg         Leg to print
 // *      k           Current index into sorted array. Simply
 void pe_place( ty_s_data * ptr, int leg, unsigned k )
+{
     if( k < sort_num )
+    {
         print( "%4.4s %4d %8s  ",
-               pr_place( ptr->place, ptr->flags.bad_times ),
+               px_place( -1, ptr->place, false, false, ptr->flags ),
                ptr->team,
                time_fa( ptr->lege[leg], ptr->flags.disqualified ) );
+    }
     else
+    {
+    }
     if( found )
+    {
         print( "%4d %4.4s %8s  ",
                ptra->team,
-               pr_place( ptra->place, ptra->flags.bad_times ),
+               px_place( -1, ptra->place, false, false, ptra->flags ),
                time_fa( ptra->lege[leg], ptra->flags.disqualified ) );
+    }
     else
+    {
         print( "%20s", "" );
     /*
     **  Generate ALL results with HTML tags
     */
     report_html = html;
     pri_final();
+    pri_final_teamOrder();
     report_html = printed;
     pri_final();
+    pri_final_teamOrder();
     report_html = text;
+}
 /*========================================================================
     unsigned    i;
     int         j, last_class;
     char        *report_title;
     bool        class_done[MAX_CLASS+1];
     int         lcount;
+    bool        isNeClass = false;
+    ck_data( -1, C_ELAPSED );
-    if( ck_data( -1, C_ELAPSED ) )
-        return;
     /*
     **  Sort on every thing
     **  Then generate all the stats too
     */
     do_big_sort();
         return;
     /*
      * Print out the data
      */
-    print_class_header( -1, TRUE );                      /* Print the header */
+    print_class_header( -1, TRUE );                     /* Print the header */
-    ptr = sort_data;
-    sort_team_data( 0, S_L );                     /* Re-sort on elapsed time */
+    sort_team_data( 0, S_L, true );                     /* Re-sort on elapsed time */
     lcount = 0;
     for( ptr = sort_data, i = 0; i < sort_num; i++, ptr++ )
+    {
-        if ( ptr->teamclass == config.nonequestrian_class )
+        if ( ptr->isNeData )
             continue;
         g_record( ptr->team, &team_buf );
         /*
+        ** If this is a NE team then dummy up some of the data that hasn't been stored in team_buf
+        */
+        if (ptr->flags.non_equestrian)
+        {
+            team_buf.leg[0].l_place = sort_aux[ptr->team].leq_place[0];
+            team_buf.leg[0].lc_place = sort_aux[ptr->team].lq_place[0];
+        }
+        /*
         **  If printing an HTML report then we need to mark
         **  the entry with a reference so that we can link to it
         */
         if ( report_html == html )
+        {
         **  Print the basics (Finishing order)
         **      - Place within complete field
         **      - Team number - with HTML reference to team file
         **      - Class
         */
-        if ( report_html == printed && lcount %5 == 4 ) print_underline( TRUE );
+        if ( report_html == printed && lcount % 5 == 4 ) print_underline( TRUE );
-        print( "%4.4s ", pr_place( team_buf.leg[0].l_place, ptr->flags.bad_times ) );
+        print( "%4.4s ", px_place( 0, team_buf.leg[0].l_place, false, true, ptr->flags ) );
-        if ( report_html == html ) print( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "name" ,"html")), team_buf.numb );
+        if ( report_html == html ) setHref( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "name" ,"html")), team_buf.numb );
         print( "%4d",  team_buf.numb );
-        if ( report_html == html ) print( "</A>" );
         print( " %-*s", 3, team_buf.teamclass == 0 ? "" : config.team_class[team_buf.teamclass - 1].abr );
         /*
         **  Print the per-leg data
         **      - Leg place
         **      - End place
         */
         for( j = 1; j <= config.num_legs; j++ )
+        {
+            bool isEquestrianLeg = (j == config.equestrian_leg && team_buf.flags.non_equestrian);
             /*
             **  Ensure that non-equestrian leg data is not displayed
             */
-            if ( j == config.equestrian_leg && team_buf.flags.non_equestrian )
+            if ( isEquestrianLeg )
+            {
                 print( "  %-8s %4.4s %4.4s", "-- NE --", "NE","NE");
+            }
             else
+            {
-                print( "  %-8s %4.4s %4.4s",
-                    time_a( team_buf.leg[j].elapsed ),
+                print( "  %-8s", time_a( team_buf.leg[j].elapsed ));
-                    pr_place( team_buf.leg[j].l_place, ptr->flags.bad_times ),
+                if ( config.num_legs != 1 ) print( " %4.4s",      px_place( j, team_buf.leg[j].l_place, false, false, ptr->flags ));
-                    pr_place( team_buf.leg[j].le_place,ptr->flags.bad_times )
+                if ( config.num_legs != 1 ) print( " %4.4s",   px_place( j, team_buf.leg[j].le_place,true , true, ptr->flags ));
-                  );
+                if ( config.num_legs == 1 ) print( " %-*s ",  MAX_TM_NAME, team_buf.name );
+            }
+        }
        /*
         **  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( ptr->lege[0] ) );
+        if ( config.num_legs != 1 ) print( "  %-8s ", time_a( ptr->lege[0] ) );
-        if ( report_html == html ) print( "<A HREF=\"%s#Team_%04d\">",url_encode(p_filename(filebase, config.team_class[team_buf.teamclass - 1].abr ,"html")), team_buf.numb );
+        if ( report_html == html ) setHref( "<A HREF=\"%s#Team_%04d\">",url_encode(p_filename(filebase, config.team_class[team_buf.teamclass - 1].abr ,"html")), team_buf.numb );
-        print( "%-4.4s", pr_place_ne( team_buf.leg[0].lc_place, ptr->flags.bad_times, ptr->flags.non_equestrian ) );
+        print( "%4.4s", px_place( 0, team_buf.leg[0].lc_place, false, false, ptr->flags) );
-        if ( report_html == html ) print( "</A>" );
         if ( report_html == printed && lcount %5 == 4 ) print_underline( FALSE );
         lcount++;
         print( "\n" );
+    }
     print_class_stats( -1, TRUE );              /* Print statistics */
     print_legend(-1, 1 );                       /* Print the legend */
     close_printer();                            /* Close the printer */
-    /*
+    /* ------------------ Class Reports
      * Now produce a breakdown on a class by class basis
      * Now print out the class placement information
      */
-    sort_team_data( 0, S_LC );                 /* Generate class placement data */
+    sort_team_data( 0, S_LC, true );           /* Generate class placement data */
     last_class = -1;                           /* Invalid class to start with */
     memset ( class_done, 0, sizeof(class_done));
     for( ptr = sort_data, i = 0; i < sort_num; i++, ptr++ )
+    {
+        short teamClass = ptr->teamclass;
+        isNeClass = false;
+        /*
+        **  Dummy up the psuedo NE data a little bit
+        */
+        if (ptr->isNeData) {
+            isNeClass = true;
+            teamClass = config.nonequestrian_class;
+        }
+//qDebug() << "NEtm:" << ptr->team << "," << isNeClass << "," << teamClass;
         /*
         **  Detect a change in the "class"
         **  All data is within the one array of data
         **  Use the in-memory class as this MAY differ from that stored
         **  The non-equestrian class does this.
         */
-        if( last_class != ptr->teamclass )
+        if( last_class != teamClass )
+        {
             if( last_class >= 0 )
+            {
                 print_class_stats( last_class, TRUE );
                 print_legend( last_class, 1 );
                 close_printer();
+if (class_done[teamClass]) {
+    qDebug() << "ERROR class already processed - order error";
+}
+                last_class = 0;
+            }
-            report_title = tprintf( "Category results for : %-*s", LEN_CLASS_NAME, ptr->teamclass == 0 ? "" : config.team_class[ptr->teamclass - 1].full_name );
+            report_title = tprintf( "Category results for : %-*s", LEN_CLASS_NAME, teamClass == 0 ? "" : config.team_class[teamClass - 1].full_name );
-            if( !open_printer( "", config.team_class[ptr->teamclass - 1].abr, 132, report_html, report_title ) )
+            if( !open_printer( "", config.team_class[teamClass - 1].abr, 132, report_html, report_title ) )
                 continue;
-            print_class_header( last_class = ptr->teamclass, TRUE );
+            print_class_header( last_class = teamClass, TRUE );
             /*
             **  Mark the class as done
             */
-            class_done[ptr->teamclass] = TRUE;
+            class_done[teamClass] = TRUE;
             lcount = 0;
+            last_class = teamClass;
+        }
         /*
         **  Now read in the team record
         */
         g_record( ptr->team, &team_buf );
         /*
+        ** Dummy up the data for the dummy nonEquestrian Class
+        ** Its not stored in the team_buf for backwards compatability
+        */
+        if( isNeClass)
+        {
+            for( j = 0; j <= config.num_legs; j++ )
+            {
+                team_buf.leg[j].lc_place = sort_aux[ptr->team].lq_place[j];
+                team_buf.leg[j].lec_place = sort_aux[ptr->team].leq_place[j];
+            }
+        }
+        else
+        {
+            if (ptr->flags.non_equestrian)
+            {
+                //team_buf.leg[0].lc_place = sort_aux[ptr->team].lcq_place[0];
+                //team_buf.leg[0].lc_place = sort_aux[ptr->team].lcq_place[0];
+                team_buf.leg[0].lec_place = sort_aux[ptr->team].leq_place[0];
+            }
+        }
+        /*
         **  If printing an HTML report then we need to mark
         **  the entry with a reference so that we can link to it
         */
         if ( report_html == html )
             print( "<A NAME=\"Team_%04d\"></A>",team_buf.numb );
         **      - Team number - with HTML reference to team file
         **      - Class
         */
         if ( report_html == printed && lcount %5 == 4 ) print_underline( TRUE );
-        print( "%4.4s ", pr_place( team_buf.leg[0].lc_place, ptr->flags.bad_times ) );
+        print( "%4.4s ", px_place( 0, team_buf.leg[0].lc_place, false, false, ptr->flags) );
-        if ( report_html == html ) print( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "name" ,"html")), team_buf.numb );
+        if ( report_html == html ) setHref( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "name" ,"html")), team_buf.numb );
         print( "%4d",  team_buf.numb );
-        if ( report_html == html ) print( "</A>" );
         print( " %-*s", 3, team_buf.teamclass == 0 ? "" : config.team_class[team_buf.teamclass - 1].abr );
         for( j = 1; j <= config.num_legs; j++ )
+        {
+            bool isEquestrianLeg = (j == config.equestrian_leg && (ptr->isNeData || ptr->flags.non_equestrian));
             /*
             **  Ensure that non-equestrian leg data is not displayed
             */
-            if ( j == config.equestrian_leg && (ptr->teamclass == config.nonequestrian_class || ptr->flags.non_equestrian) )
+            if ( isEquestrianLeg )
+            {
                 print( "  %-8s %4.4s %4.4s", "-- NE --", "NE","NE");
+            }
             else
+            {
-                print( "  %-8s %4.4s %4.4s", time_a( team_buf.leg[j].elapsed ),
+                print( "  %-8s", time_a( team_buf.leg[j].elapsed ));
-                       pr_place( team_buf.leg[j].lc_place,  ptr->flags.bad_times ),
+                if ( config.num_legs != 1 ) print( " %4.4s", px_place( j, team_buf.leg[j].lc_place,  false, false, ptr->flags ));
-                       pr_place( team_buf.leg[j].lec_place, ptr->flags.bad_times ) );
+                if ( config.num_legs != 1 ) print( " %4.4s", px_place( j, team_buf.leg[j].lec_place, true , true, ptr->flags ) );
+                if ( config.num_legs == 1 ) print( " %-*s ", MAX_TM_NAME, team_buf.name );
+            }
+        }
+#if 0
+        // zzz
+        print (" --");
+        print (",%4.4d", sort_aux[ptr->team].l_place[0]);
+        print (" %4.4d", sort_aux[ptr->team].l_place[1]);
+        print (" %4.4d", sort_aux[ptr->team].l_place[2]);
+        print (" %4.4d", sort_aux[ptr->team].l_place[3]);
+        print (" %4.4d", sort_aux[ptr->team].l_place[4]);
+        print (" %4.4d", sort_aux[ptr->team].l_place[5]);
+        print (",%4.4d", sort_aux[ptr->team].le_place[0]);
+        print (" %4.4d", sort_aux[ptr->team].le_place[1]);
+        print (" %4.4d", sort_aux[ptr->team].le_place[2]);
+        print (" %4.4d", sort_aux[ptr->team].le_place[3]);
+        print (" %4.4d", sort_aux[ptr->team].le_place[4]);
+        print (" %4.4d", sort_aux[ptr->team].le_place[5]);
+        print (",%4.4d", sort_aux[ptr->team].lc_place[0]);
+        print (" %4.4d", sort_aux[ptr->team].lc_place[1]);
+        print (" %4.4d", sort_aux[ptr->team].lc_place[2]);
+        print (" %4.4d", sort_aux[ptr->team].lc_place[3]);
+        print (" %4.4d", sort_aux[ptr->team].lc_place[4]);
+        print (" %4.4d", sort_aux[ptr->team].lc_place[5]);
+        print (",%4.4d", sort_aux[ptr->team].lec_place[0]);
+        print (" %4.4d", sort_aux[ptr->team].lec_place[1]);
+        print (" %4.4d", sort_aux[ptr->team].lec_place[2]);
+        print (" %4.4d", sort_aux[ptr->team].lec_place[3]);
+        print (" %4.4d", sort_aux[ptr->team].lec_place[4]);
+        print (" %4.4d", sort_aux[ptr->team].lec_place[5]);
+        print (",%4.4d", sort_aux[ptr->team].lq_place[0]);
+        print (" %4.4d", sort_aux[ptr->team].lq_place[1]);
+        print (" %4.4d", sort_aux[ptr->team].lq_place[2]);
+        print (" %4.4d", sort_aux[ptr->team].lq_place[3]);
+        print (" %4.4d", sort_aux[ptr->team].lq_place[4]);
+        print (" %4.4d", sort_aux[ptr->team].lq_place[5]);
+        print (",%4.4d", sort_aux[ptr->team].leq_place[0]);
+        print (" %4.4d", sort_aux[ptr->team].leq_place[1]);
+        print (" %4.4d", sort_aux[ptr->team].leq_place[2]);
+        print (" %4.4d", sort_aux[ptr->team].leq_place[3]);
+        print (" %4.4d", sort_aux[ptr->team].leq_place[4]);
+        print (" %4.4d", sort_aux[ptr->team].leq_place[5]);
+        print (",[%4.4d", sort_aux[ptr->team].lcq_place[0]);
+        print (" %4.4d", sort_aux[ptr->team].lcq_place[1]);
+        print (" %4.4d", sort_aux[ptr->team].lcq_place[2]);
+        print (" %4.4d", sort_aux[ptr->team].lcq_place[3]);
+        print (" %4.4d", sort_aux[ptr->team].lcq_place[4]);
+        print (" %4.4d]", sort_aux[ptr->team].lcq_place[5]);
+        print (",%4.4d", sort_aux[ptr->team].lecq_place[0]);
+        print (" %4.4d", sort_aux[ptr->team].lecq_place[1]);
+        print (" %4.4d", sort_aux[ptr->team].lecq_place[2]);
+        print (" %4.4d", sort_aux[ptr->team].lecq_place[3]);
+        print (" %4.4d", sort_aux[ptr->team].lecq_place[4]);
+        print (" %4.4d", sort_aux[ptr->team].lecq_place[5]);
+#endif
         /*
         **  Print the trailer
         **      - Total time
         **      - Overall place - with reference to overall place file
         */
-        /* print( "  %-8s ", time_a( team_buf.leg[0].elapsed ) ); */
-        print( "  %-8s ", time_a( ptr->lege[0] ) );
+        if ( config.num_legs != 1 ) print( "  %-8s ", time_a( ptr->lege[0] ) );
-        if ( report_html == html ) print( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "finish" ,"html")), team_buf.numb );
+        if ( report_html == html )  setHref( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "finish" ,"html")), team_buf.numb );
-        print( "%4.4s", pr_place( team_buf.leg[0].l_place, ptr->flags.bad_times || (ptr->teamclass == config.nonequestrian_class)));
+        print( "%4.4s", px_place( 0, team_buf.leg[0].l_place, false, true, ptr->flags));
-        if ( report_html == html ) print( "</A>" );
         if ( report_html == printed && lcount %5 == 4 ) print_underline( FALSE );
         lcount++;
         print( "\n" );
+    }
     /*
     **  Pickup missed classes and create a report
     */
     for( j = 1; j <= config.num_class; j++ )
+    {
-        if ( class_done[j] )
+        if ( class_done[j] || !config.team_class[j-1].abr[0] )
+        {
             continue;
+        }
         report_title = tprintf( "Category results for : %-*s", LEN_CLASS_NAME, config.team_class[j - 1].full_name );
         if( !open_printer( "", config.team_class[j - 1].abr, 132, report_html, report_title ) )
             continue;
         print_class_header( j-1, TRUE );
     /*
     **  If we are generating an HTML report then we need to create the file
     **  that contains all the team names - the assumption is that this data
     **  is available
     */
-    if ( report_html )
+    if ( report_html == html || report_html == printed)
+    {
         pri_team();
+    }
     /*
     **  Generate the awards report.
     **  This is only available as an HTML report
     */
-    if ( report_html )
+    if ( report_html == html || report_html == printed)
+    {
         pri_awards_html();
+    }
     /*
     **  Generate the master index page
     */
-    if ( report_html )
+    if ( report_html == html )
+    {
         pri_master_index();
+    }
     pri_name_index_body();
+}
 /*========================================================================
+ *
+ *  Print final results in Team Order
+ *
+ *  Purpose:
+ *      This function is called to Print final results in Team Order
+ *
+ *  Parameters:
+ *      None
+ *
+ *  Returns:
+ *      Nothing
+ *
+ *========================================================================*/
+void pri_final_teamOrder(void)
+{
+    ty_s_data  *ptr;
+    team_type   team_buf;
+    unsigned    i;
+    int         j;
+    int         lcount;
+    ck_data( -1, C_ELAPSED );
+    /*
+    **  Sort on every thing
+    **  Then generate all the stats too
+    */
+    do_big_sort();
+    gen_stats();
+    /*
+     * Now print the data on the printer
+     */
+    if( !open_printer( "", "team_order", 132, report_html, "Team Order" ) )
+        return;
+    /*
+     * Print out the data
+     */
+    print_class_header( -1, TRUE );                      /* Print the header */
+    ptr = sort_data;
+    sort_team_data( 0, S_TEAM, true );                   /* Re-sort on team number */
+    lcount = 0;
+    for( ptr = sort_data, i = 0; i < sort_num; i++, ptr++ )
+    {
+        if ( ptr->isNeData )
+            continue;
+        g_record( ptr->team, &team_buf );
+        /*
+        ** If this is a NE team then dummy up some of the data that hasn't been stored in team_buf
+        */
+        if (ptr->flags.non_equestrian)
+        {
+            team_buf.leg[0].l_place = sort_aux[ptr->team].leq_place[0];
+            //team_buf.leg[0].lc_place = sort_aux[ptr->team].lcq_place[0];
+        }
+        /*
+        **  If printing an HTML report then we need to mark
+        **  the entry with a reference so that we can link to it
+        */
+        if ( report_html == html )
+        {
+            print( "<A NAME=\"Team_%04d\"></A>",team_buf.numb );
+        }
+        /*
+        **  Print the basics (Finishing order)
+        **      - Place within complete field
+        **      - Team number - with HTML reference to team file
+        **      - Class
+        */
+        if ( report_html == printed && lcount %5 == 4 ) print_underline( TRUE );
+        print( "%4.4s ", px_place( 0, team_buf.leg[0].l_place, false, true, ptr->flags ) );
+        if ( report_html == html ) setHref( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "name" ,"html")), team_buf.numb );
+        print( "%4d",  team_buf.numb );
+        print( " %-*s", 3, team_buf.teamclass == 0 ? "" : config.team_class[team_buf.teamclass - 1].abr );
+        /*
+        **  Print the per-leg data
+        **      - Time
+        **      - Leg place
+        **      - End place
+        */
+        for( j = 1; j <= config.num_legs; j++ )
+        {
+            bool isEquestrianLeg = (j == config.equestrian_leg && team_buf.flags.non_equestrian);
+            /*
+            **  Ensure that non-equestrian leg data is not displayed
+            */
+            if ( isEquestrianLeg )
+            {
+                print( "  %-8s %4.4s %4.4s", "-- NE --", "NE","NE");
+            }
+            else
+            {
+                print( "  %-8s",                     time_a( team_buf.leg[j].elapsed ));
+                if ( config.num_legs != 1 ) print( " %4.4s", px_place(j, team_buf.leg[j].l_place, false, false, ptr->flags ));
+                if ( config.num_legs != 1 ) print( " %4.4s", px_place(j, team_buf.leg[j].le_place,true,  true, ptr->flags ) );
+                if ( config.num_legs == 1 ) print( " %-*s ", MAX_TM_NAME, team_buf.name );
+            }
+        }
+       /*
+        **  Print the trailer (Finishing order)
+        **      - Total time
+        **      - Category place - with reference to category file
+        */
+       if ( config.num_legs != 1 ) print( "  %-8s ", time_a( ptr->lege[0] ) );
+        if ( report_html == html ) setHref( "<A HREF=\"%s#Team_%04d\">",url_encode(p_filename(filebase, config.team_class[team_buf.teamclass - 1].abr ,"html")), team_buf.numb );
+        print( "%4.4s", px_place( 0, team_buf.leg[0].lc_place, false, false, ptr->flags ) );
+//print (" --");
+//print (" %4.4d", sort_aux[ptr->team].lq_place[0]);
+//print (" %4.4d", sort_aux[ptr->team].leq_place[0]);
+//print (" %4.4d", sort_aux[ptr->team].lcq_place[0]);
+//print (" ,%4.4d", sort_aux[ptr->team].lec_place[0]);
+//print (" %4.4d", sort_aux[ptr->team].lec_place[1]);
+//print (" %4.4d", sort_aux[ptr->team].lec_place[2]);
+//print (" %4.4d", sort_aux[ptr->team].lec_place[3]);
+//print (" %4.4d", sort_aux[ptr->team].lec_place[4]);
+//print (" %4.4d", sort_aux[ptr->team].lec_place[5]);
+//print (" ,%4.4d", sort_aux[ptr->team].lecq_place[0]);
+//print (" %4.4d", sort_aux[ptr->team].lecq_place[1]);
+//print (" %4.4d", sort_aux[ptr->team].lecq_place[2]);
+//print (" %4.4d", sort_aux[ptr->team].lecq_place[3]);
+//print (" %4.4d", sort_aux[ptr->team].lecq_place[4]);
+//print (" %4.4d", sort_aux[ptr->team].lecq_place[5]);
+        if ( report_html == printed && lcount %5 == 4 ) print_underline( FALSE );
+        lcount++;
+        print( "\n" );
+    }
+    print_class_stats( -1, TRUE );              /* Print statistics */
+    print_legend(-1, 1 );                       /* Print the legend */
+    close_printer();                            /* Close the printer */
+}
+/*========================================================================
+ *
  *  Place to text
+ *
  *  Purpose:
  *      This function is called to convert a place to text
+ *
     /*
     **  Generate ALL results with HTML tags
     */
     report_html = html;
     pri_awards();
+    report_html = printed;
+    pri_awards();
     report_html = saved;
+}
 /*========================================================================
+ *
     int winmax;
     ty_s_data  *ptr;
     team_type   team_buf;
     int         last_class;
     char    solid_line[100];
+    bool header_done = false;
+    bool entryFound;
     /*
     **  Calculate Summary information
     **  Should cache the data
     */
     if ( report_html == html )
+    {
         print( "<hr>" );
         print( "<A NAME=\"%s\"></A>",url_encode("INDEX"));
+    }
-    print( "Award Categories");
+    print( "Award Categories - Full Event");
     for( j = 1; j <= config.num_class; j++ )
+    {
         /*
         **  Header for the class
         */
+        if (!config.team_class[j - 1].abr[0])
+            continue;
-        if ( config.class_winners[j-1] <= 0 )
+        if (config.class_winners[j - 1] <= 0)
             continue;
         winmax = config.class_winners[j-1];
+        {
-            int valid =   sdata.teamclass[j].valid;
+            int valid =   sdata.teamclass[j].valid_ev;
             if ( valid < winmax )
                 winmax = valid;
+        }
         print( "\n");
         print( "    ");
-        if ( report_html == html ) print( "<A HREF=\"#%s\">",url_encode(config.team_class[j-1].full_name));
+        if ( report_html == html ) setHref( "<A HREF=\"#%s\">",url_encode(config.team_class[j-1].full_name));
         print( "%s",  tprintf( "%-*s", LEN_CLASS_NAME ,config.team_class[j-1].full_name ));
-        if ( report_html == html ) print( "</A>" );
         print( "  %3d Awards", winmax );
         if ( config.class_winners[j-1] != winmax )
             print( " from a maximum of %3d", config.class_winners[j-1] );
+    }
+    /*
+    **  NE Award Categories
+    */
+    if ( config.class_ne_winners_by_class )
+    {
+        print( "\n");
+        print( "Award Categories - Non Equestrian");
+        for( j = 1; j <= config.num_class; j++ )
+        {
+            /*
+            **  Header for the class
+            */
+            if (!config.team_class[j - 1].abr[0])
+                continue;
+            if ( config.class_ne_winners[j-1] <= 0 )
+                continue;
+            winmax = config.class_ne_winners[j-1];
+            {
+                int valid =   sdata.teamclass[j].valid_ne;
+                if ( valid < winmax )
+                    winmax = valid;
+            }
+            print( "\n");
+            print( "    ");
+            if ( report_html == html ) setHref( "<A HREF=\"#%s_NE\">",url_encode(config.team_class[j-1].full_name));
+            print( "%s",  tprintf( "%-*s", LEN_CLASS_NAME ,config.team_class[j-1].full_name ));
+            print( "  %3d Awards", winmax );
+            if ( config.class_ne_winners[j-1] != winmax )
+                print( " from a maximum of %3d", config.class_ne_winners[j-1] );
+        }
+    }
     /*
     **  Manual entries
     */
+    print( "\n");
+    print( "Miscellaneous");
+        print( "\n");
+        print( "    ");
+        if ( report_html == html ) setHref( "<A HREF=\"#%s_by_cat\">",url_encode("Full Event"));
+        print( "%s",  tprintf( "%-*s", LEN_CLASS_NAME ,"Full Event"));
+        print (" by Category");
     if ( config.class_ne_winners_by_class )
+    {
         print( "\n");
         print( "    ");
-        if ( report_html == html ) print( "<A HREF=\"#%s_by_cat\">",url_encode(config.team_class[config.nonequestrian_class-1].full_name));
+        if ( report_html == html ) setHref( "<A HREF=\"#%s_by_cat\">",url_encode(config.team_class[config.nonequestrian_class-1].full_name));
         print( "%s",  tprintf( "%-*s", LEN_CLASS_NAME ,config.team_class[config.nonequestrian_class-1].full_name ));
-        if ( report_html == html ) print( "</A>" );
         print (" by Category");
+    }
     print( "\n");
     print( "    ");
-    if ( report_html == html ) print( "<A HREF=\"#%s\">",url_encode("Hall Of Fame"));
+    if ( report_html == html ) setHref( "<A HREF=\"#%s\">",url_encode("Hall Of Fame"));
     print( "%s",  "Hall Of Fame" );
+    if (config.awardsfilename[0])
+    {
+        print( "\n");
+        print( "    ");
+        if ( report_html == html ) setHref( "<A HREF=\"#%s\">",url_encode("Additional Awards"));
-    if ( report_html == html ) print( "</A>" );
+        print( "%s",  "Additional Awards" );
+    }
     print( "\n");
     print( "    ");
-    if ( report_html == html ) print( "<A HREF=\"#%s\">",url_encode("FASTEST"));
+    if ( report_html == html ) setHref( "<A HREF=\"#%s\">",url_encode("FASTEST"));
     print( "%s",  "FASTEST" );
-    if ( report_html == html ) print( "</A>" );
-    /*
+    /*  ---------------------------- Awards for Teams ----
     **  Sort the data by class
     */
-    sort_team_data( 0, S_LC );     /* Generate class placement data */
+    sort_team_data( 0, S_LC, true );     /* Generate class placement data */
-    last_class = -1;                /* Invalid class to start with */
+    last_class = -1;                     /* Invalid class to start with */
     /*
     **  Process each category
     */
     print( "\n");
+    entryFound = false;
     for( j = 1; ; j++ )
+    {
+        if (!config.team_class[j - 1].abr[0])
+            continue;
         /*
         **  Tail for previous entry
         */
         //if ( config.class_ne_winners_by_class && j == config.nonequestrian_class )
         //    continue;
-        if ( j != 1 )
+        if ( j != 1 ) {
+            if (!entryFound) {
+                print( "\n");
+                print( "No winners awarded. Non eligible." );
+                if ( report_html == html ) print("<br>");
+            }
             if ( report_html == html ) print( "<A HREF=\"#%s\">Awards Index</A>",url_encode("INDEX"));
+        }
         if ( j > config.num_class  )
             break;
         /*
         */
         print( "\n");
         if ( report_html == html )
+        {
             print( "<hr>" );
+            if ( !header_done )
+            {
+                header_done = true;
+                if ( report_html == html )
+                {
+                    print( "<A name=\"%s_by_cat\"></A>",url_encode("Full Event"));
+                }
+            }
             print( "<A name=\"%s\"></A>",url_encode(config.team_class[j-1].full_name));
+        }
         else
+        {
             print( "%s\n", solid_line);
+        }
         print( "Category: ");
-        if ( report_html == html ) print( "<A HREF=\"%s\">",url_encode(p_filename(filebase, config.team_class[j - 1].abr ,"html")));
+        if ( report_html == html ) setHref( "<A HREF=\"%s\">",url_encode(p_filename(filebase, config.team_class[j - 1].abr ,"html")));
         print( "%s",  config.team_class[j-1].full_name );
-        if ( report_html == html ) print( "</A>" );
         if ( config.class_winners[j-1] <= 0 )
+        {
             print( "\n");
             print( "No winners awarded" );
+            if ( report_html == html ) print("<br>");
             continue;
+        }
         /*
         **  Enties for 'n' the best teams as configured
         */
         windex = 0;                     /* Winners done */
+        entryFound = false;
         unsigned int i;
         for( ptr = sort_data, i = 0; i < sort_num; i++, ptr++ )
+        {
             if ( ptr->teamclass != j )
+            {
                 /*
                 **  Ensure we have a valid team
                 **  Can't award disqualified teams
                 **  Can't award NE teams unless its a NE award
                 */
-                if ( ptr->flags.bad_times )
+                if ( ptr->flags.bad_times || ptr->flags.disqualified || ptr->flags.vet_check || !ptr->flags.valid )
                     break;
-                if ( ptr->teamclass != config.nonequestrian_class  && ptr->flags.non_equestrian )
+                if ( !ptr->isNeData && ptr->flags.non_equestrian )
                     break;
                 /*
                 **  Count the entry
                 */
                 windex++;
+                entryFound = true;
                 /*
                 **  If printing an HTML report then we need to mark
                 **  the entry with a reference so that we can link to it
                 */
                 **      - Full categoray name
                 */
                 print( "%s", placing(windex) );
                 print( "  Team Name: ");
-                if ( report_html == html ) print( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "name" ,"html")), team_buf.numb );
+                if ( report_html == html ) setHref( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "name" ,"html")), team_buf.numb );
                 print( "%-*s ",     MAX_TM_NAME, team_buf.name );
-                    if ( report_html == html ) print( "</A>" );
                 print( "  Number: ");
-                if ( report_html == html ) print( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "finish" ,"html")), team_buf.numb );
+                if ( report_html == html ) setHref( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "finish" ,"html")), team_buf.numb );
                 print( "%4d",       team_buf.numb );
-                if ( report_html == html ) print( "</A>" );
                 for( k = 0; k < MAX_MEMB; k++ )
+                {
                     /*
                     **  Skip equestrian leg in the non-equestion display
                     */
-                    if ( k + 1 == config.equestrian_leg && ptr->teamclass == config.nonequestrian_class)
+                    if ( k + 1 == config.equestrian_leg && ptr->isNeData)
                         continue;
                     print( "\n");
                     print( "    ");
                     print( "%-*s", MAX_PERSON_NAME, config.leg_name[k] ? config.leg_name[k] : "Competitor"  );
     /*
     ** Non Equestrian winners by category
     */
     if ( config.class_ne_winners_by_class)
+    {
-        bool header_done = false;
+        header_done = false;
         /*
         **  Sort the data by class with NE data sorted by real class
         */
-        sort_team_data( 0, S_LC_NE );      /* Generate class placement data */
+        sort_team_data( 0, S_LC_NE, true );     /* Generate class placement data */
-        last_class = -1;                   /* Invalid class to start with */
+        last_class = -1;                        /* Invalid class to start with */
         /*
         **  Only process the Non Equestrian teams in this pass
         */
         print( "\n");
+        entryFound = false;
         for( j = 1; ; j++ )
+        {
+            if (!config.team_class[j - 1].abr[0])
+                continue;
             /*
             **  Tail for previous entry
             */
             if ( j == config.nonequestrian_class)
                 continue;
-            if ( j != 1 )
+            if ( j != 1 ) {
+                if (!entryFound) {
+                    print( "\n");
+                    print( "No winners awarded. Non eligible." );
+                    if ( report_html == html ) print("<br>");
+                }
                 if ( report_html == html ) print( "<A HREF=\"#%s\">Awards Index</A>",url_encode("INDEX"));
+            }
             if ( j > config.num_class  )
                 break;
             /*
             print( "\n");
             if ( report_html == html )
+            {
                 print( "<hr>" );
-                print( "<A name=\"%s\"></A>",url_encode(config.team_class[j-1].full_name));
+                print( "<A name=\"%s_NE\"></A>",url_encode(config.team_class[j-1].full_name));
+            }
             else
+            {
                 print( "%s\n", solid_line);
+            }
             print( "Category: ");
-            if ( report_html == html ) print( "<A HREF=\"%s\">",url_encode(p_filename(filebase, config.team_class[config.nonequestrian_class - 1].abr ,"html")));
+            if ( report_html == html ) setHref( "<A HREF=\"%s\">",url_encode(p_filename(filebase, config.team_class[config.nonequestrian_class - 1].abr ,"html")));
             print( "%s",  config.team_class[config.nonequestrian_class-1].full_name );
-            if ( report_html == html ) print( "</A>" );
             print (" :: ");
-            if ( report_html == html ) print( "<A HREF=\"%s\">",url_encode(p_filename(filebase, config.team_class[j - 1].abr ,"html")));
+            if ( report_html == html ) setHref( "<A HREF=\"%s\">",url_encode(p_filename(filebase, config.team_class[j - 1].abr ,"html")));
             print( "%s",  config.team_class[j-1].full_name );
-            if ( report_html == html ) print( "</A>" );
             if ( config.class_ne_winners[j-1] <= 0 )
+            {
                 print( "\n");
                 print( "No winners awarded" );
+            }
             /*
             **  Enties for 'n' the best teams as configured
             */
+            entryFound = false;
             windex = 0;                     /* Winners done */
             unsigned int i;
             for( ptr = sort_data, i = 0; i < sort_num; i++, ptr++ )
+            {
-                if ( ptr->teamclass != config.nonequestrian_class ||  ptr->real_teamclass != j )
+                if ( !ptr->isNeData )
-                {
+                    continue;
+                if ( ptr->teamclass != j ) {
                     continue;
+                }
+                //qDebug() << "NeTeam0:" <<  ptr->team << "," << ptr->isNeData << "," << ptr->teamclass << "," << j;
                 /*
                 **  Now read in the team record
                 */
                 if( valid_field( ptr->team ) && g_record( ptr->team, &team_buf ) )
                     /*
                     **  Ensure we have a valid team
                     **  Can't award disqualified teams
                     **  Can't award NE teams unless its a NE award
                     */
-                    if ( ptr->flags.bad_times )
+                    if ( ptr->flags.bad_times || ptr->flags.disqualified || ptr->flags.vet_check || !ptr->flags.valid )
                         break;
-                    if ( ptr->teamclass != config.nonequestrian_class  && ptr->flags.non_equestrian )
+                    if ( /*!ptr->isNeData &&*/ !ptr->flags.non_equestrian )
                         break;
                     /*
                     **  Count the entry
                     */
                     windex++;
+                    entryFound = true;
                     /*
                     **  If printing an HTML report then we need to mark
                     **  the entry with a reference so that we can link to it
                     */
                     **      - Full categoray name
                     */
                     print( "%s", placing(windex) );
                     print( "  Team Name: ");
-                    if ( report_html == html ) print( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "name" ,"html")), team_buf.numb );
+                    if ( report_html == html ) setHref( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "name" ,"html")), team_buf.numb );
                     print( "%-*s ",     MAX_TM_NAME, team_buf.name );
-                        if ( report_html == html ) print( "</A>" );
                     print( "  Number: ");
-                    if ( report_html == html ) print( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "finish" ,"html")), team_buf.numb );
+                    if ( report_html == html ) setHref( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "finish" ,"html")), team_buf.numb );
                     print( "%4d",       team_buf.numb );
-                    if ( report_html == html ) print( "</A>" );
                     for( k = 0; k < MAX_MEMB; k++ )
+                    {
                         /*
                         **  Skip equestrian leg in the non-equestion display
                         */
-                        if ( k + 1 == config.equestrian_leg && ptr->teamclass == config.nonequestrian_class)
+                        if ( k + 1 == config.equestrian_leg && ptr->isNeData)
                             continue;
                         print( "\n");
                         print( "    ");
                         print( "%-*s", MAX_PERSON_NAME, config.leg_name[k] ? config.leg_name[k] : "Competitor"  );
         qDebug( "There are no new stars for the Hall of Fame");
+    }
     if ( report_html == html ) print( "\n");
     if ( report_html == html ) print( "<A HREF=\"#%s\">Awards Index</A>",url_encode("INDEX"));
+    /*
+    **  Insert additional Awards information
+    */
+    if (config.awardsfilename[0])
+    {
+        print( "\n");
+        if ( report_html == html )
+        {
+            print( "<hr>" );
+            print( "<A name=\"%s\"></A>",url_encode("Additional Awards"));
+        }
+        else
+        {
+            print( "%s\n", solid_line);
+        }
+        print( "%s",  "Additional Awards" );
+        print ("\n");
+        /*
+        **  Read and process the named awards file
+        */
+        FILE       *adfile = NULL;
+        char        line[201];
+        QString name = QmConfig::getAddendemFile(config.awardsfilename);
+        if (! name.isEmpty())
+        {
+            adfile = fopen( qPrintable(name), "rt" );  /* Open the file for reading */
+        }
+        if( adfile )
+        {
+            while( fgets( line, sizeof(line)-1, adfile ) ) {
+                //  Process each line
+                //  Attempt to perform some smart text replacements
+                //  ie: <TeamNumber:63> <TeamName:63><TeamLegName:1:63>
+                print( "%s", line );
+            }
+            fclose(adfile);
+        }
+        else
+        {
+            if ( report_html == html )  print ("<br>");
+            print( "\nThe awards file could not be found: %s\n",  adfile);
+        }
+        if ( report_html == html ) print( "\n");
+        if ( report_html == html ) print( "<A HREF=\"#%s\">Awards Index</A>",url_encode("INDEX"));
+    }
     /*
     **  Generate the FASTEST information
     */
     print( "\n" );
     print( "\n");
         g_record( stats.fast.team[i][0], &team_buf );
         print( "\n");
         print( "    %-13s ", config.leg_name[i - 1] );
         print( "  Name: ");
-        if ( report_html == html ) print( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "name" ,"html")), team_buf.numb );
+        if ( report_html == html ) setHref( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "name" ,"html")), team_buf.numb );
         print( "%-*s", MAX_PERSON_NAME, team_buf.members[i-1].name );
-        if ( report_html == html ) print( "</A>" );
-        print( "  Team :");
+        print( "  Team:");
-        if ( report_html == html ) print( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "finish" ,"html")), team_buf.numb );
+        if ( report_html == html ) setHref( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "finish" ,"html")), team_buf.numb );
         print( "%4d" , stats.fast.team[i][0] );
-        if ( report_html == html ) print( "</A> " );
-        print( "Time:%s ", time_a( stats.fast.time[i][0] ) );
+        print( "  Time:%s ", time_a( stats.fast.time[i][0] ) );
+    }
     if ( report_html == html ) print( "\n");
     if ( report_html == html ) print( "<A HREF=\"#%s\">Awards Index</A>",url_encode("INDEX"));
     */
     print( "<TABLE border=0 align=center>" );
     pri_master_index_entry( "name", "Team list" );
     pri_master_index_entry( "competitor", "Competitor list" );
     pri_master_index_entry( "finish", "Finishing Order for all Teams" );
+    pri_master_index_entry( "team_order", "All Teams with results" );
     pri_master_index_entry( "awards", "Prizes and Awards" );
     print( "<tr><td>\n" );
     print( "\n" );
     for( j = 1; j <= config.num_class; j++ )
+    {
+        if (!config.team_class[j - 1].abr[0])
+            continue;
         pri_master_index_entry( config.team_class[j - 1].abr, tprintf("Category Results for: %s", config.team_class[j-1].full_name) );
+    }
     print( "</TABLE>" );
     print( "<TABLE border=0 align=center>" );
 #if 1
     pri_master_index_entry( "name", "Team list" );
     pri_master_index_entry( "competitor", "Competitor list" );
     pri_master_index_entry( "finish", "Finishing Order for all Teams" );
+    pri_master_index_entry( "team_order", "All Teams with results" );
     pri_master_index_entry( "awards", "Prizes and Awards" );
     print( "<tr><td>\n" );
     print( "\n" );
+    pri_master_index_entry( "summary", "Category Summary" );
     for( j = 1; j <= config.num_class; j++ )
+    {
+        if (!config.team_class[j - 1].abr[0])
+            continue;
         pri_master_index_entry( config.team_class[j - 1].abr, tprintf("Category Results for: %s", config.team_class[j-1].full_name) );
+    }
 #endif
     print( "<tr><td>\n" );
     close_printer();
     /*
      ** Tell the main system about this new report
      */
-    MainWindow::registerReport(getPrinterFile(), "Master Index");
+    MainWindow::registerReport(getPrinterFile(), "Master Leg Index");
+}
 /*========================================================================
     ty_s_data  *ptr;
     team_type   team_buf;
     unsigned    i;
     int         j, last_class;
     char       *report_title;
+    short       pClass;
     if ( ! report_all )
+    {
         ck_data( -1, C_DISQUAL );              /* Check the data - dummy check */
+    }
      * Print out the data
      */
     print_class_header( -1, FALSE );                     /* Print the header */
     ptr = sort_data;
-    sort_team_data( 0, S_TEAM );                   /* Re-sort on team number */
+    sort_team_data( 0, S_TEAM, true );                   /* Re-sort on team number */
     for( ptr = sort_data, i = 0; i < sort_num; i++, ptr++ )
+    {
-        if ( ptr->teamclass == config.nonequestrian_class )
+        if ( ptr->isNeData )
             continue;
         g_record( ptr->team, &team_buf );
         print( "%4d %4.4s %-*s",
                team_buf.numb,
-               pi_place( team_buf.leg[config.num_legs].le_place,
+               px_place(-1, team_buf.leg[config.num_legs].le_place, false, false, ptr->flags ),
-                         ptr->flags.disqualified, team_buf.leg[0].elapsed ),
 ,
-               team_buf.teamclass ==
-? "" : config.team_class[team_buf.teamclass - 1].abr );
+               team_buf.teamclass == 0 ? "" : config.team_class[team_buf.teamclass - 1].abr );
         for( j = 1; j <= config.num_legs; j++ )
+        {
-            print( "  %-8s %4.4s %4.4s",
-                   time_fa( team_buf.leg[j].elapsed,
-                            ptr->flags.disqualified ),
-                   pi_place( team_buf.leg[j].l_place, ptr->flags.disqualified,
+            print( "  %-8s", time_fa( team_buf.leg[j].elapsed, ptr->flags.disqualified ));
-                             team_buf.leg[j].elapsed ),
+            if ( config.num_legs != 1 ) print( " %4.4s", px_place(j, team_buf.leg[j].l_place, false, true, ptr->flags ));
-                   pi_place( team_buf.leg[j].le_place,
+            if ( config.num_legs != 1 ) print( " %4.4s", px_place(j, team_buf.leg[j].le_place, false, true, ptr->flags ));
-                             ptr->flags.disqualified,
-                             team_buf.leg[j].elapsed ) );
+            if ( config.num_legs == 1 ) print( " %-*s ",     MAX_TM_NAME, team_buf.name );
         }
-        print( "  %-8s %4.4s\n",
-               time_fa( team_buf.leg[0].elapsed, ptr->flags.disqualified ),
+        if ( config.num_legs != 1 ) print( "  %-8s", time_fa( team_buf.leg[0].elapsed, ptr->flags.disqualified ));
-               pi_place( team_buf.leg[config.num_legs].lec_place,
+        print( " %4.4s\n", px_place(0, team_buf.leg[config.num_legs].lec_place, false, false, ptr->flags ));
-                         ptr->flags.disqualified, team_buf.leg[0].elapsed ) );
+    }
     print_class_stats( -1, FALSE );             /* Print statistics */
     print_legend(-1, 1);                        /* Print the legend */
     close_printer();                            /* Close the printer */
     /*
      * Now produce a breakdown on a class by class basis
      * Now print out the class placement information
      */
-    sort_team_data( 0, S_CLASS );              /* Generate class placement data */
+    sort_team_data( 0, S_CLASS, true );             /* Generate class placement data */
-    last_class = -1;                             /* Invalid class to start with */
+    last_class = -1;                                /* Invalid class to start with */
+    pClass = -1;
     for( ptr = sort_data, i = 0; i < sort_num; i++, ptr++ )
+    {
+        if (ptr->isNeData)
+            pClass = config.nonequestrian_class;
+        else
+            pClass = ptr->teamclass;
         /*
         **  Detect a change in the "class"
         **  All data is within the one array of data
         **  Use the in-memory class as this MAY differ from that stored
         **  The non-equestrian class does this.
         */
-        if( last_class != ptr->teamclass )
+        if( last_class != pClass )
+        {
             if( last_class >= 0 )
+            {
-                print_class_stats( last_class, TRUE );
+                print_class_stats( last_class, FALSE );
                 print_legend(last_class, 1);
                 close_printer();
+            }
-            report_title = tprintf( "Interim Category results for : %-*s", LEN_CLASS_NAME, team_buf.teamclass == 0 ? "" : config.team_class[ptr->teamclass - 1].full_name );
+            report_title = tprintf( "Interim Category results for : %-*s", LEN_CLASS_NAME, pClass == 0 ? "" : config.team_class[pClass - 1].full_name );
-            if( !open_printer( "", tprintf( "i%2s", config.team_class[ptr->teamclass - 1].abr ), 132, report_html, report_title ) )
+            if( !open_printer( "", tprintf( "i%2s", config.team_class[pClass - 1].abr ), 132, report_html, report_title ) )
                 continue;
-            print_class_header( last_class = ptr->teamclass, FALSE );
+            print_class_header( last_class = pClass, FALSE );
+        }
         /*
         **  Now read in the team record
         */
         g_record( ptr->team, &team_buf );
         print( "%4d %4.4s %-*s",
                team_buf.numb,
-               pi_place( team_buf.leg[config.num_legs].lec_place,
+               px_place(-1, team_buf.leg[config.num_legs].lec_place, false, false, ptr->flags ),
-                         ptr->flags.disqualified, team_buf.leg[0].elapsed ),
 ,
-               team_buf.teamclass ==
-? "" : config.team_class[team_buf.teamclass - 1].abr );
+               team_buf.teamclass == 0 ? "" : config.team_class[team_buf.teamclass - 1].abr );
         for( j = 1; j <= config.num_legs; j++ )
+        {
-            print( "  %-8s %4.4s %4.4s",
-                   time_fa( team_buf.leg[j].elapsed,
+            print( "  %-8s", time_fa( team_buf.leg[j].elapsed, ptr->flags.disqualified ));
-                            ptr->flags.disqualified ),
-                   pi_place( team_buf.leg[j].lc_place,
+            if ( config.num_legs != 1 ) print( " %4.4s", px_place(j, team_buf.leg[j].lc_place,  false, true, ptr->flags ));
-                             ptr->flags.disqualified,
-                             team_buf.leg[j].elapsed ),
-                   pi_place( team_buf.leg[j].lec_place,
+            if ( config.num_legs != 1 ) print( " %4.4s", px_place(j, team_buf.leg[j].lec_place, false, true, ptr->flags ));
-                             ptr->flags.disqualified,
-                             team_buf.leg[j].elapsed ) );
+            if ( config.num_legs == 1 ) print( " %-*s ", MAX_TM_NAME, team_buf.name );
         }
-        print( "  %-8s %4.4s\n",
-               time_fa( team_buf.leg[0].elapsed, ptr->flags.disqualified ),
+        if ( config.num_legs != 1 ) print( "  %-8s", time_fa( team_buf.leg[0].elapsed, ptr->flags.disqualified ));
-               pi_place( team_buf.leg[config.num_legs].le_place,
+        print( " %4.4s\n", px_place(0, team_buf.leg[config.num_legs].le_place, false, false, ptr->flags ) );
-                         ptr->flags.disqualified, team_buf.leg[0].elapsed ) );
+    }
     print_class_stats( last_class, FALSE );
     print_legend(last_class, 1);
     close_printer();
         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", "NE Leg Place");
+        csv_print( "%s", "NE Leg End Place");
+        csv_print( "%s", "NE Leg Class Place");
+        csv_print( "%s", "NE 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 Event Place");
     csv_print( "%s", "Team Leg Class Place");
-//            csv_print( "%s", team_buf.leg[j].manual );
+    csv_print( "%s", "Team Event Class Place");
+    csv_print( "%s", "NE Team Leg End Place");
+    csv_print( "%s", "NE Team Event Place");
+    csv_print( "%s", "NE Team Leg Class Place");
+    csv_print( "%s", "NE Team Event Class Place");
     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( "%s", "Flag:vet_check" );
+    // Not available as the data is only in-memory
+    // csv_print( "%s", "Flag:notInFastest" );
+    // csv_print( "%s", "Flag:notInSort" );
     csv_print("\n");
     for( i = config.min_team; i <= config.max_team; i++ )
+    {
                 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", sort_aux[team_buf.numb].lq_place[j] );
+                csv_print( "%d", sort_aux[team_buf.numb].leq_place[j] );
+                csv_print( "%d", sort_aux[team_buf.numb].lcq_place[j] );
+                csv_print( "%d", sort_aux[team_buf.numb].lecq_place[j] );
                 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].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].lc_place );
             csv_print( "%d", team_buf.leg[j].lec_place );
-//            csv_print( "%d", team_buf.leg[j].manual );
+            csv_print( "%d", sort_aux[team_buf.numb].lq_place[j] );
+            csv_print( "%d", sort_aux[team_buf.numb].leq_place[j] );
+            csv_print( "%d", sort_aux[team_buf.numb].lcq_place[j] );
+            csv_print( "%d", sort_aux[team_buf.numb].lecq_place[j] );
             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 );
+            csv_print( "%d", team_buf.flags.vet_check );
+            // Not available as the data is only in-memory
+            // csv_print( "%d", team_buf.flags.notInFastest );
+            // csv_print( "%d", team_buf.flags.notInSort );
 //How about class placings
             csv_print( "\n" );
         pri_eleg_body ( leg );
         report_html = html;
         pri_leg_body ( leg );
+        pri_eleg_body ( leg );
+        //report_html = printed;
+        //
+        //pri_leg_body ( leg );
-        pri_eleg_body ( leg );
+        //pri_eleg_body ( leg );
         report_html = text;
+    }
     pri_final();
+    pri_final_teamOrder();
     pri_final_html();
     pri_csv_data();
+    pri_summary_html();
     pri_summary();
     pri_awards_html();
     pri_awards();
     pri_master_index();
+    report_html = html;
+    pri_interim();
+    report_html = text;
     pri_interim();
     report_all = FALSE;
+}
     **  Now printout the column headings
     **  This is a two line display
     **
     **  Line-1  Leg names
     */
+    if (config.num_legs == 1 ) {
+        print( "%-*s", 4, "" );
+        print( "  %-*s", 18, config.leg_name[0] );
+        print( " %-*s", MAX_TM_NAME + 1, "" );
+        print( "%-4s\n", ( teamclass < 0 ) ? "Cat" : "Fin" );
+    } else {
-    print( "%-*s %-*s %-*s", 4, "", 4, "", 3, "" );
+        print( "%-*s %-*s %-*s", 4, "", 4, "", 3, "" );
-    for( j = 1; j <= config.num_legs; j++ )
+        for( j = 1; j <= config.num_legs; j++ )
-    {
+        {
-        print_bold( TRUE );
+            print_bold( TRUE );
-        print( "  %-*s", 18, config.leg_name[j - 1] );
+            print( "  %-*s", 18, config.leg_name[j - 1] );
-        print_bold( FALSE );
+            print_bold( FALSE );
+        }
+        print( "  %-8s %-4s\n", "Total", ( teamclass < 0 ) ? "Cat" : "Fin" );
+    }
-    print( "  %-8s %-4s\n", "Total", ( teamclass < 0 ) ? "Cat" : "Fin" );
     /*
     **  Line-2  Details
     */
     print_underline( TRUE );
     print( "%-*s %*s %-*s", 4, final ? "Plce" : "Team",
 , final ? "Team" : "Plce",
 , "Cat" );
-    for( j = 1; j <= config.num_legs; j++ )
-        print( "  %-8s %-4s %-4s", "Time", " LP", " EP" );
+    if (config.num_legs == 1 ) {
+        print( "  %-8s", "Time" );
+        print( " %-*s", MAX_TM_NAME + 1, "Team Name" );
+        print( "%4s\n", "Plce" );
+    } else {
+        for( j = 1; j <= config.num_legs; j++ )
+            print( "  %-8s %4s %4s", "Time", "LP", "EP" );
-    print( "  %-8s %-4s\n", "Time", "Plce" );
+        print( "  %-8s %4s\n", "Time", "Plce" );
+    }
     print_underline( FALSE );
+}
 /*========================================================================
+ *
+    {
         print_bold( TRUE );
         print( "%-13s  ", config.leg_name[i - 1] );
         print_bold( FALSE );
+    }
+    if ( config.num_legs != 1 ) {
+        print_bold( TRUE );
-    print( "%-13s  \n", final ? "Total" : "" );
+        print( "%-13s  ", final ? "Total" : "" );
+        print_bold( FALSE );
+    }
+    print( "\n" );
     /*
     **  Print the fastest teams for each leg and overall
     **  Add cross references to the team names for the fastest teams
     */
                 j = 0;                           /* Leg-0 last */
             else
                 break;
+        }
-        if ( report_html == html ) print( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "name" ,"html")), stats.fast.team[j][c] );
+        if ( report_html == html ) setHref( "<A HREF=\"%s#Team_%04d\">", url_encode(p_filename(filebase, "name" ,"html")), stats.fast.team[j][c] );
         print( "%4d",  stats.fast.team[j][c] );
-        if ( report_html == html ) print( "</A>" );
         print( " %s  ", time_a( stats.fast.time[j][c] ) );
+        if ( config.num_legs == 1 ) break;
+    }
     print( "\n" );
     /*
     **  Print the average time for each leg
                 j = 0;                           /* Leg-0 last */
             else
                 break;
+        }
         print( "     %s  ", time_a( stats.average[j][c] ) );
+        if ( config.num_legs == 1 ) break;
+    }
+}
 /*========================================================================
+ *
     print( "\n" );
     for( i = 1, count = 0; i <= config.num_class; i++ )
+    {
-#if 0
-        /*
-        **  Skip any non-equestrian class in the legend
+        if (!config.team_class[i - 1].abr[0])
-        **  Don't want to tell the general user whats goes on, unless we actually
-        **  creating the non-equestrian report.
-        */
-        if ( class != config.nonequestrian_class  && i == config.nonequestrian_class )
             continue;
-#endif
-        if ( report_html == html ) print( "<A HREF=\"%s\">",url_encode(p_filename(filebase, config.team_class[i - 1].abr ,"html")) );
+        if ( report_html == html ) setHref( "<A HREF=\"%s\">",url_encode(p_filename(filebase, config.team_class[i - 1].abr ,"html")) );
         print( "%-*s", 3, config.team_class[i - 1].abr );
-        if ( report_html == html ) print( "</A>" );
         print( " : %-*s  ", LEN_CLASS_NAME, config.team_class[i - 1].full_name );
         if( !( ++count % 5 ) )
             print( "\n" );
+    }
     /*
     **  Add link to the finish order report
     */
     if ( report_html == html )
+    {
-        print( "<A HREF=\"%s\">", url_encode(p_filename(filebase, "finish" ,"html")) );
+        setHref( "<A HREF=\"%s\">", url_encode(p_filename(filebase, "finish" ,"html")) );
         print( "%-*s", 3, "All" );
-        print( "</A>" );
         print( " : %-*s  ", LEN_CLASS_NAME, "Finishing Order" );
+    }
     /*
     **  Country data - if countries have been defined
     /*
      * Other comments
      */
     if ( full )
+    {
+        if ( config.num_legs != 1 )  {
+            print( "\n" );
+            if ( report_html ) print_underline(TRUE);
-        print( "\nPlace numbers (LP and EP)\n" );
+            print( "Place numbers (LP and EP)" );
+            if ( report_html ) print_underline(FALSE);
+            print( "\n" );
-        print( "LP - Placing based on elapsed time within the leg.                Cat Plce - Placing within the category.\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( "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" );
+            print( "U  - Placing not available.\n" );
+        } else {
+            print( "\n" );
+            if ( report_html ) print_underline(TRUE);
+            print( "Table Legend" );
+            if ( report_html ) print_underline(FALSE);
+            print( "\n" );
+            print( "Cat Plce - Placing within the category.\n");
+            print ("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
      */
     if( config.addendum[0] )
+    {
-        const char *name = QmConfig::getAddendemFile(config.addendum);
+        QString name = QmConfig::getAddendemFile(config.addendum);
-        if (name)
+        if (! name.isEmpty())
+        {
-            adfile = fopen( name, "rt" );  /* Open the file for reading */
+            adfile = fopen( qPrintable(name), "rt" );  /* Open the file for reading */
+        }
+    }
     if( adfile )
+    {
         while( fgets( line, sizeof(line)-1, adfile ) )
             print( "%s", line );
+        fclose (adfile);
+    }
     else
+    {
         print( "\nTiming and Results by\n" );
         print( "Embedded Solutions\n" );
+    }
+}
-/*========================================================================
- *
- *  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
- *      time        Time data is based on
- *
- *  Returns:
- *      This function returns a pointer to the character string for the
- *      number or a pointer to a bad_times string.
- *
- *========================================================================*/
-const char       *pi_place( int num, int disq, time_t time )
-{
-    static char store[2][5];                     /* 2 stores for 4 digit numbers */
-    static int  i = 0;                           /* Current index into store */
-    static const char *dis = "D";                      /* Disqualified */
-    static const char *non = "-";                      /* Invalid time */
-    if( disq )                                   /* Disqualified team */
-        return ( dis );
-    if( time <= 0 )                              /* Unknown time */
-        return ( non );
-    i++;
-    if( i >= 2 )
-        i = 0;                                   /* Select next entry */
-    sprintf( store[i], "%4d", num );
-    return ( store[i] );
-}
 /*========================================================================
+ *
- *  Return place data
+ *  Return place data or NE flag
+ *
  *  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:
+ *      leg         Leg number being processed or
+ *                  -1: Unplaced on any bad flag
- *      num         place - if not bad_times
+ *      num         place - if valid time
+ *      epMode      true:  Event Time Mode - Show V and NE flags
+ *                  false: Leg Time Mode -
+ *      neMode      true: Display NE for NE Teams
+ *                  false: Display data for NE teams
- *      disq        Disqualified flag
+ *      flags       Team flags
+ *
  *  Returns:
  *      This function returns a pointer to the character string for the
- *      number or a pointer to a bad_times string.
+ *      number or a pointer to a status string.
+ *
  *========================================================================*/
-const char *pr_place( int num, int disq )
+const char *px_place( int leg, int num, bool epMode, bool neMode, team_flags flags )
+{
     static char store[2][5];                     /* 2 stores for 4 digit numbers */
     static int  i = 0;                           /* Current index into store */
     static const char *dis = "U";
+    static const char *alt = "NE";
+    static const char *vet = "U";
-    if( disq )
+    if (flags.bad_times || flags.disqualified || !flags.valid)
-        return ( dis );
+        return dis;
-    i++;
-    if( i >= 2 )
-        i = 0;                                   /* Select next entry */
-    sprintf( store[i], "%4d", num );
+    if (leg == -1 && flags.vet_check )
-    return ( store[i] );
+        return vet;
+    if (neMode && flags.non_equestrian && (leg >= config.equestrian_leg || leg == 0))
-}
+        return alt;
-/*========================================================================
- *
- *  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
+    if (epMode && flags.vet_check && leg >= config.equestrian_leg)
- *
- *  Returns:
+        return vet;
- *      This function returns a pointer to the character string for the
- *      number or a pointer to a bad_times string.
- *
- *========================================================================*/
-const 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 */
+    if ( flags.vet_check && (leg == config.equestrian_leg || leg == 0))
-    static const char *dis = "U";
+        return vet;
-    if( disq && ! ne )
+    if (num <= 0)
-         return ( dis );
+        return dis;
+    i++;
-    if( ++i >= 2 )
+    if( i >= 2 )
         i = 0;                                   /* Select next entry */
     sprintf( store[i], "%4d", num );
     return ( store[i] );
+}
  *      and the report process can be aborted
+ *
  *  Parameters:
  *      leg             Leg to test
  *      mode            Either end or elapsed times to be tested
+ *                          C_END     - Printing in Leg Finishing Time
+ *                          C_DISQUAL - Interim results
+ *                          C_ELAPSED - Elapsed times
+ *
- *  Returns:
- *      Returns FALSE if the report operation is to be aborted
+ *
  *========================================================================*/
-bool ck_data( int leg, int mode )
+void ck_data( int leg, int mode )
+{
     ty_s_data  *ptr;
     unsigned    i;
     int         bad = 0;
     int         k;
             t = ptr->lege;
         else
             t = ptr->leg;
-        if ( leg >= 0 )
+        // If the team is duff, then don;t include in Event or Leg Calcs
+        if( !ptr->flags.valid || ptr->flags.bad_times || ptr->flags.disqualified)
+        {
-            ptr->flags.bad_times = (ptr->flags.disqualified && ! ptr->flags.non_equestrian );
+            ptr->flags.notInLP = TRUE;
+        }
         else
+        {
-            ptr->flags.bad_times = ptr->flags.disqualified /*|| ptr->flags.non_equestrian */;
+            // If any of the leg times are duff, then don't include the leg Event Calcs
-        }
-        if( ! ptr->flags.bad_times )
-        {
             if( leg <= 0 )
+            {
                 for( k = 0; k <= config.num_legs; k++ )
+                {
                     if ( !(config.equestrian_leg && ptr->flags.non_equestrian && config.equestrian_leg == k  ))
                 bad_leg = t[leg] <= 0;
+            }
             if( bad_leg )
+            {
-                ptr->flags.bad_times = TRUE;
                 if ( ! report_all )
+                {
-                    printf( "Team with incorrect time information: %d", ptr->team  );
+                    qDebug( "Team with incorrect time information: %d", ptr->team  );
                     bad++;
+                }
+            }
+        }
+    }
     if( bad )
+    {
-        printf( "%d teams with incorrect times. These have been flagged as unplaced", bad );
+        qDebug( "%d teams with incorrect times. These have been flagged as unplaced", bad );
+    }
-    return ( FALSE );
+}
 /*========================================================================
+ *
  *  Update placing information
+ *
  *========================================================================*/
 void srt_place(void)
+{
-    if( ck_data( -1, C_ELAPSED ) )
+    ck_data( -1, C_ELAPSED );
-        return;
     do_big_sort();
     /*
      * Generate the stats
      */
     for( i = config.min_team; i <= config.max_team; i++ )
+    {
         if( valid_field( i ) && g_record( i, &team_buf ) )
+        {
             bool valid = true;
+            bool valid_ne = true;
             if ( team_buf.flags.disqualified )
+            {
                 ptr->teamclass[team_buf.teamclass].disqualified++;
                 ptr->total.disqualified++;
                 valid = false;
+                valid_ne = false;
+            }
             if ( team_buf.flags.vet_check )
+            {
                 ptr->teamclass[team_buf.teamclass].vet_check++;
                 ptr->total.vet_check++;
                 valid = false;
+                valid_ne = false;
+            }
             if ( config.nonequestrian_class && team_buf.flags.non_equestrian )
+            {
                 ptr->teamclass[team_buf.teamclass].non_equestrian++;
                 ptr->total.non_equestrian++;
                 valid = false;
+            }
+            else
+            {
+                valid_ne = false;
+            }
             ptr->total.total++;
             ptr->teamclass[team_buf.teamclass].total++;
             if ( valid )
+            {
                 ptr->total.valid++;
                 ptr->teamclass[team_buf.teamclass].valid++;
+                if ( ! team_buf.flags.bad_times )
+                {
+                    ptr->total.valid_ev++;
+                    ptr->teamclass[team_buf.teamclass].valid_ev++;
+                }
+            }
+            if ( valid_ne )
+            {
+                if ( ! team_buf.flags.bad_times )
+                {
+                    ptr->total.valid_ne++;
+                    ptr->teamclass[team_buf.teamclass].valid_ne++;
+                }
+            }
+        }
+    }
     /*
+    }
+}
 /*========================================================================
+ *
+ *  Print summary results
+ *
+ *  Purpose:
+ *      This function is called to Print summary results
+ *      Keep the page to 80 cols, so that it can be pronted on A4
+ *
+ *  Parameters:
+ *      None
+ *
+ *  Returns:
+ *      Nothing
+ *
+ *========================================================================*/
+void pri_summary_html(void)
+{
+    report_type saved = report_html;
+    /*
+    **  Generate ALL results with HTML tags
+    */
+    report_html = html;
+    pri_summary();
+    report_html = printed;
+    pri_summary();
+    report_html = saved;
+}
+/*========================================================================
+ *
  *  Print summary information
+ *
  *  Purpose:
  *      This function is called to print summary information
+ *
+{
     t_class_summary data;
     int         i;
-    if( !open_printer( "", "summary", 132, text, "Summary Information" ) )
+    if( !open_printer( "", "summary", 80, report_html, "Summary Information" ) )
         return;
     calc_class_summary( & data );
     /*
     **  Display summary stats
     */
-    print( "%*s : %-7s %-7s%-7s\n", LEN_CLASS_NAME,
+    print( "%*s : %-7s %-7s %-7s %-7s %-7s %-7s %-7s\n",
-                                      "Category",
+                                      LEN_CLASS_NAME, "Category",
                                       "Total",
+                                      "Valid",
                                       "Disq",
-                                      "NonEq" );
+                                      "NonEq",
+                                      "VetChk",
+                                      "CompEv",
+                                      "CompNe"
+                                       );
     for( i = 0; i < config.num_class; i++ )
+    {
+        if (!config.team_class[i].abr[0])
+            continue;
         /*
         **  The non-equestrian leg does not have any data
-        **  Supress the display
+        **  Suppress the display
         */
         if ( config.nonequestrian_class == i+1  )
             continue;
-        print( "%*s : %-7d %-7d %-7d\n", LEN_CLASS_NAME,
+        if ( report_html == html ) setHref( "<A HREF=\"%s\">",url_encode(p_filename(filebase, config.team_class[i].abr ,"html")) );
-                                          config.team_class[i].full_name,
+        print( "%*s ", LEN_CLASS_NAME, config.team_class[i].full_name );
+        print( ": %-7d %-7d %-7d %-7d %-7d %-7d %-7d\n",
                                           data.teamclass[i+1].total,
+                                          data.teamclass[i+1].valid,
                                           data.teamclass[i+1].disqualified,
-                                          data.teamclass[i+1].non_equestrian );
+                                          data.teamclass[i+1].non_equestrian,
+                                          data.teamclass[i+1].vet_check,
+                                          data.teamclass[i+1].valid_ev,
+                                          data.teamclass[i+1].valid_ne
+                                          );
+    }
     print( "\n" );
-    print( "%*s : %-7d %-7d %-7d\n", LEN_CLASS_NAME,
+    print( "%*s : %-7d %-7d %-7d%-7d %-7d %-7d %-7d\n",
-                                      "Totals",
+                                      LEN_CLASS_NAME, "Totals",
                                       data.total.total,
+                                      data.total.valid,
                                       data.total.disqualified,
-                                      data.total.non_equestrian );
+                                      data.total.non_equestrian,
+                                      data.total.vet_check,
+                                      data.total.valid_ev,
+                                      data.total.valid_ne
+                                      );
     close_printer();
+}
+ *
  *========================================================================*/
 void do_big_sort(void)
+{
-    int         i, k;                            /* Looooopy things */
+    int         i, k, q;                             /* Looooopy things */
     unsigned    j;
-    ty_s_data  *ptr;                             /* Pointer to sort data */
+    ty_s_data  *ptr;                                 /* Pointer to sort data */
     int         teamclass;                           /* Current class */
+    int         teamclassq;                          /* Current class */
     team_type   team_buf;
     for( i = 0; i <= config.num_legs; i++ )
+    {
+        bool sortWithEq =  (i == 0);
         /*
         **  Sort on leg elapsed time
         **  Then save the teams elapsed place in each leg
         */
-        sort_team_data( i, S_L );
+        sort_team_data( i, S_L, sortWithEq );
-        for( j = 1, k = 1, ptr = sort_data; j <= sort_num; ptr++, j++ )
+        for( j = 1, k = 1, q = 1, ptr = sort_data; j <= sort_num; ptr++, j++ )
+        {
-            if ( ptr->teamclass == config.nonequestrian_class )
-                continue;
-            sort_aux[ptr->team].l_place[i] = k++;
             sort_aux[ptr->team].team = ptr->team;
+            if (i == config.equestrian_leg || i == 0) {
+                if (ptr->flags.bad_times || ptr->flags.disqualified || ptr->flags.vet_check) {
+                    if (ptr->isNeData) {
+                        sort_aux[ptr->team].lq_place[i] = -1;
+                    } else {
+                        sort_aux[ptr->team].l_place[i] = -1;
+                    }
+                    continue;
+                }
+            }
+            // Flag as unplaced NE teams on the EQ leg
+            // DO NOT Flag as unplaced in overall (leg:0) NE teams as this is used in the full report
+            if ( (i == config.equestrian_leg /*|| i == 0*/ ) && ptr->flags.non_equestrian ) {
+                if (ptr->isNeData) {
+                    sort_aux[ptr->team].lq_place[i] = -1;
+                } else {
+                    sort_aux[ptr->team].l_place[i] = -1;
+                }
+                continue;
+            }
+            if (ptr->isNeData) {
+                sort_aux[ptr->team].lq_place[i] = q++;
+            } else {
+                sort_aux[ptr->team].l_place[i] = k++;
+            }
+        }
         /*
         **  Sort on leg end time
         **  Then save the teams place at the end of each leg
         */
-        sort_team_data( i, S_LE );
+        sort_team_data( i, S_LE, sortWithEq);
-        for( j = 1, k = 1, ptr = sort_data; j <= sort_num; ptr++, j++ )
+        for( j = 1, k = 1, q = 1, ptr = sort_data; j <= sort_num; ptr++, j++ )
+        {
-            if ( ptr->teamclass == config.nonequestrian_class )
+            if (i == 0 || i == config.equestrian_leg || sort_afterEquestrianLeg ) {
+                if (ptr->flags.bad_times || ptr->flags.disqualified || ptr->flags.vet_check) {
+                    if (ptr->isNeData) {
+                        sort_aux[ptr->team].leq_place[i] = -1;
+                    } else {
+                        sort_aux[ptr->team].le_place[i] = -1;
+                    }
+                    continue;
+                }
+            }
+            // Flag as unplaced NE teams on the EQ leg
+            // Flag as unplaced NE teams after the EQ leg
+            // Flag as unplaced in overall (leg:0) NE teams
+            if ( (i == config.equestrian_leg || sort_afterEquestrianLeg || i == 0 ) && ptr->flags.non_equestrian ) {
+                if (ptr->isNeData) {
+                    sort_aux[ptr->team].leq_place[i] = -1;
+                } else {
+                    sort_aux[ptr->team].le_place[i] = -1;
+                }
                 continue;
+            }
+            if (ptr->isNeData) {
+                sort_aux[ptr->team].leq_place[i] = q++;
+            } else {
-            sort_aux[ptr->team].le_place[i] = k++;
+                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
+        **  Then save the teams elapsed place in each leg per class
         */
-        sort_team_data( i, S_LC );
+        sort_team_data( i, S_LC, sortWithEq );
         teamclass = -1;
+        teamclassq = -1;
+        int ll = -1;
-        for( k = 1, j = 1, ptr = sort_data; j <= sort_num; j++, ptr++ )
+        for( k = 1, j = 1, q = 1, ptr = sort_data; j <= sort_num; j++, ptr++ )
         {
+            bool isNe = false;
-            if( teamclass != ptr->teamclass )
+            if ( sortWithEq && ptr->isNeData  ) {
+                if ( !ptr->isNeData)
+                    isNe = true;
+            }
+            else {
+                if (ptr->isNeData)
+                    isNe = true;
-            {
+            }
+            // Flag as unplaced NE teams on the EQ leg
+            if (i == 0 || i == config.equestrian_leg) {
+                if (ptr->flags.bad_times || ptr->flags.disqualified || ptr->flags.vet_check) {
+                    if (isNe) {
+                        sort_aux[ptr->team].lcq_place[i] = -1;
+                    } else {
+                        sort_aux[ptr->team].lc_place[i] = -1;
-                k = 1;
+                    }
+                    continue;
+                }
+            }
+            if ( i == config.equestrian_leg && ptr->flags.non_equestrian ) {
-                teamclass = ptr->teamclass;
+                if (ptr->isNeData) {
+                    sort_aux[ptr->team].lcq_place[i] = -1;
+                } else {
+                    sort_aux[ptr->team].lc_place[i] = -1;
+                }
+                continue;
+            }
+            if (ptr->isNeData) {
+                if( teamclassq != ptr->teamclass )
+                {
+                    q = 1;
+                    teamclassq = ptr->teamclass;
+                }
+//qDebug() << "Team:" << ptr->team << ",Class:" << ptr->teamclass << "," << q;
-            sort_aux[ptr->team].lc_place[i] = k++;
+                sort_aux[ptr->team].lcq_place[i] = q++;
+            }
+            else {
+                if( teamclass != ptr->teamclass )
+                {
+                    k = 1;
+                    ll = 1;
+                    teamclass = ptr->teamclass;
+                }
+                if (ptr->flags.non_equestrian && sortWithEq)
+                    sort_aux[ptr->team].lc_place[i] = ll++;
+                else
+                    sort_aux[ptr->team].lc_place[i] = k++;
+            }
+        }
         /*
         **  Sort on end time per class
         **  Then save the teams place at the end of each leg per class
+        **  Suuport NE teams as well Equestrian Teams
         */
-        sort_team_data( i, S_LEC );
+        sort_team_data( i, S_LEC, sortWithEq );
         teamclass = -1;
+        teamclassq = -1;
-        for( k = 1, j = 1, ptr = sort_data; j <= sort_num; j++, ptr++ )
+        for( k = 1, j = 1, q = 1, ptr = sort_data; j <= sort_num; j++, ptr++ )
+        {
-            if( teamclass != ptr->teamclass )
+            // All teams with bad data
+            if (ptr->flags.bad_times || ptr->flags.disqualified ) {
+                sort_aux[ptr->team].lec_place[i] = -1;
+                sort_aux[ptr->team].lecq_place[i] = -1;
+                continue;
-            {
+            }
+            // NE team - the full entry
+            // Flag as unplaced NE teams on the EQ leg
+            // Flag as unplaced NE teams after the EQ leg
+            // Flag as unplaced in overall (leg:0) NE teams
+            if (!ptr->isNeData  && ptr->flags.non_equestrian) {
+                if (i == 0 || i == config.equestrian_leg || sort_afterEquestrianLeg ) {
+                    sort_aux[ptr->team].lec_place[i] = -1;
+                    continue;
-                k = 1;
+                }
+            //  NE Team - the duplicate entry
+            // Flag as unplaced NE teams after the EQ leg
-                teamclass = ptr->teamclass;
+            } else if ( ptr->isNeData ) {
+                if ( i == config.equestrian_leg) {
+                    sort_aux[ptr->team].lecq_place[i] = -1;
+                    continue;
+                }
+                // EQ Team
+                // Flag as unplaced vetted teams on the EQ leg
+                // Flag as unplaced vetted teams after the EQ leg
+                // Flag as unplaced in overall (leg:0) vetted teams
+            } else {
+                if (i == 0 || i == config.equestrian_leg || sort_afterEquestrianLeg ) {
+                   if ( ptr->flags.vet_check) {
+                       sort_aux[ptr->team].lec_place[i] = -1;
+                       continue;
+                   }
+                }
+            }
+            if (ptr->isNeData) {
+                if( teamclassq != ptr->teamclass )
+                {
+                    q = 1;
+                    teamclassq = ptr->teamclass;
+                }
+                sort_aux[ptr->team].lecq_place[i] = q++;
+            }
+            else {
+                if( teamclass != ptr->teamclass )
+                {
+                    k = 1;
+                    teamclass = ptr->teamclass;
+                }
-            sort_aux[ptr->team].lec_place[i] = k++;
+                sort_aux[ptr->team].lec_place[i] = k++;
+            }
+        }
+    }
     /*
     **  Write the place information back to disk for use in the displays
+    **  For backwards compatability we havn't saved all the data.
+    **      The NE specific data has not been saved, but is held in memory for report generation
     */
     for( i = config.min_team; i <= config.max_team; i++ )
+    {
         if( sort_aux[i].team && valid_field( i ) && g_record( i, &team_buf ) )
+        {
  *      This function is called to Sort in memory buffer
+ *
  *  Parameters:
  *      leg         Requested leg
  *      mode        Defines the sort mode
+ *      withEq      Sort with equestrian data (True=Normal)
+ *
  *  Returns:
  *      Nothing
+ *
  *========================================================================*/
-void sort_team_data( int leg, int mode )
+void sort_team_data( int leg, int mode, bool withEq )
+{
     unsigned    j;
     ty_s_data  *ptr;
     sort_leg = leg;                              /* Leg is global for the comparison function */
     sort_mode = mode;                            /* Mode is global for compare function */
+    sort_withEquestrian = withEq;                /* Mode is global for compare function */
+    sort_afterEquestrianLeg = ( config.equestrian_leg && leg > config.equestrian_leg);
     qsort( ( char * ) sort_data, sort_num, sizeof( ty_s_data ), sort_comp );
     /*
      * Insert "place data" into the sorted data
      * This simply the index into the array of data - after its been
      * sorted.
      */
     ptr = sort_data;
     for( j = 1; j <= sort_num; j++, ptr++ )
+    {
         ptr->place = j;
+    }
+    //qDebug() << "sort_team_data: Leg:" << leg << ",M:" << mode << ",E:" << withEq;
+}
 /*========================================================================
+ *
  *      a       - 1st record
  *      b       - 2nd record
+ *
  *  Returns:
  *      value to qsort
+ *      Return negative if 'a' is less than 'b',
+ *             zero if 'a' == 'b'
+ *             positive if 'a' > 'b'
+ *
  *========================================================================*/
 int sort_comp( const void * aa, const void * bb )
+{
     if( sort_mode == S_TEAM )
         return ( a->team - b->team );
     /*
     **  Sorting on Class and Team Number
+    **  Sort NE entries as a class of there own
     */
     if( sort_mode == S_CLASS )
+    {
+        if ( a->isNeData || b->isNeData) {
+            if ( a->isNeData && b->isNeData)
+                return ( a->team - b->team );
+            else
+                return ( a->isNeData ? 1 : -1 );
+        }
         if( a->teamclass != b->teamclass )
             return ( a->teamclass - b->teamclass );
         else
             return ( a->team - b->team );
+    }
     /*
     **  Sorting within a class
     **  First sort on the class
+    **      Always put the NE entries last as this will simplify processing
+    **      Compare NE entries against NE entries and EQ entries againstEQ entries
     */
-    if( sort_mode == S_LEC || sort_mode == S_LC || sort_mode == S_LC_NE )   /* Sort within a class */
+    if( sort_mode == S_LEC || sort_mode == S_LC /*|| sort_mode == S_LC_NE*/ ) {  /* Sort within a class */
-        if( a->teamclass != b->teamclass )
+        if ( a->isNeData || b->isNeData) {
-            return ( a->teamclass - b->teamclass );
+            if ( !(a->isNeData && b->isNeData ) )
-#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->teamclass == config.nonequestrian_class ||  b->teamclass == config.nonequestrian_class )
-    {
-        if ( a->teamclass == config.nonequestrian_class &&  b->teamclass == config.nonequestrian_class )
-        {
-            if (sort_mode == S_LC_NE )
+                return ( a->isNeData ? 1 : -1 );
-            {
+        } else {
-                if ( a->real_teamclass != b->real_teamclass )
+            if (a->teamclass != b->teamclass) {
-                {
-                    return ( a->real_teamclass - b->real_teamclass );
+                return ( a->teamclass - b->teamclass );
-                }
+            }
+        }
-        else
-        {
-            return ( a->teamclass == config.nonequestrian_class ? 1 : -1 );
-        }
+    }
-#endif
     /*
     **  Now we need to examine the times as we have sorted
     **  on every thing else.
     **
     **  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 ...
-                    */
+    bool aNoSort = false;
-                    //return ( a->team - b->team );
-                }
-                else
+    bool bNoSort = false;
-                {
-                    /* One is equestrian */
-                    /* Good times better than NE */
-                    return ( a->flags.non_equestrian ? -1 : 1 );
+    if ( sort_leg != 0 && (sort_mode == S_LC || sort_mode == S_L ) ) {
-                }
-            }
-            else
-            {
-                /* Neither is equestrian */
-                return ( a->team - b->team );
+        aNoSort = a->flags.notInLP;
-            }
-        }
-        else
-            return ( a->flags.bad_times ? 1 : -1 );
+        bNoSort = b->flags.notInLP;
+    }
-#else
-    if( a->flags.bad_times || b->flags.bad_times )  /* Valid data has precedence */
+    if ( sort_withEquestrian && (sort_mode == S_LC || sort_mode == S_L ) ) {
-    {
-        if( a->flags.bad_times && b->flags.bad_times )
+        if (a->flags.vet_check)
-            return ( a->team - b->team );
+            aNoSort = true;
-        else
+        if (b->flags.vet_check)
-            return ( a->flags.bad_times ? 1 : -1 );
+            bNoSort = true;
+    }
+    if (a->flags.bad_times || a->flags.disqualified || !a->flags.valid)
+        aNoSort = true;
+    if (b->flags.bad_times || b->flags.disqualified || !b->flags.valid)
+        bNoSort = true;
+    if ( sort_mode == S_FIN || sort_mode == S_IFIN ) {
+        if (a->flags.vet_check)
+            aNoSort = true;
+        if (b->flags.vet_check)
+            bNoSort = true;
-    /*
+    }
-    **  Not sorting within a class ie: Overall
+    if (sort_mode == S_IFIN ) {
+        if (a->isNeData)
+            aNoSort = true;
+        if (b->isNeData)
+            bNoSort = true;
+    }
-    **  Non-Equestrian is at the end, so that it doesn't get counted in the
+    // On the Equestrian Leg, vetted out teams are treated as disqualified
+    if (sort_leg == config.equestrian_leg || (sort_afterEquestrianLeg && ( sort_mode == S_LE || sort_mode == S_LEC))) {
+        if (a->flags.vet_check)
+            aNoSort = true;
+        if (b->flags.vet_check)
-    **  finishing order
+            bNoSort = true;
-    */
+    }
+    if (aNoSort && bNoSort)
+        return ( a->team - b->team );
+    if (aNoSort || bNoSort)
+        return ( aNoSort ? 1 : -1 );
-    if( sort_mode == S_LE || sort_mode == S_L )     /* Sort NOT within a class */
+    if( sort_withEquestrian && sort_mode != S_FIN && sort_mode != S_IFIN )
+    {
-        if( a->flags.non_equestrian || b->flags.non_equestrian )
+        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 );
+            //return ( a->team - b->team );
+        }
+        else if( a->flags.non_equestrian || b->flags.non_equestrian )
-            else
+        {
+            /* One is equestrian */
+            /* Good times better than NE */
-                return ( a->flags.non_equestrian ? 1 : -1 );
+            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.
     */
       **    Sort on Elapsed times
       */
       case S_LC_NE:
       case S_LC:
       case S_L:
+      case S_IFIN:
         ta = a->lege[sort_leg];
         tb = b->lege[sort_leg];
         break;
       /*
       */
       default:
         return ( 0 );
+    }
+    if (sort_mode != S_LC_NE) {
+        /*
+         ** If we are ignore Equestrian config then place the Equestrian data last
+        */
+        if (sort_withEquestrian) {
+            if (a->isNeData != b->isNeData)
+                return ( a->isNeData ? 1 : -1 );
+        }
+        if ( a->team == b->team) {
+            return ( a->isNeData ? 1 : -1 );
+        }
+    }
     /*
     **  Finally. Compare the required team times
     */
     if( ta == tb )
         return ( a->team - b->team );
 bool load_report_data(void)
+{
     ty_s_data  *ptr;                             /* pointer to sort data type */
     ty_s_data  *last;
-    int         j;
+    unsigned    j;
     unsigned    num;
     team_type   team_buf;
     /*
      * Fetch memory for the data store
     */
     num = config.max_team - config.min_team + 1 ;
     /*
     **  Allow for non-equestrian teams - since some of the data is loaded twice
-    **  Take a guess that at most 1/2 the teams will be non-equestrian
+    **  OLD: Take a guess that at most 1/2 the teams will be non-equestrian
+    **  NEW: Memory is cheap. Assume all teams could be non-equestrian
     */
+    // OLD: num = num * 3 / 2;
-    num = num * 3 / 2;
+    num = num * 2;
     sort_data = ( ty_s_data * ) calloc ( num , sizeof( ty_s_data ) );
     sort_aux = ( ty_s_aux * ) calloc( num + 1, sizeof( ty_s_aux ) );
     if( sort_data == 0 || sort_aux == 0 )
             g_record( team, &team_buf );
             if( team_buf.flags.valid )
+            {
                 last = ptr;
                 ptr->team = team;
+                ptr->isNeData = false;
                 for( j = 0; j < MAX_LEGS + 1; j++ )
+                {
                     ptr->lege[j] = team_buf.leg[j].elapsed;
                     ptr->leg[j] = team_buf.leg[j].end;
+                }
                 ptr->start = team_buf.leg[0].start;
                 ptr->teamclass = team_buf.teamclass;
-                ptr->real_teamclass = team_buf.teamclass;
                 ptr->flags = team_buf.flags;
+                // Add a few flags to simplify processing
+                //  Vetted out teams to be included inthe fastest calcs - except for Equestian Leg
+                //  Bodgey teams are not sorted by place - only after all places and then by team number
-                if (ptr->flags.non_equestrian)
+                ptr->flags.notInLP = 0;
-                    ptr->flags.disqualified = true;
+                ptr->flags.notInFastest = 0;
+                if ( ptr->flags.bad_times || ptr->flags.disqualified || !ptr->flags.valid) {
-                if (ptr->flags.vet_check)
+                    ptr->flags.notInLP = 1;
-                    ptr->flags.disqualified = true;
+                    ptr->flags.notInFastest = 1;
+                }
                 ptr++;
                 sort_num++;
                 /*
                 **  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->isNeData = true;
                     ptr->lege[0] = 0;
                     for( j = 0; j < MAX_LEGS + 1; j++ )
+                    {
-                        if ( j == config.equestrian_leg )
+                        if ( (short)j == config.equestrian_leg )
+                        {
                             last->lege[j] = ptr->lege[j] = 0;
                             if ( config.equestrian_leg > 1 )
                                 last->leg[j] = ptr->leg[j] = ptr->leg[j-1];
+                        }
                             last->lege[0] = ptr->lege[0] ;
+                        }
+                    }
                     last->start = ptr->start = team_buf.leg[0].start;
-                    ptr->teamclass = config.nonequestrian_class;
-                    ptr->real_teamclass = team_buf.teamclass;
+                    ptr->teamclass = team_buf.teamclass;
                     ptr->flags = team_buf.flags;
-                    ptr->flags.disqualified = false;
                     ptr++;
                     sort_num++;
+                }
 #endif
+            }
+        }
+    }
+#if 0
+    // Debug zzz
+    qDebug() << "--- Start ---";
+    sort_team_data( 0, S_LC, 1 );
+    for( j = 1, ptr = sort_data; j <= sort_num; j++, ptr++ )
+    {
+        qDebug() << "T:" << ptr->team
+                << "Class:" << ptr->teamclass
+                << "NEData:" << (ptr->isNeData? 1:0)
+                << "iLP:" << (ptr->flags.notInLP ? 1:0)
+                << "iF:" << (ptr->flags.notInFastest ? 1:0)
+                << "Valid:" << (ptr->flags.valid ? 1:0)
+                << "NE:" << (ptr->flags.non_equestrian? 1:0)
+                << "B:" << (ptr->flags.bad_times ? 1 : 0 )
+                << "D:" << (ptr->flags.disqualified ? 1:0 )
+                << "V:" << (ptr->flags.vet_check ? 1:0 )
+                << "LE0:" << ptr->lege[0]
+                << "L0:" << ptr->leg[0]
+                << "LE1:" << ptr->lege[3]
+                ;
+    }
+    qDebug() << "-----------------------------------End---";
+#endif
     return ( TRUE );
+}
 /*========================================================================
+ *
         **  of the data can be trusted.
         **
         **  If the team has been disqualified, then don't use any
         **  of the data.
         */
-        if( ptr->flags.bad_times || ptr->flags.disqualified )
+        if (ptr->flags.notInFastest) {
             continue;
+        }
+        short teamClass = ptr->teamclass;
+        /*  Don't include the psuedo NE data items in the calculations (unless processing NE class)
+        **  They are duplicates of other data
+        */
+        if (j == config.nonequestrian_class) {
+            if ( !ptr->isNeData)
+                continue;
+        }
+        if (ptr->isNeData)
+            teamClass = config.nonequestrian_class;
         for( j = 0; j <= config.num_legs; j++ )
+        {
             if( ptr->lege[j] <= 0 )              /* Ignore bad data */
                 continue;
             /*
+            ** If this is the Equestrian Leg and the team has been vetted out, then this team cannot
+            ** be included into the stats for this leg
+            **
+            ** If team has been vetted out then don't consider in fastest overall
+            */
+            if ( ptr->flags.vet_check && (j == config.equestrian_leg || j== 0)) {
+                continue;
+            }
+            /* If this is the Equestrian Leg and the team is a Non-Equestrian Team, then don't include
+            ** it into the stats.
+            **
+            ** If this is a NE team then don't consider it to be fastest overall
+            */
+            if ( !ptr->isNeData && ptr->flags.non_equestrian &&  (j == config.equestrian_leg || j== 0)) {
+                continue;
+            }
+            /*
             **  Determine fastest team : overall
             **  Ignore the non-equestrian data as this is in the list twice
             */
             if( ( ptr->lege[j] < stats.fast.time[j][0] )
                 || ( stats.fast.time[j][0] < 0 ) )
+            {
-                if ( ptr->teamclass != config.nonequestrian_class )
+                if ( !ptr->isNeData )
+                {
                     stats.fast.team[j][0] = ptr->team;
                     stats.fast.time[j][0] = ptr->lege[j];
+                }
+            }
             /*
             **  Determine fastest team : within a class
             */
-            if( ( ptr->lege[j] < stats.fast.time[j][ptr->teamclass] )
+            if( ( ptr->lege[j] < stats.fast.time[j][teamClass] )
-                || stats.fast.time[j][ptr->teamclass] < 0 )
+                || stats.fast.time[j][teamClass] < 0 )
+            {
-                stats.fast.team[j][ptr->teamclass] = ptr->team;
+                stats.fast.team[j][teamClass] = ptr->team;
-                stats.fast.time[j][ptr->teamclass] = ptr->lege[j];
+                stats.fast.time[j][teamClass] = ptr->lege[j];
+            }
             /*
             **  Sum the end times : overall
             */
-            if ( ptr->teamclass != config.nonequestrian_class )
+            if ( !ptr->isNeData )
+            {
                 stats.average[j][0] += ptr->lege[j];
                 stats.team[j][0]++;
+            }
             /*
             **  Sum the end times : within a class
             */
-            stats.average[j][ptr->teamclass] += ptr->lege[j];
+            stats.average[j][teamClass] += ptr->lege[j];
-            stats.team[j][ptr->teamclass]++;
+            stats.team[j][teamClass]++;
+        }
+    }
     /*
      * Calculate the averages
+     *      Can ignore that fact that some categories don't exists
+     *      The results will be -1
      */
     for( k = 0; k <= config.num_legs; k++ )
+    {
         for( j = 0; j <= config.num_class; j++ )
+        {

Subversion Repositories svn1

(root)/Mara/trunk/report.cpp – Rev 228 → 380