isdnrep has new features:
-variable format string -can create html output (option -w1 or ln -s isdnrep isdnrep.cgi) idea and design from Dirk Staneker (dirk.staneker@student.uni-tuebingen.de) bugfix of processor.c from akool
This commit is contained in:
luethje
parent
27c7e8a183
commit
5114ac34f0
|
|
@ -2359,6 +2359,12 @@ Die Optionen von isdnrep haben im einzelnen folgende Funktion:
|
|||
Mit dieser Option werden nur rausgehende Gespraeche
|
||||
angezeigt.
|
||||
|
||||
-u "unknown caller"
|
||||
Zeigt am Ende alle Nummern an, die nicht in der
|
||||
callerid.conf oder ~/.isdn eingetragen sind.
|
||||
Diese Option laeuft nicht bei der Ausgabe im HTML-Format.
|
||||
|
||||
|
||||
Es wird nun auf stdout eine Abrechnung mit folgender Optik generiert:
|
||||
|
||||
$ isdnrep -v -t 6/1/96
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: processor.c,v 1.5 1997/03/31 20:50:59 akool Exp $
|
||||
/* $Id: processor.c,v 1.6 1997/04/20 22:52:14 luethje Exp $
|
||||
*
|
||||
* ISDN accounting for isdn4linux. (log-module)
|
||||
*
|
||||
|
|
@ -19,6 +19,13 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log: processor.c,v $
|
||||
* Revision 1.6 1997/04/20 22:52:14 luethje
|
||||
* isdnrep has new features:
|
||||
* -variable format string
|
||||
* -can create html output (option -w1 or ln -s isdnrep isdnrep.cgi)
|
||||
* idea and design from Dirk Staneker (dirk.staneker@student.uni-tuebingen.de)
|
||||
* bugfix of processor.c from akool
|
||||
*
|
||||
* Revision 1.5 1997/03/31 20:50:59 akool
|
||||
* fixed the postgres95 part of isdnlog
|
||||
*
|
||||
|
|
@ -1528,7 +1535,7 @@ static void decode(int chan, register char *p, int type, int version)
|
|||
|
||||
switch (c & 0xf0) {
|
||||
case 0x00 :
|
||||
case 0x80 : sprintf(ps, "CCITT standartisierte Codierung"); break;
|
||||
case 0x80 : sprintf(ps, "CCITT standardisierte Codierung"); break;
|
||||
case 0x20 :
|
||||
case 0xa0 : sprintf(ps, "Reserve"); break;
|
||||
case 0x40 :
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: isdnrep.h,v 1.5 1997/04/16 22:23:00 luethje Exp $
|
||||
/* $Id: isdnrep.h,v 1.6 1997/04/20 22:52:28 luethje Exp $
|
||||
*
|
||||
* ISDN accounting for isdn4linux.
|
||||
*
|
||||
|
|
@ -20,6 +20,13 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log: isdnrep.h,v $
|
||||
* Revision 1.6 1997/04/20 22:52:28 luethje
|
||||
* isdnrep has new features:
|
||||
* -variable format string
|
||||
* -can create html output (option -w1 or ln -s isdnrep isdnrep.cgi)
|
||||
* idea and design from Dirk Staneker (dirk.staneker@student.uni-tuebingen.de)
|
||||
* bugfix of processor.c from akool
|
||||
*
|
||||
* Revision 1.5 1997/04/16 22:23:00 luethje
|
||||
* some bugfixes, README completed
|
||||
*
|
||||
|
|
@ -51,6 +58,11 @@
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
#define H_PRINT_HTML 1
|
||||
#define H_PRINT_HEADER 2
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
#ifdef _CHEAP_C_
|
||||
#define _EXTERN
|
||||
#else
|
||||
|
|
@ -93,6 +105,8 @@ _EXTERN int phonenumberonly _SET_0;
|
|||
_EXTERN int compute _SET_0;
|
||||
_EXTERN int delentries _SET_0;
|
||||
_EXTERN int numbers _SET_0;
|
||||
_EXTERN int html _SET_0;
|
||||
_EXTERN int seeunknowns _SET_0;
|
||||
_EXTERN int header _SET_1;
|
||||
_EXTERN char timestring[256] _SET_EMPTY;
|
||||
_EXTERN char *lineformat _SET_NULL;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: rep_main.c,v 1.1 1997/04/06 21:03:38 luethje Exp $
|
||||
/* $Id: rep_main.c,v 1.2 1997/04/20 22:52:29 luethje Exp $
|
||||
*
|
||||
* ISDN accounting for isdn4linux. (Report-module)
|
||||
*
|
||||
|
|
@ -20,6 +20,13 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log: rep_main.c,v $
|
||||
* Revision 1.2 1997/04/20 22:52:29 luethje
|
||||
* isdnrep has new features:
|
||||
* -variable format string
|
||||
* -can create html output (option -w1 or ln -s isdnrep isdnrep.cgi)
|
||||
* idea and design from Dirk Staneker (dirk.staneker@student.uni-tuebingen.de)
|
||||
* bugfix of processor.c from akool
|
||||
*
|
||||
* Revision 1.1 1997/04/06 21:03:38 luethje
|
||||
* switch -f is working again
|
||||
* currency_factor is float again ;-)
|
||||
|
|
@ -138,8 +145,9 @@ int main(int argc, char *argv[], char *envp[])
|
|||
auto char fnbuff[512] = "";
|
||||
auto char usage[] = "%s: usage: %s [ -%s ]\n";
|
||||
auto char wrongdate[] = "unknown date: %s\n";
|
||||
auto char options[] = "ac:nviot:f:d:p:NVh";
|
||||
auto char options[] = "ac:nviot:f:d:p:NVhw:u";
|
||||
auto char *myname = basename(argv[0]);
|
||||
auto char *ptr;
|
||||
|
||||
|
||||
set_print_fct_for_tools(printf);
|
||||
|
|
@ -178,6 +186,9 @@ int main(int argc, char *argv[], char *envp[])
|
|||
timearea++;
|
||||
break;
|
||||
|
||||
case 'u' : seeunknowns++;
|
||||
break;
|
||||
|
||||
case 'v' : verbose++;
|
||||
break;
|
||||
|
||||
|
|
@ -188,6 +199,9 @@ int main(int argc, char *argv[], char *envp[])
|
|||
phonenumberonly++;
|
||||
break;
|
||||
|
||||
case 'w' : html = strtol(optarg, NIL, 0)?H_PRINT_HEADER:H_PRINT_HTML;
|
||||
break;
|
||||
|
||||
case 'N' : use_new_config = 0;
|
||||
break;
|
||||
|
||||
|
|
@ -198,6 +212,12 @@ int main(int argc, char *argv[], char *envp[])
|
|||
return(1);
|
||||
} /* switch */
|
||||
|
||||
if (!html && (ptr = strrchr(myname,'.')) != NULL && !strcasecmp(ptr+1,"cgi"))
|
||||
html = H_PRINT_HEADER;
|
||||
|
||||
if (html)
|
||||
seeunknowns = 0;
|
||||
|
||||
if (readconfig(myname) != 0)
|
||||
return 1;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: isdnconf.c,v 1.6 1997/04/17 20:09:57 luethje Exp $
|
||||
/* $Id: isdnconf.c,v 1.7 1997/04/20 22:52:32 luethje Exp $
|
||||
*
|
||||
* ISDN accounting for isdn4linux. (Utilities)
|
||||
*
|
||||
|
|
@ -20,6 +20,13 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log: isdnconf.c,v $
|
||||
* Revision 1.7 1997/04/20 22:52:32 luethje
|
||||
* isdnrep has new features:
|
||||
* -variable format string
|
||||
* -can create html output (option -w1 or ln -s isdnrep isdnrep.cgi)
|
||||
* idea and design from Dirk Staneker (dirk.staneker@student.uni-tuebingen.de)
|
||||
* bugfix of processor.c from akool
|
||||
*
|
||||
* Revision 1.6 1997/04/17 20:09:57 luethje
|
||||
* patch of Ingo Schneider
|
||||
*
|
||||
|
|
@ -764,9 +771,9 @@ void setDefaults()
|
|||
#if defined(ISDN_NL)
|
||||
currency = "NLG";
|
||||
#elif defined(ISDN_CH)
|
||||
currency = "FR.";
|
||||
currency = "SFR";
|
||||
#else
|
||||
currency = " DM";
|
||||
currency = "DM";
|
||||
#endif
|
||||
|
||||
} /* if */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: tools.h,v 1.10 1997/04/15 22:37:13 luethje Exp $
|
||||
/* $Id: tools.h,v 1.11 1997/04/20 22:52:36 luethje Exp $
|
||||
*
|
||||
* ISDN accounting for isdn4linux.
|
||||
*
|
||||
|
|
@ -20,6 +20,13 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log: tools.h,v $
|
||||
* Revision 1.11 1997/04/20 22:52:36 luethje
|
||||
* isdnrep has new features:
|
||||
* -variable format string
|
||||
* -can create html output (option -w1 or ln -s isdnrep isdnrep.cgi)
|
||||
* idea and design from Dirk Staneker (dirk.staneker@student.uni-tuebingen.de)
|
||||
* bugfix of processor.c from akool
|
||||
*
|
||||
* Revision 1.10 1997/04/15 22:37:13 luethje
|
||||
* allows the character `"' in the program argument like the shell.
|
||||
* some bugfixes.
|
||||
|
|
@ -509,6 +516,8 @@ typedef struct {
|
|||
double sonline;
|
||||
double bytes;
|
||||
double sbytes;
|
||||
double ibytes[2];
|
||||
double obytes[2];
|
||||
} KNOWN;
|
||||
|
||||
/****************************************************************************/
|
||||
|
|
|
|||
Loading…
Reference in New Issue