* Sebastian Hammer, Adam Dickmeiss
*
* $Log: marc.c,v $
- * Revision 1.5 1995-06-30 12:39:26 adam
+ * Revision 1.7 1995-11-09 15:24:02 adam
+ * Allow charsets [..] in record match.
+ *
+ * Revision 1.6 1995/08/28 12:21:22 adam
+ * Removed lines and list as synonyms of list in MARC extractron.
+ * Configure searches also for tk4.0 / tcl7.4.
+ *
+ * Revision 1.5 1995/06/30 12:39:26 adam
* Bug fix: loadFile didn't set record type.
* The MARC routines are a little less strict in the interpretation.
* Script display.tcl replaces the old marc.tcl.
static int marc_compare (const char *f, const char *p)
{
+ int ch;
+
if (*p == '*')
return 0;
if (!f)
return -*p;
- for (; *f && *p; f++, p++)
- {
- if (*p == '?')
- continue;
- if (*p != *f)
- break;
- }
- return *f - *p;
+ for (; (ch = *p) && *f; f++, p++)
+ switch (*p)
+ {
+ case '*':
+ return 0;
+ case '?':
+ ch = *f;
+ break;
+ case '[':
+ while (1)
+ if (!*++p)
+ break;
+ else if (*p == ']')
+ {
+ p++;
+ break;
+ }
+ else if (*p == *f)
+ ch = *p;
+ if (ch != *p)
+ return *f - ch;
+ break;
+ default:
+ if (ch != *f)
+ return *f - ch;
+ }
+ return *f - ch;
}
char *ir_tcl_fread_marc (FILE *inf, size_t *size)
*ptag = '\0';
if (!strcmp (argv[3], "field"))
mode = 'f';
- else if (!strcmp (argv[3], "lines") || !strcmp (argv[3], "list"))
+ else if (!strcmp (argv[3], "line"))
mode = 'l';
else
{