Changeset 428 for WizardsToolkit/trunk

Timestamp:

10/21/09 12:50:29 (4 weeks ago)

Author:

cristy

Message:

 

Files:

• WizardsToolkit/trunk/wizard/log.c (modified) (7 diffs)

WizardsToolkit/trunk/wizard/log.c

@@ -124 +124 @@
   WizardBooleanType
     append,
+    exempt,
     stealth;
 
@@ -149 +150 @@
   };
 
-static const char
-  *LogMap = (const char *)
-    "<?xml version=\"1.0\"?>"
-    "<logmap>"
-    "  <log events=\"None\" />"
-    "  <log output=\"console\" />"
-    "  <log filename=\"Wizard-%d.log\" />"
-    "  <log format=\"%t %r %u %v %d %c[%p]: %m/%f/%l/%d\n  %e\" />"
-    "</logmap>";
+typedef struct _LogMapInfo
+{
+  const LogEventType
+    event_mask;
+
+  const LogHandlerType
+    handler_mask;
+
+  const char
+    *filename,
+    *format;
+} LogMapInfo;
 
 /*
   Static declarations.
 */
+static const LogMapInfo
+  LogMap[] =
+  {
+    { NoEvents, ConsoleHandler, "Magick-%d.log",
+      "%t %r %u %v %d %c[%p]: %m/%f/%l/%d\n  %e" }
+  };
+
 static char
   log_name[MaxTextExtent] = "Wizard";
@@ -258 +269 @@
       p->file=(FILE *) NULL;
     }
-  if (p->filename != (char *) NULL)
-    p->filename=DestroyString(p->filename);
-  if (p->path != (char *) NULL)
-    p->path=DestroyString(p->path);
-  if (p->format != (char *) NULL)
-    p->format=DestroyString(p->format);
+  if (p->exempt == WizardFalse)
+    {
+      if (p->format != (char *) NULL)
+        p->format=DestroyString(p->format);
+      if (p->filename != (char *) NULL)
+        p->filename=DestroyString(p->filename);
+      if (p->path != (char *) NULL)
+        p->path=DestroyString(p->path);
+    }
   if (p->timer != (TimerInfo *) NULL)
     p->timer=DestroyTimerInfo(p->timer);
@@ -1375 +1389 @@
         log_info->path=ConstantString(filename);
         log_info->timer=AcquireTimerInfo();
+        log_info->exempt=WizardFalse;
         log_info->signature=WizardSignature;
         continue;
@@ -1507 +1522 @@
   ExceptionInfo *exception)
 {
-#if defined(WIZARDSTOOLKIT_EMBEDDABLE_SUPPORT)
-  return(LoadLogList(LogMap,"built-in",0,exception));
-#else
   const StringInfo
     *option;
@@ -1519 +1531 @@
     status;
 
+  register long
+    i;
+
+  /*
+    Load built-in log map.
+  */
   status=WizardFalse;
+  if (log_list == (LinkedListInfo *) NULL)
+    {
+      log_list=NewLinkedList(0);
+      if (log_list == (LinkedListInfo *) NULL)
+        {
+          ThrowFileException(exception,FileError,filename);
+          return(WizardFalse);
+        }
+    }
+  for (i=0; i < (long) (sizeof(LogMap)/sizeof(*LogMap)); i++)
+  {
+    LogInfo
+      *log_info;
+
+    register const LogMapInfo
+      *p;
+
+    p=LogMap+i;
+    log_info=(LogInfo *) AcquireWizardMemory(sizeof(*log_info));
+    if (log_info == (LogInfo *) NULL)
+      {
+        (void) ThrowWizardException(exception,GetWizardModule(),ResourceError,
+          "memory allocation failed `%s'",log_info->name);
+        continue;
+      }
+    (void) ResetWizardMemory(log_info,0,sizeof(*log_info));
+    log_info->path=(char *) "[built-in]";
+    log_info->timer=AcquireTimerInfo();
+    log_info->event_mask=p->event_mask;
+    log_info->handler_mask=p->handler_mask;
+    log_info->filename=(char *) p->filename;
+    log_info->format=(char *) p->format;
+    log_info->exempt=WizardTrue;
+    log_info->signature=WizardSignature;
+    status=AppendValueToLinkedList(log_list,log_info);
+    if (status == WizardFalse)
+      (void) ThrowWizardException(exception,GetWizardModule(),ResourceError,
+        "memory allocation failed `%s'",log_info->name);
+  }
+  /*
+    Load external log map.
+  */
   options=GetConfigureOptions(filename,exception);
   option=(const StringInfo *) GetNextValueInLinkedList(options);
@@ -1529 +1589 @@
   }
   options=DestroyConfigureOptions(options);
-  if ((log_list == (LinkedListInfo *) NULL) ||
-      (IsLinkedListEmpty(log_list) != WizardFalse))
-    status|=LoadLogList(LogMap,"built-in",0,exception);
   return(status != 0 ? WizardTrue : WizardFalse);
-#endif
 }