[GME-commit] GMESRC/GME/Gme GMEEventLogger.h,1.6,1.7 GMEEventLogger.cpp,1.1,1.2

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/GME/Gme
In directory braindrain:/tmp/cvs-serv4039

Modified Files:
	GMEEventLogger.h GMEEventLogger.cpp 
Log Message:
changed timestamp to occur at begginning of line instead of end of line.

CVS User: brianw

Index: GMEEventLogger.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEEventLogger.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GMEEventLogger.h	1 Mar 2004 19:19:28 -0000	1.6
--- GMEEventLogger.h	5 Mar 2004 21:50:53 -0000	1.7
***************
*** 19,23 ****
  	while(pos) { \
  		CGuiObject *obj = guiobjlist.GetNext(pos); \
! 		gmelog = gmelog + obj->GetName()+" "; \
  	} \
  	gmelog = gmelog+"\r\n"; \
--- 19,23 ----
  	while(pos) { \
  		CGuiObject *obj = guiobjlist.GetNext(pos); \
! 		gmelog = gmelog + obj->GetName()+" "+obj->GetID()+", "; \
  	} \
  	gmelog = gmelog+"\r\n"; \
***************
*** 44,49 ****
  	POSITION pos = guifcolist.GetHeadPosition(); \
  	while(pos) { \
! 		CGuiFCO *fco = guifcolist.GetNext(pos); \
! 		gmelog = gmelog + fco->GetName()+" "; \
  	} \
  	gmelog = gmelog+"\r\n"; \
--- 44,49 ----
  	POSITION pos = guifcolist.GetHeadPosition(); \
  	while(pos) { \
! 		CGuiFco *fco = guifcolist.GetNext(pos); \
! 		gmelog = gmelog + fco->GetName()+" "+fco->GetID()+", "; \
  	} \
  	gmelog = gmelog+"\r\n"; \
***************
*** 84,88 ****
--- 84,91 ----
  
  				if (EventLog != NULL) //fopen failed
+ 				{	
  					initialized = TRUE;
+ 					newLine = TRUE;
+ 				}
  			}
  		}
***************
*** 109,117 ****
  		if(initialized)
  		{
! 			if(s.Find("\r\n"))
  			{
  				CTime time = CTime::GetCurrentTime();
! 				CString CurrentTime = time.Format(" %b %d, %H:%M:%S\r\n");
! 				s.Replace("\r\n",CurrentTime);
  			}
  			fprintf(EventLog,s);
--- 112,125 ----
  		if(initialized)
  		{
! 			if(newLine)
  			{
  				CTime time = CTime::GetCurrentTime();
! 				CString CurrentTime = time.Format("%b %d, %H:%M:%S ");
! 				fprintf(EventLog,CurrentTime);
! 				newLine = FALSE;
! 			}
! 			if(s.Find("\r\n")!=-1)
! 			{
! 				newLine = TRUE;
  			}
  			fprintf(EventLog,s);
***************
*** 160,163 ****
--- 168,172 ----
  	static FILE *EventLog;
  	static BOOL initialized;
+ 	static BOOL newLine;
  
  	

Index: GMEEventLogger.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEEventLogger.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GMEEventLogger.cpp	20 Nov 2003 20:17:57 -0000	1.1
--- GMEEventLogger.cpp	5 Mar 2004 21:50:53 -0000	1.2
***************
*** 16,22 ****
  CGMEEventLogger::~CGMEEventLogger()
  {
- 
  }
  
  BOOL CGMEEventLogger::initialized;
! FILE *CGMEEventLogger::EventLog;
\ No newline at end of file
--- 16,22 ----
  CGMEEventLogger::~CGMEEventLogger()
  {
  }
  
  BOOL CGMEEventLogger::initialized;
! FILE *CGMEEventLogger::EventLog;
! BOOL CGMEEventLogger::newLine;
\ No newline at end of file