From: mar <mar>
Date: Fri, 25 Aug 1989 14:00:54 +0000 (+0000)
Subject: fixed terminology of palladium stuff
X-Git-Tag: ASRSNAP1001~80
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/24decb9364b68645dce88b3c604ccb1ebf043d92

fixed terminology of palladium stuff
---

diff --git a/clients/moira/menus.c b/clients/moira/menus.c
index c8ccbf8c..39740149 100644
--- a/clients/moira/menus.c
+++ b/clients/moira/menus.c
@@ -603,35 +603,35 @@ Menu palladium_menu = {
   7,
   {
     { GetPalladium, NULLMENU, 2, {
-      {"get", "Get Palladium Server Information"},
+      {"get", "Get Palladium Server/Supervisor Information"},
       {"name", "Name of Printer: "}
     } },
     { AddPalladium, NULLMENU, 2, {
-      {"add", "Add New Palladium Server to Database"},
+      {"add", "Add New Palladium Server/Supervisor to Database"},
       {"name", "Supervisor/server name: "},
     } },
     { ChngPalladium, NULLMENU, 2, {
-      {"change", "Update Palladium Server Information"},
+      {"change", "Update Palladium Server/Supervisor Information"},
       {"name", "name: "},
     } },
     { DeletePalladium, NULLMENU, 2, {
-      {"delete", "Delete Palladium Server Entry"},
+      {"delete", "Delete Palladium Server/Supervisor Entry"},
       {"name", "Printer Name: "}
     } },
     { ShowPalladiumAlias, NULLMENU, 3, {
-      {"aliases", "Show Alternate Queue Names"},
-      {"newname", "Alternate name: "},
-      {"server", "Real supervisor or server name: "},
+      {"getprinter", "Show Logical Printers"},
+      {"newname", "Printer name: "},
+      {"server", "Supervisor or Server name: "},
     } },
     { AddPalladiumAlias, NULLMENU, 3, {
-      {"alias", "Add Alternate Queue Name"},
-      {"newname", "New name: "},
-      {"server", "Real supervisor or server name: "},
+      {"addprinter", "Add Logical Printer"},
+      {"newname", "New printer: "},
+      {"server", "Supervisor or Server name: "},
     } },
     { DeletePalladiumAlias, NULLMENU, 3, {
-      {"unalias", "Remove Alternate Queue Name"},
-      {"newname", "Alternate name: "},
-      {"server", "Real supervisor or server name: "},
+      {"delprinter", "Remove Logical Printer"},
+      {"newname", "Printer name: "},
+      {"server", "Supervisor or Server name: "},
     } },
   }
 };
diff --git a/clients/moira/printer.c b/clients/moira/printer.c
index b313cbf7..0454790b 100644
--- a/clients/moira/printer.c
+++ b/clients/moira/printer.c
@@ -304,7 +304,7 @@ char ** info;
 char * name;
 {
     info[PD_NAME] =		Strsave(name);
-    info[PD_IDENT] =		Strsave("1");
+    info[PD_IDENT] =		Strsave("10000");
     info[PD_HOST] =		Strsave(DEFAULT_MACHINE);
     info[PD_MODTIME] = info[PD_MODBY] = info[PD_MODWITH] = NULL;
 
@@ -327,13 +327,13 @@ char ** info;
     char temp_buf[BUFSIZ], *newname;
 
     Put_message("");
-    sprintf(temp_buf, "Palladium entry for %s.", 
+    sprintf(temp_buf, "Palladium Server/Supervisor entry for %s.", 
 	    info[PD_NAME]);
     Put_message(temp_buf);
     Put_message("");
 
-    GetValueFromUser("Printer Identification Number", &info[PD_IDENT]);
-    GetValueFromUser("Printer Server", &info[PD_HOST]);
+    GetValueFromUser("RPC Program Number", &info[PD_IDENT]);
+    GetValueFromUser("Print Server/Supervisor Host", &info[PD_HOST]);
     info[PD_HOST] = canonicalize_hostname(info[PD_HOST]);
     
     FreeAndClear(&info[PD_MODTIME], TRUE);
@@ -361,7 +361,7 @@ char ** info;
 	    return;
     }
 
-    sprintf(buf, "Name: %-24s Ident: %s  Host: %s",
+    sprintf(buf, "Name: %-24s Program #: %s  Host: %s",
 	    info[PD_NAME], info[PD_IDENT], info[PD_HOST]);
     Put_message(buf);
     sprintf(buf, MOD_FORMAT, info[PD_MODBY], info[PD_MODTIME],
@@ -455,7 +455,7 @@ char **argv;
 
     if ((status = do_sms_query("get_palladium", 1, &argv[1], NullFunc, NULL))
 	== 0) {
-	Put_message("A printer by that name already exists.");
+	Put_message("A server or supervisor by that name already exists.");
 	return(DM_NORMAL);
     } else if (status != SMS_NO_MATCH) {
 	com_err(program_name, status, " in AddPalladium");
@@ -478,7 +478,7 @@ int argc;
 char **argv;
 {
     struct qelem *elem = GetPalladiumInfo(argv[1]);
-    QueryLoop(elem, NullPrint, ChangePalladium, "Change the printer");
+    QueryLoop(elem, NullPrint, ChangePalladium, "Change the server/supervisor");
     FreeQueue(elem);
     return(DM_NORMAL);
 }
@@ -489,7 +489,7 @@ int argc;
 char **argv;
 {
     struct qelem *elem = GetPalladiumInfo(argv[1]);
-    QueryLoop(elem, PrintPalladiumInfo, RealDeletePalladium, "Delete Printer");
+    QueryLoop(elem, PrintPalladiumInfo, RealDeletePalladium, "Delete server/supervisor");
     FreeQueue(elem);
     return(DM_NORMAL);
 }
@@ -513,7 +513,7 @@ char **argv;
     Put_message("");
     while (elem != NULL) {
 	char **info = (char **) elem->q_data;
-	sprintf(buf, "Queue: %-16s Server: %s", info[0], info[2]);
+	sprintf(buf, "Printer: %-16s Server/Supervisor: %s", info[0], info[2]);
 	Put_message(buf);
 	elem = elem->q_forw;
     }