Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implemented 'ID display'

Browse Source 
SVN revision: 821
This commit is contained in:
Stefan Ritt 2004-03-09 09:56:04 +00:00
parent 51c6395adf
commit 6cad1e9155
2 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/config.html
View File

@ -1018,6 +1018,19 @@ a logbook does not contain an <code><b>author</b></code> attribute, another stri
be chosen. be chosen.
<p> <p>
<LI><b><code>ID display = &lt;string&gt;</b></code>
<br>
This option determines the display of the entry ID. In some applications, the entry ID
can be used as a tag, containing more than just the ID number. For example
<p>
<ul><pre>
ID display = TAG-$message id
</pre></ul>
would display the entry ID as "TAG-1","TAG-2", ... and so on.
<p>
</UL> </UL>
<a name="conditional"><hr> <a name="conditional"><hr>

41
src/elogd.c
View File

@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG Contents: Web server program for Electronic Logbook ELOG
$Log$ $Log$
Revision 1.288 2004/03/09 09:56:04 midas
Implemented 'ID display'
Revision 1.287 2004/03/08 21:24:43 midas Revision 1.287 2004/03/08 21:24:43 midas
Tried to reduce required stack size in threaded display Tried to reduce required stack size in threaded display
@ -10429,8 +10432,23 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode,
rsprintf("<img src=\"stop.gif\" alt=\"%s\">&nbsp;", str); rsprintf("<img src=\"stop.gif\" alt=\"%s\">&nbsp;", str);
} }
rsprintf("<a href=\"%s\">&nbsp;&nbsp;%d&nbsp;&nbsp;</a></td>\n", ref, if (getcfg(lbs->name, "ID display", display)) {
message_id); j = build_subst_list(lbs, (char (*)[NAME_LENGTH])slist,
(char (*)[NAME_LENGTH])svalue, attrib, TRUE);
sprintf(str, "%d", message_id);
add_subst_list((char (*)[NAME_LENGTH])slist, (char (*)[NAME_LENGTH])svalue,
"message id", str, &j);
add_subst_time(lbs, (char (*)[NAME_LENGTH])slist, (char (*)[NAME_LENGTH])svalue,
"entry time", date, &j);
strsubst(display, (char (*)[NAME_LENGTH])slist,
(char (*)[NAME_LENGTH])svalue, j);
} else
sprintf(display, "%d", message_id);
rsprintf("<a href=\"%s\">&nbsp;&nbsp;%s&nbsp;&nbsp;</a></td>\n", ref,
display);
} }
} }
@ -13741,7 +13759,7 @@ void show_elog_message(LOGBOOK * lbs, char *dec_path, char *command)
int message_id, orig_message_id, format_flags[MAX_N_ATTR]; int message_id, orig_message_id, format_flags[MAX_N_ATTR];
char str[1000], ref[256], file_name[256], attrib[MAX_N_ATTR][NAME_LENGTH]; char str[1000], ref[256], file_name[256], attrib[MAX_N_ATTR][NAME_LENGTH];
char date[80], text[TEXT_SIZE], menu_str[1000], cmd[256], cmd_enc[256], char date[80], text[TEXT_SIZE], menu_str[1000], cmd[256], cmd_enc[256],
orig_tag[80], reply_tag[MAX_REPLY_TO * 10], orig_tag[80], reply_tag[MAX_REPLY_TO * 10], display[256],
attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], locked_by[256], attachment[MAX_ATTACHMENTS][MAX_PATH_LENGTH], encoding[80], locked_by[256],
att[256], lattr[256], mid[80]; att[256], lattr[256], mid[80];
char menu_item[MAX_N_LIST][NAME_LENGTH], format[80], admin_user[80], char menu_item[MAX_N_LIST][NAME_LENGTH], format[80], admin_user[80],
@ -14141,7 +14159,22 @@ void show_elog_message(LOGBOOK * lbs, char *dec_path, char *command)
/* browsing flag to distinguish "/../<attr>=<value>" from browsing */ /* browsing flag to distinguish "/../<attr>=<value>" from browsing */
rsprintf("<input type=hidden name=browsing value=1>\n"); rsprintf("<input type=hidden name=browsing value=1>\n");
rsprintf("%s:&nbsp;<b>%d</b>\n", loc("Message ID"), message_id); if (getcfg(lbs->name, "ID display", display)) {
j = build_subst_list(lbs, (char (*)[NAME_LENGTH])slist,
(char (*)[NAME_LENGTH])svalue, attrib, TRUE);
sprintf(str, "%d", message_id);
add_subst_list((char (*)[NAME_LENGTH])slist, (char (*)[NAME_LENGTH])svalue,
"message id", str, &j);
add_subst_time(lbs, (char (*)[NAME_LENGTH])slist, (char (*)[NAME_LENGTH])svalue,
"entry time", date, &j);
strsubst(display, (char (*)[NAME_LENGTH])slist,
(char (*)[NAME_LENGTH])svalue, j);
} else
sprintf(display, "%d", message_id);
rsprintf("%s:&nbsp;<b>%s</b>\n", loc("Message ID"), display);
/*---- display date ----*/ /*---- display date ----*/