WebSVN – svn1-original – Diff – /Mara/branches/alternateUploadTimeFormat/report.cpp

                 print( "  %-8s %4.4s %4.4s", "-- NE --", "NE","NE");
+            }
             else
+            {
                 print( "  %-8s", time_a( team_buf.leg[j].elapsed ));
-                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].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( "  %-8s %4.4s %4.4s", "-- NE --", "NE","NE");
+            }
             else
+            {
                 print( "  %-8s", time_a( team_buf.leg[j].elapsed ));
-                print( " %4.4s", px_place( j, team_buf.leg[j].lc_place,  false, false, ptr->flags ));
+                if ( config.num_legs != 1 ) print( " %4.4s", px_place( j, team_buf.leg[j].lc_place,  false, false, ptr->flags ));
                 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 );
+            }
+        }
                 print( "  %-8s %4.4s %4.4s", "-- NE --", "NE","NE");
+            }
             else
+            {
                 print( "  %-8s",                     time_a( team_buf.leg[j].elapsed ));
-                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].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 );
+            }
+        }
         **      - Category place - with reference to category file
         */
        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 );
-        print( "%-4.4s", px_place( 0, team_buf.leg[0].lc_place, false, false, ptr->flags ) );
+        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" );
+    }
                team_buf.teamclass == 0 ? "" : config.team_class[team_buf.teamclass - 1].abr );
         for( j = 1; j <= config.num_legs; j++ )
+        {
             print( "  %-8s", time_fa( team_buf.leg[j].elapsed, ptr->flags.disqualified ));
-            print( " %4.4s", px_place(j, team_buf.leg[j].l_place, false, true, ptr->flags ));
+            if ( config.num_legs != 1 ) print( " %4.4s", px_place(j, team_buf.leg[j].l_place, false, true, ptr->flags ));
             if ( config.num_legs != 1 ) print( " %4.4s", px_place(j, team_buf.leg[j].le_place, false, true, ptr->flags ));
             if ( config.num_legs == 1 ) print( " %-*s ",     MAX_TM_NAME, team_buf.name );
+        }
         if ( config.num_legs != 1 ) print( "  %-8s", time_fa( team_buf.leg[0].elapsed, ptr->flags.disqualified ));
                team_buf.teamclass == 0 ? "" : config.team_class[team_buf.teamclass - 1].abr );
         for( j = 1; j <= config.num_legs; j++ )
+        {
             print( "  %-8s", time_fa( team_buf.leg[j].elapsed, ptr->flags.disqualified ));
-            print( " %4.4s", px_place(j, team_buf.leg[j].lc_place,  false, true, ptr->flags ));
+            if ( config.num_legs != 1 ) print( " %4.4s", px_place(j, team_buf.leg[j].lc_place,  false, true, ptr->flags ));
             if ( config.num_legs != 1 ) print( " %4.4s", px_place(j, team_buf.leg[j].lec_place, false, true, ptr->flags ));
             if ( config.num_legs == 1 ) print( " %-*s ", MAX_TM_NAME, team_buf.name );
+        }
     **
     **  Line-1  Leg names
     */
     if (config.num_legs == 1 ) {
-        print( "%-*s %-*s", 4, "", 4, "" );
+        print( "%-*s", 4, "" );
         print( "  %-*s", 18, config.leg_name[0] );
         print( " %-*s", MAX_TM_NAME + 1, "" );
-        print( "  %-4s\n", ( teamclass < 0 ) ? "Cat" : "Fin" );
+        print( "%-4s\n", ( teamclass < 0 ) ? "Cat" : "Fin" );
     } else {
         print( "%-*s %-*s %-*s", 4, "", 4, "", 3, "" );
         for( j = 1; j <= config.num_legs; j++ )
+        {
 , final ? "Team" : "Plce",
 , "Cat" );
     if (config.num_legs == 1 ) {
-        print( "  %-8s %-4s", "Time", " LP" );
+        print( "  %-8s", "Time" );
         print( " %-*s", MAX_TM_NAME + 1, "Team Name" );
-        print( "  %-4s\n", "Plce" );
+        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" );
     /*
      * 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.                                       V        - Failed Vet Check.\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

Subversion Repositories svn1-original

(root)/Mara/branches/alternateUploadTimeFormat/report.cpp – Rev 359 → 362