X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=a4401659c23171eb37f9dd2b3fa1cd9021fcceec;hb=7acd51b7cdffca5ad92a777d2c6e8e9bae1f9fd3;hp=a1134338261239f22e6b80e1a559107765273240;hpb=3b5d9ce6b714e69e96b8c738c4055196cb1f42b4;p=yaz-moved-to-github.git

diff --git a/client/client.c b/client/client.c
index a113433..a440165 100644
--- a/client/client.c
+++ b/client/client.c
@@ -4,7 +4,23 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: client.c,v $
- * Revision 1.96  2000-03-14 09:27:07  ian
+ * Revision 1.101  2000-04-05 07:39:54  adam
+ * Added shared library support (libtool).
+ *
+ * Revision 1.100  2000/03/20 19:29:59  adam
+ * Minor change.
+ *
+ * Revision 1.99  2000/03/20 19:06:25  adam
+ * Added Segment request for fronend server. Work on admin for client.
+ *
+ * Revision 1.98  2000/03/16 13:55:49  ian
+ * Added commands for sending shutdown and startup admin requests via the admin ES.
+ *
+ * Revision 1.97  2000/03/14 14:06:04  ian
+ * Minor change to order of debugging output for send_apdu,
+ * fixed encoding of admin request.
+ *
+ * Revision 1.96  2000/03/14 09:27:07  ian
  * Added code to enable sending of admin extended service requests
  *
  * Revision 1.95  2000/02/28 11:20:05  adam
@@ -356,9 +372,9 @@ static ODR out, in, print;              /* encoding and decoding streams */
 static FILE *apdu_file = 0;
 static COMSTACK conn = 0;               /* our z-association */
 static Z_IdAuthentication *auth = 0;    /* our current auth definition */
-static char *databaseNames[128];
+char *databaseNames[128];
+int num_databaseNames = 0;
 static Z_External *record_last = 0;
-static int num_databaseNames = 0;
 static int setnumber = 0;               /* current result set number */
 static int smallSetUpperBound = 0;
 static int largeSetLowerBound = 1;
@@ -398,16 +414,16 @@ void send_apdu(Z_APDU *a)
     char *buf;
     int len;
 
-    if (!z_APDU(out, &a, 0, 0))
-    {
-        odr_perror(out, "Encoding APDU");
-        exit(1);
-    }
     if (apdu_file)
     {
         z_APDU(print, &a, 0, 0);
         odr_reset(print);
     }
+    if (!z_APDU(out, &a, 0, 0))
+    {
+        odr_perror(out, "Encoding APDU");
+        exit(1);
+    }
     buf = odr_getbuf(out, &len, 0);
     /* printf ("sending APDU of size %d\n", len); */
     if (cs_put(conn, buf, len) < 0)
@@ -2261,14 +2277,18 @@ static int client(int wait)
 	{"refid", cmd_refid, "<id>"},
 	{"itemorder", cmd_itemorder, "1|2 <item>"},
 	{"update", cmd_update, "<item>"},
+#ifdef ASN_COMPILED
 	/* Server Admin Functions */
 	{"adm-reindex", cmd_adm_reindex, "<database-name>"},
 	{"adm-truncate", cmd_adm_truncate, "('database'|'index')<object-name>"},
-	{"adm-create", cmd_adm_create, "<database-name>"},
-	{"adm-delete", cmd_adm_delete, "('database'|'index')<object-name>"},
-	{"adm-import", cmd_adm_import, "<database-name> <record-type> <source-file-name>"},
-	{"adm-refresh", cmd_adm_refresh, "<database-name>"},
+	{"adm-create", cmd_adm_create, ""},
+	{"adm-drop", cmd_adm_drop, "('database'|'index')<object-name>"},
+	{"adm-import", cmd_adm_import, "<record-type> <dir> <pattern>"},
+	{"adm-refresh", cmd_adm_refresh, ""},
 	{"adm-commit", cmd_adm_commit, ""},
+	{"adm-shutdown", cmd_adm_shutdown, ""},
+	{"adm-startup", cmd_adm_startup, ""},
+#endif
         {0,0}
     };
     char *netbuffer= 0;
@@ -2349,9 +2369,11 @@ static int client(int wait)
 	    }
         }
 	wait = 0;
+	if (conn
 #ifdef USE_SELECT
-        if (conn && FD_ISSET(cs_fileno(conn), &input))
+	    && FD_ISSET(cs_fileno(conn), &input)
 #endif
+	    )
         {
             do
             {