Changeset 85d1795 for zephyr.c

Timestamp:

Apr 16, 2007, 9:54:27 PM (17 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

d754b0a

Parents:

1d7e094

Message:

Change special casing rules to refer to default format strings instead
of senders.

File:

• zephyr.c (modified) (5 diffs)

zephyr.c

@@ -381 +381 @@
  * caller must free the return
  */
-char *owl_zephyr_get_message(ZNotice_t *n)
+char *owl_zephyr_get_message(ZNotice_t *n, owl_message *m)
 {
   /* don't let ping messages have a body */
@@ -388 +388 @@
   }
 
-  /* deal with MIT Athena OLC messages */
-  if (!strcasecmp(n->z_sender, "olc.matisse@ATHENA.MIT.EDU")) {
-    return(owl_zephyr_get_field(n, 1));
-  }
   /* deal with MIT NOC messages */
-  else if (!strcasecmp(n->z_sender, "rcmd.achilles@ATHENA.MIT.EDU")) {
-    /* $opcode service on $instance $3.\n$4 */
-    char *msg, *opcode, *instance, *field3, *field4;
-
-    opcode = n->z_opcode;
-    instance = n->z_class_inst;
+  if (!strcasecmp(n->z_default_format, "@center(@bold(NOC Message))\n\n@bold(Sender:) $1 <$sender>\n@bold(Time:  ) $time\n\n@italic($opcode service on $instance $3.) $4\n")) {
+    char *msg, *field3, *field4;
+
     field3 = owl_zephyr_get_field(n, 3);
     field4 = owl_zephyr_get_field(n, 4);
 
-    msg = owl_sprintf("%s service on %s %s\n%s", opcode, instance, field3, field4);
+    msg = owl_sprintf("%s service on %s %s\n%s", n->z_opcode, n->z_class_inst, field3, field4);
     owl_free(field3);
     owl_free(field4);
@@ -410 +403 @@
   }
   /* deal with MIT Discuss messages */
-  else if (!strcasecmp(n->z_sender, "daemon@ATHENA.MIT.EDU") &&
-           !strcasecmp(n->z_class, "DISCUSS")) {
-    /*New transaction [$1] entered in $2
-      From: $3 ($5)
-      Subject: $4 */
-    
+  else if (!strcasecmp(n->z_default_format, "New transaction [$1] entered in $2\nFrom: $3 ($5)\nSubject: $4")) {
     char *msg, *field1, *field2, *field3, *field4, *field5;
     
@@ -434 +422 @@
     }
   }
-
-  return(owl_zephyr_get_field(n, 2));
+  /* deal with MIT Moira messages */
+  else if (!strcasecmp(n->z_default_format, "MOIRA $instance on $fromhost:\n $message\n")) {
+    char *msg, *field1;
+    
+    field1 = owl_zephyr_get_field(n, 1);
+    
+    msg = owl_sprintf("MOIRA %s on %s: %s", n->z_class_inst, owl_message_get_hostname(m), field1);
+    owl_free(field1);
+    if (msg) {
+      return msg;
+    }
+  }
+
+  if (owl_zephyr_get_num_fields(n) == 1) {
+    return(owl_zephyr_get_field(n, 1));
+  }
+  else {
+    return(owl_zephyr_get_field(n, 2));
+  }
 }
 #endif
@@ -450 +455 @@
   }
 
-  /* No zsig for OLC messages */
-  if (!strcasecmp(n->z_sender, "olc.matisse@ATHENA.MIT.EDU")) {
+  /* If there's only one field, no zsig */
+  if (owl_zephyr_get_num_fields(n) == 1) {
+    *k=0;
     return("");
   }