*** handler.c~ 2006-03-10 09:42:18.000000000 +0000 --- handler.c 2006-07-17 17:22:25.000000000 +0100 *************** *** 103,108 **** --- 103,113 ---- /* Result code strings */ #define RESULT_MISSING "" #define RESULT_PASS "PASS" + /* AJ --- additional result codes for passes */ + #define RESULT_NOTINUSE "NOTINUSE" + #define RESULT_UNTESTED "UNTESTED" + #define RESULT_UNSUPPORTED "UNSUPPORTED" + #define RESULT_WARNING "WARNING" /* Allocation increment for string vectors */ #define ALLOC_INCREMENT 20 *************** *** 2003,2009 **** /* If this is a pass and we're not including * passes, skip to next TP. */ ! if (strcmp(tp->result, RESULT_PASS) == 0 && !(hd.inc & INC_PASSES)) { continue; --- 2008,2020 ---- /* If this is a pass and we're not including * passes, skip to next TP. */ ! /* AJ -- also skip over some common TET result codes that are not fails */ ! if ((strcmp(tp->result, RESULT_PASS) == 0 ! || strcmp(tp->result, RESULT_NOTINUSE) == 0 ! || strcmp(tp->result, RESULT_UNTESTED) == 0 ! || strcmp(tp->result, RESULT_UNSUPPORTED) == 0 ! || strcmp(tp->result, RESULT_WARNING) == 0 ! ) && !(hd.inc & INC_PASSES)) { continue; *** html.c~ 2006-03-10 09:42:18.000000000 +0000 --- html.c 2006-07-17 17:22:28.000000000 +0100 *************** *** 65,71 **** #define COLOR_TITLE "#ccccff" #define COLOR_NEUTRAL "#cccccc" #define COLOR_PASS "#33cc33" ! #define COLOR_FAIL "#ff5555" /* --- 65,74 ---- #define COLOR_TITLE "#ccccff" #define COLOR_NEUTRAL "#cccccc" #define COLOR_PASS "#33cc33" ! #define COLOR_EQUATEPASS "#99ff99" ! #define COLOR_FAIL "#ff0000" ! #define COLOR_WARN "#ffff00" ! #define COLOR_FIP "#ff9900" /* *************** *** 502,512 **** --- 505,533 ---- fprintf(ftr->fp, " bgcolor=\"%s\" class=\"%s\"", COLOR_PASS, cls); } + else if ( strcmp(cls, "NOTINUSE") == 0 + || strcmp(cls, "UNSUPPORTED") == 0 + || strcmp(cls, "UNTESTED") == 0 ) + { + fprintf(ftr->fp, " bgcolor=\"%s\" class=\"%s\"", + COLOR_EQUATEPASS, cls); + } + /* AJ -- color code the results using shades of green, orange and red */ else if (strcmp(cls, GRW_CLASS_NEUTRAL) == 0) { fprintf(ftr->fp, " bgcolor=\"%s\" class=\"%s\"", COLOR_NEUTRAL, cls); } + else if (strcmp(cls, "WARNING") == 0) + { + fprintf(ftr->fp, " bgcolor=\"%s\" class=\"%s\"", + COLOR_WARN, cls); + } + else if (strcmp(cls, "FIP") == 0) + { + fprintf(ftr->fp, " bgcolor=\"%s\" class=\"%s\"", + COLOR_FIP, cls); + } else { fprintf(ftr->fp, " bgcolor=\"%s\" class=\"%s\"", *************** *** 581,587 **** startulist(grw_formatter_t *ftr) { /* Print tag for start of unordered list */ ! fputs("\n", ftr->fp);*/ ! fputs("

\n", ftr->fp); } *************** *** 614,620 **** printlistentry(grw_formatter_t *ftr, unsigned long options, char *text) { ! printhtml(ftr, options, "
  • ", text, "\n"); } --- 637,644 ---- printlistentry(grw_formatter_t *ftr, unsigned long options, char *text) { ! /*printhtml(ftr, options, "
  • ", text, "\n");*/ ! printhtml(ftr, options, "", text, "
    \n"); }