dickmeiss Mon Feb 23 05:48:44 2004 EDT
Modified files:
/php-src/ext/yaz config.m4 php_yaz.c
Log:
Use ZOOM_resultset_sort for yaz_sort. Require YAZ 2.0.13 or later.
http://cvs.php.net/diff.php/php-src/ext/yaz/config.m4?r1=1.15&r2=1.16&ty=u
Index: php-src/ext/yaz/config.m4
diff -u php-src/ext/yaz/config.m4:1.15 php-src/ext/yaz/config.m4:1.16
--- php-src/ext/yaz/config.m4:1.15 Mon Jan 26 08:40:49 2004
+++ php-src/ext/yaz/config.m4 Mon Feb 23 05:48:44 2004
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.15 2004/01/26 13:40:49 dickmeiss Exp $
+dnl $Id: config.m4,v 1.16 2004/02/23 10:48:44 dickmeiss Exp $
dnl
PHP_ARG_WITH(yaz,for YAZ support,
@@ -23,14 +23,14 @@
AC_DEFINE(HAVE_YAZ,1,[Whether you have YAZ])
. $yazconfig
- dnl Check version (2.0.6 or greater required)
+ dnl Check version (2.0.13 or greater required)
AC_MSG_CHECKING([for YAZ version])
yaz_version=`echo $YAZVERSION | awk 'BEGIN { FS = "."; } { printf "%d", ($1 *
1000 + $2) * 1000 + $3;}'`
echo $yaz_version
- if test "$yaz_version" -ge 2000006; then
+ if test "$yaz_version" -ge 2000013; then
AC_MSG_RESULT([$YAZVERSION])
else
- AC_MSG_ERROR([YAZ version 2.0.6 or later required.])
+ AC_MSG_ERROR([YAZ version 2.0.13 or later required.])
fi
for c in $YAZLIB; do
http://cvs.php.net/diff.php/php-src/ext/yaz/php_yaz.c?r1=1.83&r2=1.84&ty=u
Index: php-src/ext/yaz/php_yaz.c
diff -u php-src/ext/yaz/php_yaz.c:1.83 php-src/ext/yaz/php_yaz.c:1.84
--- php-src/ext/yaz/php_yaz.c:1.83 Mon Jan 26 08:40:49 2004
+++ php-src/ext/yaz/php_yaz.c Mon Feb 23 05:48:44 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_yaz.c,v 1.83 2004/01/26 13:40:49 dickmeiss Exp $ */
+/* $Id: php_yaz.c,v 1.84 2004/02/23 10:48:44 dickmeiss Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -33,9 +33,9 @@
#include <yaz/yaz-version.h>
#ifndef YAZ_VERSIONL
-#error YAZ version 2.0.6 or later must be used.
-#elif YAZ_VERSIONL < 0x020006
-#error YAZ version 2.0.6 or later must be used.
+#error YAZ version 2.0.13 or later must be used.
+#elif YAZ_VERSIONL < 0x02000D
+#error YAZ version 2.0.13 or later must be used.
#endif
#ifdef PHP_WIN32
@@ -1267,6 +1267,9 @@
convert_to_string_ex(pval_criteria);
xfree(p->sort_criteria);
p->sort_criteria = xstrdup((*pval_criteria)->value.str.val);
+ if (p->zoom_set)
+ ZOOM_resultset_sort(p->zoom_set, "yaz",
+
(*pval_criteria)->value.str.val);
}
release_assoc(p);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
