X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fsort%2Fsort1.c;h=661570d0f9aa871ba1fb80cecac7f337d316b29d;hp=4e648c1946300ab9c6cecbc665516f40ca8cf459;hb=89d3a004b7c651fd5673abfc192e1472dc4d4197;hpb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e

diff --git a/test/sort/sort1.c b/test/sort/sort1.c
index 4e648c1..661570d 100644
--- a/test/sort/sort1.c
+++ b/test/sort/sort1.c
@@ -1,5 +1,5 @@
-/* $Id: sort1.c,v 1.8 2006-05-10 08:13:39 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: sort1.c,v 1.13 2007-01-15 15:10:24 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ 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
-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 "../api/testlib.h"
@@ -30,7 +30,7 @@ static void tst(int argc, char **argv)
     char path[256];
     int i;
 
-    YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
+    YAZ_CHECK_EQ(zebra_select_database(zh, "Default"), ZEBRA_OK);
 
     zebra_init(zh);
 
@@ -47,19 +47,22 @@ static void tst(int argc, char **argv)
     ids[1] = 2;
     ids[2] = 4;
     ids[3] = 5;
-    YAZ_CHECK(tl_sort(zh, "@or computer @attr 7=1 @attr 1=30 0", 4, ids));
+    YAZ_CHECK(tl_sort(zh, "@or @attr 1=4 computer @attr 7=1 @attr 1=30 0", 4, ids));
+    YAZ_CHECK(tl_sort(zh, "@or @attr 1=4 computer @attr 7=1 @attr 1=Date 0", 4, ids));
 
     ids[0] = 5;
     ids[1] = 4;
     ids[2] = 2;
     ids[3] = 3;
-    YAZ_CHECK(tl_sort(zh, "@or computer @attr 7=1 @attr 1=1021 0", 4, ids));
+    YAZ_CHECK(tl_sort(zh, "@or @attr 1=4 computer @attr 7=1 @attr 1=1021 0", 4, ids));
+    YAZ_CHECK(tl_sort(zh, "@or @attr 1=4 computer @attr 7=1 @attr 1=Bib-Level 0", 4, ids));
 
     ids[0] = 2;
     ids[1] = 5;
     ids[2] = 4;
     ids[3] = 3;
-    YAZ_CHECK(tl_sort(zh, "@or computer @attr 7=1 @attr 1=1021 @attr 4=109 0", 4, ids));
+    YAZ_CHECK(tl_sort(zh, "@or @attr 1=4 computer @attr 7=1 @attr 1=1021 @attr 4=109 0", 4, ids));
+    YAZ_CHECK(tl_sort(zh, "@or @attr 1=4 computer @attr 7=1 @attr 1=Bib-Level @attr 4=109 0", 4, ids));
 
     YAZ_CHECK(tl_close_down(zh, zs));
 }