WebSVN – svn1-original – Diff – /Mara/branches/alternateUploadTimeFormat/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
+*       pi_place                - Return place data (Interim processing)
 *       pr_place                - Return place data
+*       pn_place                - Return place data with NE 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
     /*
      * Sort the data in finishing order
      */
     if( ck_data( leg, C_ELAPSED ) )
-        return;                                  /* Check data for this leg */
+        return;                                     /* Check data for this leg */
-    sort_team_data( leg, S_IFIN, true );               /* 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
         **  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 ", pn_place( team_buf.leg[0].l_place, ptr->flags.bad_times, ptr->flags.non_equestrian ) );
         if ( report_html == html ) print( "<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>" );
     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.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" );
 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 *dis = "D";                /* Disqualified */
-    static const char *non = "-";                      /* Invalid time */
+    static const char *non = "-";                /* Invalid time */
     if( disq )                                   /* Disqualified team */
         return ( dis );
     if( time <= 0 )                              /* Unknown time */
         return ( non );
                 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
+                ptr->flags.notInSort = 0;
+                ptr->flags.notInFastest = 0;
+                if ( ptr->flags.bad_times || ptr->flags.disqualified || !ptr->flags.valid) {
+                    ptr->flags.notInSort = 1;
+                    ptr->flags.notInFastest = 1;
+                }
+                if (ptr->flags.vet_check) {
+                    ptr->flags.notInSort = 1;
+                }
 //                if (ptr->flags.non_equestrian)
 //                    ptr->flags.disqualified = true;
-//                if (ptr->flags.vet_check)
+                if (ptr->flags.vet_check)
-//                    ptr->flags.disqualified = true;
+                    ptr->flags.disqualified = true;
                 ptr++;
                 sort_num++;
         **  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;
+        }
+        //if( ptr->flags.bad_times || ptr->flags.disqualified  )
+        //    continue;
         /*
         **  Ignore non-Equestrian, unless we are processing the psuedo NE class
+        **  2021: Now allow NE to be considered in the fastest stats
         */
-        if ( ptr->teamclass != config.nonequestrian_class && ptr->flags.non_equestrian)
+        //if ( ptr->teamclass != config.nonequestrian_class && ptr->flags.non_equestrian)
-            continue;
+        //    continue;
         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->teamclass != config.nonequestrian_class && 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
             */

Subversion Repositories svn1-original

(root)/Mara/branches/alternateUploadTimeFormat/report.cpp – Rev 351 → 352