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

         **  Print the basics
         **      - Place within complete field
         **      - Team number - with HTML reference to team file
         **      - Class
         */
-        print( "%4.4s ", pr_place( team_buf.leg[0].l_place, ptr->flags.bad_times ) );
+        print( "%4.4s ", pr_place_ne( team_buf.leg[0].l_place, ptr->flags.bad_times, ptr->flags.non_equestrian ) );
         if ( report_html ) print( "<A HREF=\"%s#Team_%04d\">", p_filename(filebase, "name" ,"html"), team_buf.numb );
         print( "%4d",  team_buf.numb );
         if ( report_html ) print( "</A>" );
         print( " %-*s", 3, team_buf.class == 0 ? "" : config.team_class[team_buf.class - 1].abr );
+            }
             else
+            {
                 print( "  %-8s %4.4s %4.4s",
                     time_a( team_buf.leg[j].elapsed ),
-                    pr_place( team_buf.leg[j].l_place, ptr->flags.bad_times ),
+                    pr_place_ne( team_buf.leg[j].l_place, ptr->flags.bad_times, ptr->flags.non_equestrian ),
-                    pr_place( team_buf.leg[j].le_place,ptr->flags.bad_times )
+                    pr_place_ne( team_buf.leg[j].le_place,ptr->flags.bad_times, ptr->flags.non_equestrian )
                   );
+            }
+        }
        /*
         **      - Total time
         **      - Category place - with reference to category file
         */
         print( "  %-8s ",  time_a( team_buf.leg[0].elapsed ) );
         if ( report_html ) print( "<A HREF=\"%s#Team_%04d\">",p_filename(filebase, config.team_class[team_buf.class - 1].abr ,"html"), team_buf.numb );
-        print( "%-4.4s", pr_place( team_buf.leg[0].lc_place, ptr->flags.bad_times ) );
+        print( "%-4.4s", pr_place_ne( team_buf.leg[0].lc_place, ptr->flags.bad_times, ptr->flags.non_equestrian ) );
         if ( report_html ) print( "</A>" );
         print( "\n" );
+    }
+}
 /*========================================================================
+ *
+ *  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
+ *
+ *  Returns:
+ *      This function returns a pointer to the character string for the
+ *      number or a pointer to a bad_times string.
+ *
+ *========================================================================*/
+char *pr_place_ne( int num, int disq, int ne )
+{
+    static char store[2][5];                     /* 2 stores for 4 digit numbers */
+    static int  i = 0;                           /* Current index into store */
+    static char *dis = "U";
+    static char *nes = "NE";
+    if ( ne )
+        return ( nes );
+    if( disq )
+        return ( dis );
+    i++;
+    if( i >= 2 )
+        i = 0;                                   /* Select next entry */
+    sprintf( store[i], "%4d", num );
+    return ( store[i] );
+}
+/*========================================================================
+ *
  *  Check data for bad times
+ *
  *  Purpose:
  *      This function is called to Check data for bad times
  *      Scan the sort data structure and locate entries that have incorrect
     **
     **  If one of the teams has bad_times, then that team is placed
     **  lower in the sorting order. If both teams have bad times
     **  then sort on team number. ie: Unplaced teams are sorted on
     **  team number
+    **
+    **  If not sorting within a class (ie Overall), then Non_Equestrian
+    **  is better than a bad time. Places NE before disqualified
+    **
+    **
+    **  Note: NE also have bad_times set
     */
     if( a->flags.bad_times || b->flags.bad_times )  /* Valid data has precedence */
+    {
+        if( sort_mode == S_LE || sort_mode == S_L ) /* Sort NOT within a class */
+        {
+            if( a->flags.non_equestrian || b->flags.non_equestrian )
+            {
+                if( a->flags.non_equestrian && b->flags.non_equestrian )
+                {
+                    /*
+                    **  Can't do much better in the overall report
+                    **  Need different information to sort NE entries
+                    */
+                    return ( a->team - b->team );
+                }
+                else
+                {
+                    /* Good times better than NE */
+                    return ( a->flags.bad_times ? 1 : -1 );
+                }
+            }
+        }
         if( a->flags.bad_times && b->flags.bad_times )
             return ( a->team - b->team );
         else
             return ( a->flags.bad_times ? 1 : -1 );
+    }
-    /*
-    **  Not sorting within a class ie: Overall
-    **  Non-Equestrian is at the end, so that it doesn't get counted in the
-    **  finishing order
-    */
-    if( sort_mode == S_LE || sort_mode == S_L )     /* Sort NOT within a class */
-    {
-        if( a->flags.non_equestrian || b->flags.non_equestrian )
-        {
-            if( a->flags.non_equestrian && b->flags.non_equestrian )
-                return ( a->team - b->team );
-            else
-                return ( a->flags.non_equestrian ? 1 : -1 );
-        }
-    }
     /*
     **  Before we sort on times we must determine which time to
     **  use. Finish time, Leg end times, Leg Elapsed times.
     */

Subversion Repositories svn1-original

(root)/Mara/branches/2008Work1/report.c – Rev 46 → 47