Use cql transform define fname

IDMETA

@@ -1,4 +1,4 @@
 DEBIAN_DIST="bookworm bullseye"
 UBUNTU_DIST="noble jammy focal"
 CENTOS_DIST="centos7 centos8 centos9"
-VERSION=1.8.1
+VERSION=1.9.0

configure.ac

@@ -14,7 +14,7 @@ AC_PROG_EGREP
 
 LT_INIT
 
-YAZ_INIT([],[5.1.0])
+YAZ_INIT([],[5.35.0])
 if test -z "$YAZLIB"; then
 	AC_MSG_ERROR([YAZ development libraries missing])
 fi

debian/control

@@ -6,7 +6,7 @@ Standards-Version: 3.6.2
 Build-Depends: debhelper (>= 9.0.0),
 	libxml2-dev, libxslt1-dev,
 	pkg-config,
-	libyaz5-dev (>= 5.29.0)
+	libyaz5-dev (>= 5.35.0)
 
 Package: libyazpp7
 Section: libs

include/yazpp/cql2rpn.h

@@ -1,5 +1,5 @@
 /* This file is part of the yazpp toolkit.
- * Copyright (C) Index Data 
+ * Copyright (C) Index Data
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -35,6 +35,7 @@ class YAZ_EXPORT Yaz_cql2rpn {
     ~Yaz_cql2rpn();
     void set_pqf_file(const char *fname);
     bool parse_spec_file(const char *fname, int *error);
+    int define_pattern(const char *pattern, const char *value);
     int query_transform(const char *cql, Z_RPNQuery **rpnquery, ODR o,
                         char **addinfop);
     int rpn2cql_transform(Z_RPNQuery *q, WRBUF cql, ODR o, char **addinfop);

src/Makefile.am

@@ -8,7 +8,7 @@ TESTS = $(check_PROGRAMS)
 AM_CXXFLAGS = -I$(srcdir)/../include $(YAZINC)
 
 lib_LTLIBRARIES = libyazpp.la
-libyazpp_la_LDFLAGS=-version-info 6:0:0
+libyazpp_la_LDFLAGS=-version-info 7:0:1
 
 DISTCLEANFILES = yazpp-config
 

src/test_query.cpp

@@ -1,5 +1,5 @@
 /* This file is part of the yazpp toolkit.
- * Copyright (C) Index Data 
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 

src/yaz-cql2rpn.cpp

@@ -1,5 +1,5 @@
 /* This file is part of the yazpp toolkit.
- * Copyright (C) Index Data 
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 
@@ -32,13 +32,19 @@ void Yaz_cql2rpn::set_pqf_file(const char *fname)
         m_transform = cql_transform_open_fname(fname);
 }
 
-
 bool Yaz_cql2rpn::parse_spec_file(const char *fname, int *error)
 {
-    *error = 0;
-    cql_transform_close(m_transform);
-    m_transform = cql_transform_open_fname(fname);
-    return m_transform ? true : false;
+    if (!m_transform)
+        m_transform = cql_transform_create();
+    *error = cql_transform_define_fname(m_transform, fname);
+    return *error == 0 ? true : false;
+}
+
+int Yaz_cql2rpn::define_pattern(const char *pattern, const char *value)
+{
+    if (!m_transform)
+        m_transform = cql_transform_create();
+    return cql_transform_define_pattern(m_transform, pattern, value);
 }
 
 int Yaz_cql2rpn::rpn2cql_transform(Z_RPNQuery *q, WRBUF cql, ODR o,

yazpp.spec

@@ -9,7 +9,7 @@ Vendor: Index Data ApS <[email protected]>
 Source: yazpp-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prefix: %{_prefix}
-BuildRequires: pkgconfig, libyaz5-devel >= 5.29.0
+BuildRequires: pkgconfig, libyaz5-devel >= 5.35.0
 Packager: Adam Dickmeiss <[email protected]>
 URL: http://www.indexdata.com/yazplusplus