-/* $Id: extract.c,v 1.204 2006-03-20 15:17:30 mike Exp $
+/* $Id: extract.c,v 1.208 2006-05-09 11:31:37 marc Exp $
Copyright (C) 1995-2005
Index Data ApS
ctrl->flagShowRecords = !zh->m_flag_rw;
}
-static int file_extract_record(ZebraHandle zh,
- SYSNO *sysno, const char *fname,
- int deleteFlag,
- struct file_read_info *fi,
- int force_update,
- RecType recType,
- void *recTypeClientData)
+static ZEBRA_RES file_extract_record(ZebraHandle zh,
+ SYSNO *sysno, const char *fname,
+ int deleteFlag,
+ struct file_read_info *fi,
+ int force_update,
+ RecType recType,
+ void *recTypeClientData)
{
RecordAttr *recordAttr;
int r;
{
if (zebraExplain_newDatabase (zh->reg->zei, zh->basenames[0],
zh->m_explain_database))
- return 0;
+ return ZEBRA_FAIL;
}
if (fi->fd != -1)
yaz_log_init_prefix2 (0);
if (r == RECCTRL_EXTRACT_EOF)
- return 0;
+ return ZEBRA_FAIL;
else if (r == RECCTRL_EXTRACT_ERROR_GENERIC)
{
/* error occured during extraction ... */
yaz_log (YLOG_WARN, "fail %s %s " PRINTF_OFF_T, zh->m_record_type,
fname, recordOffset);
}
- return 0;
+ return ZEBRA_FAIL;
}
else if (r == RECCTRL_EXTRACT_ERROR_NO_SUCH_FILTER)
{
PRINTF_OFF_T, zh->m_record_type,
fname, recordOffset);
}
- return 0;
+ return ZEBRA_FAIL;
}
if (extractCtrl.match_criteria[0])
matchStr = extractCtrl.match_criteria;
if (!matchStr)
{
yaz_log(YLOG_WARN, "Bad match criteria");
- return 0;
+ return ZEBRA_FAIL;
}
}
if (matchStr)
/* the extraction process returned no information - the record
is probably empty - unless flagShowRecords is in use */
if (!zh->m_flag_rw)
- return 1;
+ return ZEBRA_OK;
if (zh->records_processed < zh->m_file_verbose_limit)
yaz_log (YLOG_WARN, "empty %s %s " PRINTF_OFF_T, zh->m_record_type,
fname, recordOffset);
- return 1;
+ return ZEBRA_OK;
}
if (! *sysno)
yaz_log (YLOG_LOG, "delete %s %s " PRINTF_OFF_T, zh->m_record_type,
fname, recordOffset);
yaz_log (YLOG_WARN, "cannot delete record above (seems new)");
- return 1;
+ return ZEBRA_OK;
}
- if (zh->records_processed < zh->m_file_verbose_limit)
- yaz_log (YLOG_LOG, "add %s %s " PRINTF_OFF_T, zh->m_record_type,
- fname, recordOffset);
- rec = rec_new (zh->reg->records);
+ rec = rec_new (zh->reg->records);
+
*sysno = rec->sysno;
-
+
+ if (zh->records_processed < zh->m_file_verbose_limit)
+ if (matchStr)
+ yaz_log(YLOG_LOG, "add %s %s " PRINTF_OFF_T
+ " " ZINT_FORMAT " %s" ,
+ zh->m_record_type,
+ fname, recordOffset, *sysno, matchStr);
+ else
+ yaz_log(YLOG_LOG, "add %s %s " PRINTF_OFF_T
+ " " ZINT_FORMAT ,
+ zh->m_record_type,
+ fname, recordOffset, *sysno);
+
recordAttr = rec_init_attr (zh->reg->zei, rec);
recordAttr->staticrank = extractCtrl.staticrank;
dict_insert_ord(zh->reg->matchDict, db_ord, matchStr,
sizeof(*sysno), sysno);
}
+
+
#if NATTR
extract_flushSortKeys (zh, *sysno, 1, zh->reg->sortKeys);
#else
/* record going to be deleted */
if (zebra_rec_keys_empty(delkeys))
{
- yaz_log (YLOG_LOG, "delete %s %s " PRINTF_OFF_T,
- zh->m_record_type, fname, recordOffset);
+ yaz_log (YLOG_LOG, "delete %s %s " PRINTF_OFF_T
+ " " ZINT_FORMAT,
+ zh->m_record_type, fname, recordOffset, *sysno);
yaz_log (YLOG_WARN, "cannot delete file above, storeKeys false (1)");
}
else
{
if (zh->records_processed < zh->m_file_verbose_limit)
- yaz_log (YLOG_LOG, "delete %s %s " PRINTF_OFF_T,
- zh->m_record_type, fname, recordOffset);
+ if (matchStr)
+ yaz_log(YLOG_LOG, "delete %s %s " PRINTF_OFF_T
+ " " ZINT_FORMAT " %s" ,
+ zh->m_record_type,
+ fname, recordOffset, *sysno, matchStr);
+ else
+ yaz_log(YLOG_LOG, "delete %s %s " PRINTF_OFF_T
+ " " ZINT_FORMAT ,
+ zh->m_record_type,
+ fname, recordOffset, *sysno);
+
+
+
zh->records_deleted++;
if (matchStr)
{
}
rec_rm (&rec);
logRecord (zh);
- return 1;
+ return ZEBRA_OK;
}
else
{
/* flush new keys for sort&search etc */
if (zh->records_processed < zh->m_file_verbose_limit)
- yaz_log (YLOG_LOG, "update %s %s " PRINTF_OFF_T,
- zh->m_record_type, fname, recordOffset);
+ if (matchStr)
+ yaz_log(YLOG_LOG, "update %s %s " PRINTF_OFF_T
+ " " ZINT_FORMAT " %s" ,
+ zh->m_record_type,
+ fname, recordOffset, *sysno, matchStr);
+ else
+ yaz_log(YLOG_LOG, "update %s %s " PRINTF_OFF_T
+ " " ZINT_FORMAT ,
+ zh->m_record_type,
+ fname, recordOffset, *sysno);
+
recordAttr->staticrank = extractCtrl.staticrank;
#if NATTR
extract_flushSortKeys (zh, *sysno, 1, zh->reg->sortKeys);
/* commit this record */
rec_put (zh->reg->records, &rec);
logRecord (zh);
- return 1;
+ return ZEBRA_OK;
}
-int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
- int deleteFlag)
+ZEBRA_RES zebra_extract_file(ZebraHandle zh, SYSNO *sysno, const char *fname,
+ int deleteFlag)
{
- int r, i, fd;
+ ZEBRA_RES r = ZEBRA_OK;
+ int i, fd;
char gprefix[128];
char ext[128];
char ext_res[128];
&recTypeClientData)))
{
yaz_log(YLOG_WARN, "No such record type: %s", zh->m_record_type);
- return 0;
+ return ZEBRA_FAIL;
}
switch(recType->version)
else
strcpy (full_rep, fname);
-
if ((fd = open (full_rep, O_BINARY|O_RDONLY)) == -1)
{
yaz_log (YLOG_WARN|YLOG_ERRNO, "open %s", full_rep);
zh->m_record_type = original_record_type;
- return 0;
+ return ZEBRA_FAIL;
}
}
fi = file_read_start (fd);
- do
+ while(1)
{
fi->file_moffset = fi->file_offset;
fi->file_more = 0; /* file_end not called (yet) */
fi->file_offset = fi->file_moffset;
lseek(fi->fd, fi->file_moffset, SEEK_SET);
}
+ if (r != ZEBRA_OK)
+ {
+ break;
+ }
+ if (sysno)
+ {
+ break;
+ }
}
- while (r && !sysno);
file_read_stop (fi);
if (fd != -1)
close (fd);
if (!recType)
{
- yaz_log (YLOG_WARN, "No such record type: %s", zh->m_record_type);
+ yaz_log (YLOG_WARN, "No such record type: %s", recordType);
return ZEBRA_FAIL;
}
dict_insert_ord(zh->reg->matchDict, db_ord, matchStr,
sizeof(*sysno), sysno);
}
+
+
#if NATTR
extract_flushSortKeys (zh, *sysno, 1, zh->reg->sortKeys);
#else
ord = key.mem[0];
zebraExplain_lookup_ord(zh->reg->zei, ord, &index_type,
- 0/* db */, 0/* set */, 0/* use */);
+ 0/* db */, 0/* set */, 0/* use */,
+ 0 /* string_index */);
assert(index_type);
zebra_term_untrans_iconv(zh, nmem, index_type,
&dst_term, str);
assert(key.len <= 4 && key.len > 2);
zebraExplain_lookup_ord(zh->reg->zei,
- key.mem[0], &index_type, &db, 0, 0);
+ key.mem[0], &index_type, &db, 0, 0, 0);
seqno = (int) key.mem[key.len-1];