projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work on new traversal.
[idzebra-moved-to-github.git]
/
index
/
extract.c
diff --git
a/index/extract.c
b/index/extract.c
index
abe3c88
..
9207ab7
100644
(file)
--- a/
index/extract.c
+++ b/
index/extract.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: extract.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: extract.c,v $
- * Revision 1.24 1995-11-15 19:13:08 adam
+ * Revision 1.26 1995-11-20 11:56:24 adam
+ * Work on new traversal.
+ *
+ * Revision 1.25 1995/11/16 15:34:54 adam
+ * Uses new record management system in both indexer and server.
+ *
+ * Revision 1.24 1995/11/15 19:13:08 adam
* Work on record management.
*
* Revision 1.23 1995/10/27 14:00:10 adam
* Work on record management.
*
* Revision 1.23 1995/10/27 14:00:10 adam
@@
-91,8
+97,6
@@
#include <recctrl.h>
#include "index.h"
#include <recctrl.h>
#include "index.h"
-#define RECORD_BASE 1
-
#if RECORD_BASE
#include "recindex.h"
#endif
#if RECORD_BASE
#include "recindex.h"
#endif
@@
-391,8
+395,8
@@
static int file_read (int fd, char *buf, size_t count)
return read (fd, buf, count);
}
#endif
return read (fd, buf, count);
}
#endif
-void file_extract (int cmd, const char *fname, const char *kname,
- char *databaseName)
+SYSNO file_extract (int cmd, const char *fname, const char *kname,
+ char *databaseName)
{
int i, r;
char ext[128];
{
int i, r;
char ext[128];
@@
-417,9
+421,9
@@
void file_extract (int cmd, const char *fname, const char *kname,
}
sprintf (ext_res, "fileExtension.%s", ext);
if (!(file_type = res_get (common_resource, ext_res)))
}
sprintf (ext_res, "fileExtension.%s", ext);
if (!(file_type = res_get (common_resource, ext_res)))
- return;
+ return 0;
if (!(rt = recType_byName (file_type)))
if (!(rt = recType_byName (file_type)))
- return;
+ return 0;
logf (LOG_DEBUG, "%c %s k=%s", cmd, fname, kname);
file_info = dict_lookup (file_idx, kname);
if (!file_info)
logf (LOG_DEBUG, "%c %s k=%s", cmd, fname, kname);
file_info = dict_lookup (file_idx, kname);
if (!file_info)
@@
-432,6
+436,7
@@
void file_extract (int cmd, const char *fname, const char *kname,
rec->info[0] = rec_strdup (file_type);
rec->info[1] = rec_strdup (kname);
rec_put (records, rec);
rec->info[0] = rec_strdup (file_type);
rec->info[1] = rec_strdup (kname);
rec_put (records, rec);
+ rec_rm (rec);
#else
sysno = sysno_next++;
dict_insert (file_idx, kname, sizeof(sysno), &sysno);
#else
sysno = sysno_next++;
dict_insert (file_idx, kname, sizeof(sysno), &sysno);
@@
-446,7
+451,7
@@
void file_extract (int cmd, const char *fname, const char *kname,
if ((extractCtrl.fd = open (fname, O_RDONLY)) == -1)
{
logf (LOG_WARN|LOG_ERRNO, "open %s", fname);
if ((extractCtrl.fd = open (fname, O_RDONLY)) == -1)
{
logf (LOG_WARN|LOG_ERRNO, "open %s", fname);
- return;
+ return 0;
}
extractCtrl.subType = "";
extractCtrl.init = wordInit;
}
extractCtrl.subType = "";
extractCtrl.init = wordInit;
@@
-464,4
+469,5
@@
void file_extract (int cmd, const char *fname, const char *kname,
close (extractCtrl.fd);
if (r)
logf (LOG_WARN, "Couldn't extract file %s, code %d", fname, r);
close (extractCtrl.fd);
if (r)
logf (LOG_WARN, "Couldn't extract file %s, code %d", fname, r);
+ return sysno;
}
}