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
Towards 2.0.12
[idzebra-moved-to-github.git]
/
data1
/
d1_map.c
diff --git
a/data1/d1_map.c
b/data1/d1_map.c
index
1b746a1
..
b92ad0a
100644
(file)
--- a/
data1/d1_map.c
+++ b/
data1/d1_map.c
@@
-1,6
+1,6
@@
-/* $Id: d1_map.c,v 1.6 2004-11-19 10:26:53 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: d1_map.c,v 1.15 2007-01-15 15:10:14 adam Exp $
+ Copyright (C) 1995-2007
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-15,17
+15,17
@@
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <yaz/log.h>
#include <yaz/oid.h>
#include <yaz/oid.h>
-#include <yaz/ylog.h>
#include <yaz/readconf.h>
#include <yaz/tpath.h>
#include <d1_absyn.h>
#include <yaz/readconf.h>
#include <yaz/tpath.h>
#include <d1_absyn.h>
@@
-42,10
+42,7
@@
data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
int local_numeric = 0;
if (!(f = data1_path_fopen(dh, file, "r")))
int local_numeric = 0;
if (!(f = data1_path_fopen(dh, file, "r")))
- {
- yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", file);
return 0;
return 0;
- }
res->name = 0;
res->target_absyn_ref = VAL_NONE;
res->name = 0;
res->target_absyn_ref = VAL_NONE;
@@
-329,26
+326,28
@@
data1_node *data1_map_record (data1_handle dh, data1_node *n,
res->which = DATA1N_root;
res->u.root.type = map->target_absyn_name;
res->which = DATA1N_root;
res->u.root.type = map->target_absyn_name;
- if (!(res->u.root.absyn = data1_get_absyn(dh, map->target_absyn_name)))
+ if (!(res->u.root.absyn = data1_get_absyn(dh, map->target_absyn_name,
+ DATA1_XPATH_INDEXING_ENABLE)))
{
yaz_log(YLOG_WARN, "%s: Failed to load target absyn '%s'",
map->name, map->target_absyn_name);
}
{
yaz_log(YLOG_WARN, "%s: Failed to load target absyn '%s'",
map->name, map->target_absyn_name);
}
- if (data1_is_xmlmode(dh))
- {
- n = n->child;
- if (!n)
- return 0;
- res1 = data1_mk_tag (dh, m, map->target_absyn_name, 0, res);
- }
- else
- res1 = res;
-
+ n = n->child;
+ if (!n)
+ return 0;
+ res1 = data1_mk_tag (dh, m, map->target_absyn_name, 0, res);
+ while (n && n->which != DATA1N_tag)
+ n = n->next;
if (map_children(dh, n, map, res1, m) < 0)
if (map_children(dh, n, map, res1, m) < 0)
- {
- data1_free_tree(dh, res);
return 0;
return 0;
- }
return res;
}
return res;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+