From 918a8257a2f64e0965abc4c48eea774949c19883 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 12 Feb 1996 10:04:51 +0000
Subject: [PATCH] The gateway doesn't try to reconnect if it is already known
 that it will fail (connect_fail flag introduced).

---
 kernel/default.res |    4 ++--
 kernel/kernel.h    |    7 ++++++-
 kernel/main.c      |    7 ++++++-
 kernel/urp.c       |   16 ++++++++++++----
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/kernel/default.res b/kernel/default.res
index de4759a..8dcd8a6 100644
--- a/kernel/default.res
+++ b/kernel/default.res
@@ -1,5 +1,5 @@
 # Email gateway - general kernel resources
-# $Id: default.res,v 1.30 1996/02/07 16:48:10 adam Exp $
+# $Id: default.res,v 1.31 1996/02/12 10:04:51 adam Exp $
 #
 # Important directories, programs, etc.
 gw.reply.mta: /usr/lib/sendmail
@@ -35,7 +35,7 @@ gw.lang.uk: lang.uk.res
 gw.msg.subject: Your Z39.50 Query...
 gw.msg.greeting: Europagate Email-Z39.50 gateway
 gw.msg.cont: Session continued...
-gw.msg.from: Email-gateway
+gw.msg.from: Email-Z39.50 gateway
 gw.err.nullbody: Empty body
 ccl.command.find: find f
 ccl.command.show: show s
diff --git a/kernel/kernel.h b/kernel/kernel.h
index f15082c..704bb66 100644
--- a/kernel/kernel.h
+++ b/kernel/kernel.h
@@ -45,7 +45,11 @@
  * Europagate, 1995
  *
  * $Log: kernel.h,v $
- * Revision 1.20  1995/07/28 10:51:08  adam
+ * Revision 1.21  1996/02/12 10:04:52  adam
+ * The gateway doesn't try to reconnect if it is already known that
+ * it will fail (connect_fail flag introduced).
+ *
+ * Revision 1.20  1995/07/28  10:51:08  adam
  * Bug fix: account from previous session had effect when new target command
  * was executed.
  *
@@ -148,6 +152,7 @@ struct gw_kernel_info {
     char account[128];
     int  account_in_session;
     int  port;
+    int  connect_failed;
     const char *lang;
     const char *override_portno;
     const char *override_hostname;
diff --git a/kernel/main.c b/kernel/main.c
index 7468074..f1f1694 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -45,7 +45,11 @@
  * Europagate, 1995
  *
  * $Log: main.c,v $
- * Revision 1.29  1995/07/28 10:51:08  adam
+ * Revision 1.30  1996/02/12 10:04:54  adam
+ * The gateway doesn't try to reconnect if it is already known that
+ * it will fail (connect_fail flag introduced).
+ *
+ * Revision 1.29  1995/07/28  10:51:08  adam
  * Bug fix: account from previous session had effect when new target command
  * was executed.
  *
@@ -285,6 +289,7 @@ int main (int argc, char **argv)
     info.database = NULL;
     info.setno = -1;
     info.userid = -1;
+    info.connect_failed = 0;
 #if USE_FML
     info.fml = NULL;
 #endif
diff --git a/kernel/urp.c b/kernel/urp.c
index ff59ae0..ef3378c 100644
--- a/kernel/urp.c
+++ b/kernel/urp.c
@@ -45,7 +45,11 @@
  * Europagate, 1995
  *
  * $Log: urp.c,v $
- * Revision 1.47  1996/01/18 13:54:48  adam
+ * Revision 1.48  1996/02/12 10:04:57  adam
+ * The gateway doesn't try to reconnect if it is already known that
+ * it will fail (connect_fail flag introduced).
+ *
+ * Revision 1.47  1996/01/18  13:54:48  adam
  * Help <command> gives help information about individual commands.
  * Status without arguments gives list of available predefined targets.
  *
@@ -250,6 +254,7 @@ int reopen_target (void)
                  gw_res_get (info.kernel_res, "gw.err.connect",
                              "Cannot connect to target"),
                  info.hostname, info.port);
+        info.connect_failed = 1;
         return -1;
     }
     v = gw_res_get (info.kernel_res, "gw.description", NULL);
@@ -619,6 +624,7 @@ static int exec_target (struct ccl_token *list)
         *info.account = '\0';
     info.account_in_session = 0;
     read_kernel_res ();
+    info.connect_failed = 0;
     return reopen_target ();
 }
 
@@ -1082,10 +1088,11 @@ static int exec_command (const char *str, int *stop_flag)
     {
         if (no == 1 || no == 2 || no == 3) /* find/show/base? */
         {
-            if (!info.zass)                /* open if not already opened */
+            if (!info.connect_failed && !info.zass) 
+                            /* open if not already opened */
                 reopen_target ();
             fprintf (reply_fd, "\n> %s\n", str);
-            if (!info.zass)                /* fail? */
+            if (!info.zass)      /* fail? */
             {
                 fprintf (reply_fd, "\n%s\n",
                          gw_res_get (info.kernel_res, "gw.err.no.target",
@@ -1183,7 +1190,8 @@ int urp_start (int continuation, struct str_queue *queue)
         }
         tty_init (reply_fd, 0, 0);
         fprintf (reply_fd, "From: %s\n",
-                 gw_res_get (info.kernel_res, "gw.msg.from","Email-gateway"));
+                 gw_res_get (info.kernel_res, "gw.msg.from",
+                             "Email-Z39.50 gateway"));
         fprintf (reply_fd, "Subject: ");
         if (*subject_str)
             fprintf (reply_fd, "Z39.50 Re: %s", subject_str);
-- 
1.7.10.4