Skip to content

P
proview
Commit 4af813fb authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Wb history to html conversion added

parent 84066f3b
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 42 deletions
wb/lib/wb/gtk/wb_wnav_gtk.cpp
View file @ 4af813fb
...@@ -298,21 +298,28 @@ void WNavGtk::logw_new( char *item, wlog_eCategory *categories, int show_item) ...@@ -298,21 +298,28 @@ void WNavGtk::logw_new( char *item, wlog_eCategory *categories, int show_item)
char title[300]; char title[300];
pwr_tStatus sts; pwr_tStatus sts;
for ( unsigned int i = 0; i < sizeof(categories_str)/sizeof(categories_str[0]); i++) { if ( categories) {
if ( categories[i] == wlog_eCategory_) { for ( unsigned int i = 0; i < sizeof(categories_str)/sizeof(categories_str[0]); i++) {
strcpy( categories_str[i], ""); if ( categories[i] == wlog_eCategory_) {
break; strcpy( categories_str[i], "");
break;
}
else
wb_log::category_to_string( categories[i], categories_str[i]);
} }
else
wb_log::category_to_string( categories[i], categories_str[i]);
} }
strcpy( title, "History "); strcpy( title, "History ");
strcat( title, item); if ( item)
strcat( title, item);
if ( title[strlen(title)-1] == '*') if ( title[strlen(title)-1] == '*')
title[strlen(title)-1] = 0; title[strlen(title)-1] = 0;
CoLogWGtk *logw = new CoLogWGtk( this, parent_wid, title, show_item, &sts); CoLogWGtk *logw = new CoLogWGtk( this, parent_wid, title, show_item, &sts);
logw->show( categories_str, item); if ( categories)
logw->show( categories_str, item);
else
logw->show( 0, item);
} }
void WNavGtk::sel_convert_cb( GtkWidget *w, GtkSelectionData *selection_data, void WNavGtk::sel_convert_cb( GtkWidget *w, GtkSelectionData *selection_data,
......
wb/lib/wb/src/wb_build.cpp
View file @ 4af813fb
...@@ -1115,6 +1115,12 @@ void wb_build::webhandler( pwr_tOid oid) ...@@ -1115,6 +1115,12 @@ void wb_build::webhandler( pwr_tOid oid)
MsgWindow::message( 'I', msg, msgw_ePop_No, oid); MsgWindow::message( 'I', msg, msgw_ePop_No, oid);
m_sts = PWRB__SUCCESS; m_sts = PWRB__SUCCESS;
} }
// Generate wb history html file
pwr_tCmd cmd;
strcpy( cmd, "generate history");
m_wnav->command( cmd);
} }
void wb_build::application( pwr_tOid oid) void wb_build::application( pwr_tOid oid)
......
wb/lib/wb/src/wb_log.cpp
View file @ 4af813fb
...@@ -45,7 +45,13 @@ ...@@ -45,7 +45,13 @@
#include "co_time.h" #include "co_time.h"
#include "wb_session.h" #include "wb_session.h"
#include "wb_object.h" #include "wb_object.h"
#include "wb_utl_api.h"
#include "wb_log.h" #include "wb_log.h"
#include "wb_wnav_msg.h"
typedef struct {
vector<string> v;
} log_sCbCtx;
void wb_log::log( wlog_eCategory category, const char *str, const char *comment, unsigned int opt) void wb_log::log( wlog_eCategory category, const char *str, const char *comment, unsigned int opt)
...@@ -167,3 +173,50 @@ void wb_log::string_to_category( char *str, wlog_eCategory *category) ...@@ -167,3 +173,50 @@ void wb_log::string_to_category( char *str, wlog_eCategory *category)
*category = wlog_eCategory_; *category = wlog_eCategory_;
} }
void wb_log::generate_html( char *filename, pwr_tStatus *sts)
{
log_sCbCtx cbctx;
pwr_tFileName fname;
FILE *fp;
char timstr[24];
char pname[80];
time_AtoAscii( 0, time_eFormat_DateAndTime, timstr, sizeof(timstr));
utl_get_projectname( pname);
CoLog::dget( 0, 0, gen_cb, &cbctx);
dcli_translate_filename( fname, filename);
fp = fopen( fname, "w");
if ( !fp) {
*sts = WNAV__NOFILE;
return;
}
fprintf( fp, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"\"http://www.w3.org/TR/REC-html40/loose.dtd>\n\
<!-- Generated by wb_log %s -->\n", timstr);
fprintf( fp, "<HTML>\n<HEAD>\n<META http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\">\n\
<TITLE>\nWorkbench History\n</TITLE>\n</HEAD>\n<BODY BGCOLOR=\"white\"><XMP>\n");
fprintf( fp, "Workbench History %s %s\n\n", pname, timstr);
fprintf( fp, "%-20s %-10s %-20s %-20s %s\n", "Date", "User", "Action", "Item", "Comment");
fprintf( fp, "----------------------------------------------------------------------------------------------\n");
for ( int i = cbctx.v.size() - 1; i >= 0; i--)
fprintf( fp, "%s\n", cbctx.v[i].c_str());
fprintf( fp, "</XMP>\n</BODY>\n</HTML>\n");
fclose( fp);
}
void wb_log::gen_cb( void *ctx, pwr_tTime time, char *s1, char *s2, char *s3, char *s4)
{
log_sCbCtx *cbctx = (log_sCbCtx *)ctx;
char timstr[21];
char str[200];
time_AtoAscii( &time, time_eFormat_DateAndTime, timstr, sizeof(timstr));
snprintf( str, sizeof(str), "%-20s %-10s %-20s %-20s %s", timstr, s2, s1, s3, s4 ? s4 : "");
string s(str);
cbctx->v.push_back(s);
}
wb/lib/wb/src/wb_log.h
View file @ 4af813fb
...@@ -77,6 +77,9 @@ class wb_log ...@@ -77,6 +77,9 @@ class wb_log
static void string_to_category( char *str, wlog_eCategory *category); static void string_to_category( char *str, wlog_eCategory *category);
static void push() { CoLog::dpush();} static void push() { CoLog::dpush();}
static void pull() { CoLog::dpull();} static void pull() { CoLog::dpull();}
static void generate_html( char *filename, pwr_tStatus *sts);
static void gen_cb( void *ctx, pwr_tTime time, char *s1, char *s2, char *s3, char *s4);
}; };
#endif #endif
......
wb/lib/wb/src/wb_wnav_command.cpp
View file @ 4af813fb
...@@ -41,10 +41,11 @@ ...@@ -41,10 +41,11 @@
#include "flow_std.h" #include "flow_std.h"
# include <stdio.h> #include <stdio.h>
# include <string.h> #include <string.h>
# include <stdlib.h> #include <stdlib.h>
# include <ctype.h> #include <ctype.h>
#include <string>
#include "pwr_class.h" #include "pwr_class.h"
#include "pwr_version.h" #include "pwr_version.h"
...@@ -430,7 +431,7 @@ dcli_tCmdTable wnav_command_table[] = { ...@@ -430,7 +431,7 @@ dcli_tCmdTable wnav_command_table[] = {
{ {
"GENERATE", "GENERATE",
&wnav_generate_func, &wnav_generate_func,
{ "dcli_arg1", ""} { "dcli_arg1", "/FILE", ""}
}, },
{ {
"CROSSREFERENCE", "CROSSREFERENCE",
...@@ -2574,8 +2575,7 @@ static int wnav_generate_func( void *client_data, ...@@ -2574,8 +2575,7 @@ static int wnav_generate_func( void *client_data,
return WNAV__SYNTAX; return WNAV__SYNTAX;
} }
if ( cdh_NoCaseStrncmp( arg1_str, "WEB", strlen( arg1_str)) == 0) if ( cdh_NoCaseStrncmp( arg1_str, "WEB", strlen( arg1_str)) == 0) {
{
int sts; int sts;
sts = wnav_wccm_get_ldhsession_cb( wnav, &wnav->ldhses); sts = wnav_wccm_get_ldhsession_cb( wnav, &wnav->ldhses);
...@@ -2588,6 +2588,27 @@ static int wnav_generate_func( void *client_data, ...@@ -2588,6 +2588,27 @@ static int wnav_generate_func( void *client_data,
return sts; return sts;
} }
} }
else if ( cdh_NoCaseStrncmp( arg1_str, "HISTORY", strlen( arg1_str)) == 0) {
pwr_tFileName filestr;
pwr_tStatus sts;
if ( EVEN( dcli_get_qualifier( "/FILE", filestr, sizeof(filestr)))) {
strcpy( filestr, "$pwrp_web/wb_history.html");
}
else {
wnav->message('E', "File is missing");
return WNAV__SYNTAX;
}
wb_log::generate_html( filestr, &sts);
if ( EVEN(sts))
wnav->message(' ', wnav_get_message(sts));
else {
char msg[200];
sprintf( msg, "History html file generated, %s", filestr);
wnav->message('I', msg);
}
}
else { else {
wnav->message('E', "Syntax error"); wnav->message('E', "Syntax error");
return WNAV__SYNTAX; return WNAV__SYNTAX;
...@@ -3747,41 +3768,40 @@ static int wnav_open_func( void *client_data, ...@@ -3747,41 +3768,40 @@ static int wnav_open_func( void *client_data,
{ {
char categoriesstr[80]; char categoriesstr[80];
pwr_tAName itemstr; pwr_tAName itemstr;
char *itemp = itemstr;
int showitem; int showitem;
char cvect[10][20]; char cvect[10][20];
wlog_eCategory categories[10]; wlog_eCategory categories[10];
wlog_eCategory *catp = categories;
int nr; int nr;
// Command is "OPEN HISTORY" // Command is "OPEN HISTORY"
if ( EVEN( dcli_get_qualifier( "/ITEM", itemstr, sizeof(itemstr)))) { if ( EVEN( dcli_get_qualifier( "/ITEM", itemstr, sizeof(itemstr))))
wnav->message('E', "Item is missing"); itemp = 0;
return WNAV__SYNTAX;
}
showitem = ODD( dcli_get_qualifier( "/SHOWITEM", 0, 0)); showitem = ODD( dcli_get_qualifier( "/SHOWITEM", 0, 0));
if ( EVEN( dcli_get_qualifier( "/CATEGORIES", categoriesstr, sizeof(categoriesstr)))) { if ( EVEN( dcli_get_qualifier( "/CATEGORIES", categoriesstr, sizeof(categoriesstr))))
wnav->message('E', "Categories are missing"); catp = 0;
return WNAV__SYNTAX;
}
nr = dcli_parse( categoriesstr, ",", "", (char *)cvect, if ( catp) {
sizeof( cvect) / sizeof( cvect[0]), sizeof( cvect[0]), 0); nr = dcli_parse( categoriesstr, ",", "", (char *)cvect,
if ( nr == 0) { sizeof( cvect) / sizeof( cvect[0]), sizeof( cvect[0]), 0);
wnav->message('E',"Syntax error"); if ( nr == 0) {
return WNAV__SYNTAX; wnav->message('E',"Syntax error");
} return WNAV__SYNTAX;
if ( nr > 9) }
nr = 9; if ( nr > 9)
nr = 9;
for ( int i = 0; i < nr; i++) {
wb_log::string_to_category( cvect[i], &categories[i]); for ( int i = 0; i < nr; i++) {
wb_log::string_to_category( cvect[i], &categories[i]);
}
categories[nr] = wlog_eCategory_;
} }
categories[nr] = wlog_eCategory_;
wnav->logw_new( itemstr, categories, showitem); wnav->logw_new( itemp, catp, showitem);
} }
else else
{ {
......
xtt/lib/cow/src/cow_log.cpp
View file @ 4af813fb
...@@ -132,12 +132,17 @@ void CoLog::get( char categories[][20], char *item, ...@@ -132,12 +132,17 @@ void CoLog::get( char categories[][20], char *item,
continue; continue;
int found = 0; int found = 0;
for ( int i = 0; strcmp( categories[i], "") != 0; i++) { if ( categories) {
if ( strcmp( categories[i], line_array[4]) == 0) { for ( int i = 0; strcmp( categories[i], "") != 0; i++) {
found = 1; if ( strcmp( categories[i], line_array[4]) == 0) {
break; found = 1;
break;
}
} }
} }
else
found = 1;
if ( !found) if ( !found)
continue; continue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7