/*
- * $Log: admin.c,v $
- * Revision 1.9 2001-02-21 13:46:53 adam
- * C++ fixes.
- *
- * Revision 1.8 2000/04/17 14:21:38 adam
- * WIN32 update.
- *
- * Revision 1.7 2000/04/05 07:39:54 adam
- * Added shared library support (libtool).
- *
- * 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-2003, Index Data
+ * See the file LICENSE for details.
*
+ * $Id: admin.c,v 1.15 2003-01-06 08:20:26 adam Exp $
*/
#include <stdio.h>
#include <time.h>
#include <assert.h>
-#ifdef WIN32
-
-#else
+#if HAVE_FNMATCH_H
#include <dirent.h>
#include <fnmatch.h>
#include <sys/stat.h>
#include <yaz/yaz-util.h>
#include <yaz/tcpip.h>
-#ifdef USE_XTIMOSI
-#include <yaz/xmosi.h>
-#endif
#include <yaz/proto.h>
#include <yaz/marcdisp.h>
#include <yaz/pquery.h>
-#ifdef ASN_COMPILED
+#include "admin.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;
{
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 );
Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
req->packageName = "1.Extendedserveq";
/* Allocate the external */
- r = req->taskSpecificParameters = (Z_External *) odr_malloc (out, sizeof(*r));
+ r = req->taskSpecificParameters = (Z_External *)
+ odr_malloc (out, sizeof(*r));
r->direct_reference = odr_oiddup(out,oid);
r->indirect_reference = 0;
r->descriptor = 0;
r->which = Z_External_ESAdmin;
- r->u.adminService = (Z_Admin *) odr_malloc(out, sizeof(*r->u.adminService));
+ r->u.adminService = (Z_Admin *)
+ odr_malloc(out, sizeof(*r->u.adminService));
r->u.adminService->which = Z_Admin_esRequest;
- r->u.adminService->u.esRequest = (Z_AdminEsRequest *) odr_malloc(out, sizeof(*r->u.adminService->u.esRequest));
-
- toKeep = r->u.adminService->u.esRequest->toKeep = (Z_ESAdminOriginPartToKeep *)
- odr_malloc(out, sizeof(*r->u.adminService->u.esRequest->toKeep));
-
+ r->u.adminService->u.esRequest = (Z_AdminEsRequest *)
+ odr_malloc(out, sizeof(*r->u.adminService->u.esRequest));
+
+ toKeep = r->u.adminService->u.esRequest->toKeep =
+ (Z_ESAdminOriginPartToKeep *)
+ odr_malloc(out, sizeof(*r->u.adminService->u.esRequest->toKeep));
+
toKeep->which=type;
toKeep->databaseName = dbname;
switch ( type )
toKeep->u.create=odr_nullval();
break;
case Z_ESAdminOriginPartToKeep_import:
- toKeep->u.import = (Z_ImportParameters*)odr_malloc(out, sizeof(*toKeep->u.import));
+ toKeep->u.import = (Z_ImportParameters*)
+ odr_malloc(out, sizeof(*toKeep->u.import));
toKeep->u.import->recordType=param1;
/* Need to add additional setup of records here */
break;
/* Unknown admin service */
break;
}
-
+
notToKeep = r->u.adminService->u.esRequest->notToKeep =
(Z_ESAdminOriginPartNotToKeep *)
odr_malloc(out, sizeof(*r->u.adminService->u.esRequest->notToKeep));
N.B. That in this case, the import may contain instructions to delete records as well as new or updates
to existing records */
-#ifdef WIN32
-int cmd_adm_import(char *arg)
-{
- printf ("not available on WIN32\n");
- return 0;
-}
-
-#else
-
+#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,
return 0;
sendAdminES(Z_ESAdminOriginPartToKeep_import, type_str);
-
+
printf ("sent es request\n");
if ((cp=strrchr(dir_str, '/')) && cp[1] == 0)
sep="";
if (S_ISREG(status.st_mode) && (inf = fopen(fname, "r")))
{
- Z_Segment *segment;
Z_NamePlusRecord *rec;
Odr_oct *oct = (Odr_oct *) odr_malloc (out, sizeof(*oct));
closedir(dir);
return 2;
}
-#endif
-
-int cmd_adm_import2(char* arg)
+#else
+int cmd_adm_import(char *arg)
{
- /* Buffer for reading chunks of data from import file */
- char chunk_buffer[8192];
-
- if ( arg )
- {
- char rectype_buff[32];
- char filename_buff[32];
- FILE* pImportFile = NULL;
-
- if (sscanf (arg, "%s %s", rectype_buff, filename_buff) != 3)
- {
- printf("Must specify database-name, record-type and filename for import\n");
- return 0;
- }
-
- /* Attempt to open the file */
-
- pImportFile = fopen(filename_buff,"r");
-
- /* This chunk of code should move into client.c sometime soon for sending files via the update es */
- /* This function will then refer to the standard client.c one for uploading a file using es update */
- if ( pImportFile )
- {
- int iTotalWritten = 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, rectype_buff);
-
- while ( ! feof(pImportFile ) )
- {
- /* Read buffer_size bytes from the file */
- size_t num_items = fread((void*)chunk_buffer, 1, sizeof(chunk_buffer), pImportFile);
-
- /* Write num_bytes of data to */
-
- if ( feof(pImportFile ) )
- {
- /* This is the last chunk... Write it as the last fragment */
- printf("Last segment of %d bytes\n", num_items);
- }
- else if ( iTotalWritten == 0 )
- {
- printf("First segment of %d bytes\n",num_items);
- }
- else
- {
- printf("Writing %d bytes\n", num_items);
- }
-
- iTotalWritten += num_items;
- }
- }
- return 2;
- }
+ printf ("not available on WIN32\n");
return 0;
}
+#endif
+
/* "Freshen" the specified database, by checking metadata records against the sources from which they were
generated, and creating a new record if the source has been touched since the last extraction */
sendAdminES(Z_ESAdminOriginPartToKeep_start, NULL);
return 2;
}
-#endif
+
+/*
+ * Local variables:
+ * tab-width: 8
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=8 fdm=marker
+ * vim<600: sw=4 ts=8
+ */