/*
- * $Log: admin.c,v $
- * Revision 1.6 2000-03-20 19:06:25 adam
- * Added Segment request for fronend server. Work on admin for client.
- *
- * Revision 1.5 2000/03/17 12:47:02 adam
- * Minor changes to admin client.
- *
- * Revision 1.4 2000/03/16 13:55:49 ian
- * Added commands for sending shutdown and startup admin requests via the admin ES.
- *
- * Revision 1.3 2000/03/14 15:23:17 ian
- * Removed unwanted ifdef and include of zes-admin.h
- *
- * Revision 1.2 2000/03/14 14:06:04 ian
- * Minor change to order of debugging output for send_apdu,
- * fixed encoding of admin request.
- *
- * Revision 1.1 2000/03/14 09:27:07 ian
- * Added code to enable sending of admin extended service requests
- *
+ * Copyright (c) 1995-2001, Index Data
+ * See the file LICENSE for details.
*
+ * $Id: admin.c,v 1.12 2002-01-17 21:04:43 adam Exp $
*/
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include <assert.h>
+
+#if HAVE_FNMATCH_H
#include <dirent.h>
#include <fnmatch.h>
#include <sys/stat.h>
+#endif
+
#include <yaz/yaz-util.h>
#include <yaz/tcpip.h>
#include <yaz/pquery.h>
+
/* Helper functions to get to various statics in the client */
ODR getODROutputStream();
void send_apdu(Z_APDU *a);
+extern char *databaseNames[];
+extern int num_databaseNames;
-
-int sendAdminES(int type, char* dbname, char* param1)
+int sendAdminES(int type, char* param1)
{
ODR out = getODROutputStream();
+ char *dbname = odr_strdup (out, databaseNames[0]);
/* Type: 1=reindex, 2=truncate, 3=delete, 4=create, 5=import, 6=refresh, 7=commit */
Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest );
case Z_ESAdminOriginPartToKeep_truncate:
toKeep->u.truncate=odr_nullval();
break;
- case Z_ESAdminOriginPartToKeep_delete:
- toKeep->u.delete=odr_nullval();
+ case Z_ESAdminOriginPartToKeep_drop:
+ toKeep->u.drop=odr_nullval();
break;
case Z_ESAdminOriginPartToKeep_create:
toKeep->u.create=odr_nullval();
case Z_ESAdminOriginPartToKeep_import:
toKeep->u.import = (Z_ImportParameters*)odr_malloc(out, sizeof(*toKeep->u.import));
toKeep->u.import->recordType=param1;
- toKeep->databaseName = dbname;
/* Need to add additional setup of records here */
break;
case Z_ESAdminOriginPartToKeep_refresh:
toKeep->u.refresh=odr_nullval();
- toKeep->databaseName = dbname;
break;
case Z_ESAdminOriginPartToKeep_commit:
toKeep->u.commit=odr_nullval();
return 0;
}
-/* cmd_adm_reindex <dbname>
+/* cmd_adm_reindex
Ask the specified database to fully reindex itself */
int cmd_adm_reindex(char* arg)
{
- sendAdminES(Z_ESAdminOriginPartToKeep_reIndex,arg,NULL);
+ sendAdminES(Z_ESAdminOriginPartToKeep_reIndex, NULL);
return 2;
}
-/* cmd_adm_truncate <dbname>
+/* cmd_adm_truncate
Truncate the specified database, removing all records and index entries, but leaving
the database & it's explain information intact ready for new records */
int cmd_adm_truncate(char* arg)
{
if ( arg )
{
- sendAdminES(Z_ESAdminOriginPartToKeep_truncate,arg,NULL);
+ sendAdminES(Z_ESAdminOriginPartToKeep_truncate, NULL);
return 2;
}
return 0;
}
-/* cmd_adm_create <dbname>
+/* cmd_adm_create
Create a new database */
int cmd_adm_create(char* arg)
{
if ( arg )
{
- sendAdminES(Z_ESAdminOriginPartToKeep_create,arg,NULL);
+ sendAdminES(Z_ESAdminOriginPartToKeep_create, NULL);
return 2;
}
return 0;
}
-/* cmd_adm_delete <dbname>
- Delete a database */
-int cmd_adm_delete(char* arg)
+/* cmd_adm_drop
+ Drop (Delete) a database */
+int cmd_adm_drop(char* arg)
{
if ( arg )
{
- sendAdminES(Z_ESAdminOriginPartToKeep_delete,arg,NULL);
+ sendAdminES(Z_ESAdminOriginPartToKeep_drop, NULL);
return 2;
}
return 0;
N.B. That in this case, the import may contain instructions to delete records as well as new or updates
to existing records */
-extern char *databaseNames[];
-extern int num_databaseNames;
-
+#if HAVE_FNMATCH_H
int cmd_adm_import(char *arg)
{
char type_str[20], dir_str[1024], pattern_str[1024];
struct dirent *ent;
int chunk = 10;
Z_APDU *apdu = 0;
+ Z_Segment *segment = 0;
ODR out = getODROutputStream();
if (arg && sscanf (arg, "%19s %1023s %1023s", type_str,
if (!dir)
return 0;
- sendAdminES(Z_ESAdminOriginPartToKeep_import,*databaseNames,
- type_str);
+ sendAdminES(Z_ESAdminOriginPartToKeep_import, type_str);
printf ("sent es request\n");
if ((cp=strrchr(dir_str, '/')) && cp[1] == 0)
if (S_ISREG(status.st_mode) && (inf = fopen(fname, "r")))
{
- Z_Segment *segment;
Z_NamePlusRecord *rec;
- Odr_oct *oct = odr_malloc (out, sizeof(*oct));
+ Odr_oct *oct = (Odr_oct *) odr_malloc (out, sizeof(*oct));
if (!apdu)
{
rec->u.intermediateFragment->u.notExternallyTagged = oct;
oct->len = oct->size = status.st_size;
- oct->buf = odr_malloc (out, oct->size);
+ oct->buf = (unsigned char *) odr_malloc (out, oct->size);
fread (oct->buf, 1, oct->size, inf);
fclose (inf);
}
}
if (apdu)
- {
- printf ("sending last packet\n");
send_apdu(apdu);
- }
apdu = zget_APDU(out, Z_APDU_segmentRequest);
- printf ("sending end of sequence packet\n");
send_apdu (apdu);
closedir(dir);
return 2;
}
+#else
+int cmd_adm_import(char *arg)
+{
+ printf ("not available on WIN32\n");
+ return 0;
+}
+#endif
int cmd_adm_import2(char* arg)
{
- /* Size of chunks we wish to read from import file */
- size_t chunk_size = 8192;
-
- /* Buffer for reading chunks of data from import file */
- char chunk_buffer[chunk_size];
+ /* Buffer for reading chunks of data from import file */
+ char chunk_buffer[8192];
if ( arg )
{
- char dbname_buff[32];
char rectype_buff[32];
char filename_buff[32];
FILE* pImportFile = NULL;
- if (sscanf (arg, "%s %s %s", dbname_buff, rectype_buff, filename_buff) != 3)
+ if (sscanf (arg, "%s %s", rectype_buff, filename_buff) != 3)
{
printf("Must specify database-name, record-type and filename for import\n");
return 0;
/* We opened the import file without problems... So no we send the es request, ready to
start sending fragments of the import file as segment messages */
- sendAdminES(Z_ESAdminOriginPartToKeep_import,arg,rectype_buff);
+ sendAdminES(Z_ESAdminOriginPartToKeep_import, rectype_buff);
while ( ! feof(pImportFile ) )
{
{
if ( arg )
{
- sendAdminES(Z_ESAdminOriginPartToKeep_refresh,arg,NULL);
+ sendAdminES(Z_ESAdminOriginPartToKeep_refresh, NULL);
return 2;
}
return 0;
Make imported records a permenant & visible to the live system */
int cmd_adm_commit(char* arg)
{
- sendAdminES(Z_ESAdminOriginPartToKeep_commit,NULL,NULL);
+ sendAdminES(Z_ESAdminOriginPartToKeep_commit, NULL);
return 2;
}
int cmd_adm_shutdown(char* arg)
{
- sendAdminES(Z_ESAdminOriginPartToKeep_shutdown,NULL,NULL);
+ sendAdminES(Z_ESAdminOriginPartToKeep_shutdown, NULL);
return 2;
}
int cmd_adm_startup(char* arg)
{
- sendAdminES(Z_ESAdminOriginPartToKeep_start,NULL,NULL);
+ sendAdminES(Z_ESAdminOriginPartToKeep_start, NULL);
return 2;
}
-
projects / yaz-moved-to-github.git / blobdiff