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

         **      - Place within the class
         **      - Team number - with HTML reference to team file
         **      - Class
         */
-        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 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 );
         for( j = 1; j <= config.num_legs; j++ )
+        {
             /*
             **  Ensure that non-equestrian leg data is not displayed
             */
-            if ( j == config.equestrian_leg && ptr->class == config.nonequestrian_class)
+            if ( j == config.equestrian_leg && (ptr->class == config.nonequestrian_class || ptr->flags.non_equestrian) )
+            {
                 print( "  %-8s %4.4s %4.4s", "-- NE --", "-","-");
+            }
             else
+            {
                 print( "  %-8s %4.4s %4.4s", time_a( team_buf.leg[j].elapsed ),
-                       pr_place( team_buf.leg[j].lc_place, ptr->flags.bad_times ),
+                       pr_place_ne( team_buf.leg[j].lc_place,  ptr->flags.bad_times, ptr->flags.non_equestrian ),
-                       pr_place( team_buf.leg[j].lec_place, ptr->flags.bad_times ) );
+                       pr_place_ne( team_buf.leg[j].lec_place, ptr->flags.bad_times, ptr->flags.non_equestrian ) );
+            }
+        }
         /*
         **  Print the trailer
         */
         /* print( "  %-8s ", time_a( team_buf.leg[0].elapsed ) ); */
         print( "  %-8s ", time_a( ptr->lege[0] ) );
         if ( report_html ) print( "<A HREF=\"%s#Team_%04d\">", p_filename(filebase, "finish" ,"html"), team_buf.numb );
-        print( "%4.4s", pr_place( team_buf.leg[0].l_place, ptr->flags.bad_times | (ptr->class == config.nonequestrian_class) ) );
+        print( "%4.4s", pr_place_ne( team_buf.leg[0].l_place, ptr->flags.bad_times | (ptr->class == config.nonequestrian_class), ptr->flags.non_equestrian ) );
         if ( report_html ) print( "</A>" );
         print( "\n" );
+    }
     for( i = 0; i <= config.num_legs; i++ )
+    {
         /*
         **  Sort on leg elapsed time
-        **  The save the teams elapsed place in each leg
+        **  Then save the teams elapsed place in each leg
         */
         sort_team_data( i, S_L );
-        for( j = 1, ptr = sort_data; j <= sort_num; j++, ptr++ )
+        for( j = 1, k = 1, ptr = sort_data; j <= sort_num; ptr++, j++ )
+        {
+            if ( ptr->class == config.nonequestrian_class )
+                continue;
-            sort_aux[ptr->team].l_place[i] = j;
+            sort_aux[ptr->team].l_place[i] = k++;
             sort_aux[ptr->team].team = ptr->team;
+        }
         /*
         **  Sort on leg end time
         **  Then save the teams place at the end of each leg
         */
         sort_team_data( i, S_LE );
-        for( j = 1, ptr = sort_data; j <= sort_num; j++, ptr++ )
+        for( j = 1, k = 1, ptr = sort_data; j <= sort_num; ptr++, j++ )
+        {
+            if ( ptr->class == config.nonequestrian_class )
+                continue;
-            sort_aux[ptr->team].le_place[i] = j;
+            sort_aux[ptr->team].le_place[i] = k++;
+        }
         /*
         **  Sort on elapsed time per class
         **  The save the teams elapsed place in each leg per class
         */
     */
     if( sort_mode == S_LEC || sort_mode == S_LC )   /* Sort within a class */
         if( a->class != b->class )
             return ( a->class - b->class );
+#if 1
+    /*
+    **  Always put the nonequestrian_class at the end
+    **  Simplifies the creation of ordered lists as these
+    **  Entries are not present in the main body
+    */
+    if ( a->class == config.nonequestrian_class ||  b->class == config.nonequestrian_class )
+    {
+        if ( a->class == config.nonequestrian_class &&  b->class == config.nonequestrian_class )
+        {
+        }
+        else
+        {
+            return ( a->class == config.nonequestrian_class ? 1 : -1 );
+        }
+    }
+#endif
     /*
     **  Now we need to examine the times as we have sorted
     **  on every thing else.
     **
     **  If one of the teams has bad_times, then that team is placed
     **  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( sort_mode == S_LE || sort_mode == S_L ) /* Sort NOT within a class */
+            if( sort_mode == S_LE || sort_mode == S_L || 1 ) /* Sort NOT within a class */
+            {
                 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
+                    {
                         /* Good times better than NE */
                         return ( a->flags.non_equestrian ? -1 : 1 );
                return ( a->team - b->team );
+        }
         else
             return ( a->flags.bad_times ? 1 : -1 );
+    }
+#else
+    if( a->flags.bad_times || b->flags.bad_times )  /* Valid data has precedence */
+    {
+        if( a->flags.bad_times && b->flags.bad_times )
+            return ( a->team - b->team );
+        else
+            return ( a->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 );
+        }
+    }
+#endif
     /*
     **  Before we sort on times we must determine which time to
     **  use. Finish time, Leg end times, Leg Elapsed times.
     */
                 **  If non-equestrian support is enabled then
                 **  duplicate and modify data for the non-equestrian teams
                 **      - Change the class
                 **      - Modify the leg time
                 */
+#if 1
                 if ( config.nonequestrian_class && team_buf.flags.non_equestrian )
+                {
                     ptr->team = team;
                     ptr->lege[0] = 0;
                     ptr++;
                     sort_num++;
+                }
+#endif
+            }
+        }
+    }
     return ( TRUE );
+}

Subversion Repositories svn1

(root)/Mara/branches/2008Work1/report.c – Rev 48 → 49