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

     /*
     **  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 );
     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_ev;
         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];
+            {
     **  Process each category
     */
     print( "\n");
     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;
         **  Only process the Non Equestrian teams in this pass
         */
         print( "\n");
         for( j = 1; ; j++ )
+        {
+            if (!config.team_class[j - 1].abr[0])
+                continue;
             /*
             **  Tail for previous entry
             */
             if ( j == config.nonequestrian_class)
                 continue;
     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( "\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" );
     print( "\n" );
     for( i = 1, count = 0; i <= config.num_class; i++ )
+    {
+        if (!config.team_class[i - 1].abr[0])
+            continue;
 #if 0
         /*
         **  Skip any non-equestrian class in the legend
         **  Don't want to tell the general user whats goes on, unless we actually
         **  creating the non-equestrian report.
                                       "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;
         if ( report_html == html ) print( "<A HREF=\"%s\">",url_encode(p_filename(filebase, config.team_class[i].abr ,"html")) );
     */
     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 )
             stats.team[j][ptr->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-original

(root)/Mara/trunk/report.cpp – Rev 295 → 317