diff --git a/ChangeLog b/ChangeLog index c8a42a4a..5469b986 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,7 @@ v0.37.7 09-Sep-2003 mbsetup: Added support for debug logging in menu 1.3 and removed the mbtask debug switch from menu 18. + Import and purge oneliners now log what is done. diff --git a/TODO b/TODO index c9525789..ce4454c8 100644 --- a/TODO +++ b/TODO @@ -18,6 +18,8 @@ everything: L: Finish big-endian machines porting (low priority because it seems that I'm the only one using Sun's and HP-PA systems next to Intel). + L: Consider XML format for databases. + L: Implement IPv6. L: Document error return codes in the manual. @@ -107,6 +109,9 @@ mbfido: N: Add statistic mail messages. mbcico: + N: Upgrade binkp protocol to 1.1, that may solve the next two + issues as well. + N: See if it is possible with binkp protocol to resume aborted transfers. Changes are under test now. Feedback needed! @@ -117,6 +122,8 @@ mbcico: mode and we did send a FREQ, a poll must be created after the session to pickup the result of the FREQ. + N: Support binkp Argus freqs. + mbfile: L: Add a check to see if the magic filenames are (still) valid. diff --git a/html/images/taskmgr.png b/html/images/taskmgr.png index df295abf..723e92c4 100644 Binary files a/html/images/taskmgr.png and b/html/images/taskmgr.png differ diff --git a/html/setup/global.html b/html/setup/global.html index 25981225..a8f14a31 100644 --- a/html/setup/global.html +++ b/html/setup/global.html @@ -12,7 +12,7 @@
-
Last update 24-Aug-2003
+
Last update 09-Sep-2003

MBSE BBS Setup - Global Setup

@@ -50,6 +50,7 @@ group them. 

 System logfile    The name of the main logfile
 Error logfile     The name of the errors logfile
+Debug logfile     The name of the debug logfile
 Mgr logfile       The name of the area-/filemgr logfile
 Default menu      The name of the default main menu
 Default language  The name of the default language
diff --git a/html/setup/taskmgr.html b/html/setup/taskmgr.html
index 6becf2a5..a35e878b 100644
--- a/html/setup/taskmgr.html
+++ b/html/setup/taskmgr.html
@@ -45,7 +45,6 @@ The behaviour is setup in this screen.
 Max Load  Max system load until processing is suspended.
 ZMH start Start of Zone Mail Hour in UTC time.
 ZMH end   End of Zone Mail Hour in UTC time.
-Debug     Enable debug logging.

Default are the original MBSE commands filled in, but you could also call diff --git a/mbcico/binkp.c b/mbcico/binkp.c index dfef81d5..ee2e5c9a 100644 --- a/mbcico/binkp.c +++ b/mbcico/binkp.c @@ -365,7 +365,7 @@ void binkp_send_control(int id,...) sz = 1; } - Syslog('B', "Binkp: send_ctl %s \"%s\"", bstate[id], buf); + Syslog('b', "Binkp: send_ctl %s \"%s\"", bstate[id], buf); frame.header = ((BINKP_CONTROL_BLOCK + sz) & 0xffff); frame.id = (char)id; frame.data = buf; @@ -741,7 +741,7 @@ SM_STATE(WaitOk) if (cmd) { if (rbuf[0] == MM_OK) { - Syslog('!', "Binkp: M_OK \"%s\"", printable(&rbuf[1], 0)); + Syslog('b', "Binkp: M_OK \"%s\"", printable(&rbuf[1], 0)); if (SendPass) Secure = TRUE; Syslog('+', "Binkp: %s%sprotected session", CRAMflag ? "MD5 ":"", Secure ? "":"un"); @@ -824,7 +824,6 @@ SM_STATE(WaitConn) strcpy(s, "OPT "); MD_toString(s+4, MD_challenge[0], MD_challenge+1); CRAMflag = TRUE; - Syslog('b', "Binkp: sending \"%s\"", s); binkp_send_control(MM_NUL, "%s", s); } b_banner(); @@ -1327,7 +1326,7 @@ int binkp_batch(file_list *to_send, int role) if (tmp == NULL) { TxState = TxDone; binkp_send_control(MM_EOB, ""); - Syslog('+', "Binkp: sending EOB"); + Syslog('b', "Binkp: sending EOB"); } break; diff --git a/mbsetup/m_ol.c b/mbsetup/m_ol.c index 1aeada2c..65bbe15d 100644 --- a/mbsetup/m_ol.c +++ b/mbsetup/m_ol.c @@ -446,12 +446,16 @@ void PurgeOneline(void) if (yes_no((char *)"Purge deleted records") == TRUE) { working(1, 0, 0); + recno = iCount = 0; fseek(pOneline, olhdr.hdrsize, 0); fp = fopen("tmp.1", "a"); fwrite(&olhdr, sizeof(olhdr), 1, fp); while (fread(&ol, olhdr.recsize, 1, pOneline) == 1) { + recno++; if (ol.Available) fwrite(&ol, olhdr.recsize, 1, fp); + else + iCount++; } fclose(fp); fclose(pOneline); @@ -460,6 +464,7 @@ void PurgeOneline(void) unlink("tmp.1"); working(0, 0, 0); free(sFileName); + Syslog('+', "Purged %d out of %d oneliners", iCount, recno); } } @@ -552,7 +557,8 @@ void ImportOneline(void) fclose(pOneline); working(0, 0, 0); - sprintf(temp, "Imported %d records, skipped %d long/empty lines", recno, skipped); + sprintf(temp, "Imported %d oneliners, skipped %d long/empty lines", recno, skipped); + Syslog('+', temp); mvprintw(21, 6, temp); readkey(21, 7 + strlen(temp), LIGHTGRAY, BLACK); free(temp);