/*
 * Copyright (c) 1998-2006, Index Data.
 * See the file LICENSE for details.
 * 
 * $Id: tstquery.cpp,v 1.3 2006-07-07 12:57:15 adam Exp $
 */

#include <stdlib.h>
#include <yazpp/z-query.h>

using namespace yazpp_1;

void tst1(const char *query_str_in, const char *query_expected)
{
    Yaz_Z_Query q;

    q = query_str_in;

    Yaz_Z_Query q2;

    q2 = q;

    char query_str_out[100];
    q2.print(query_str_out, sizeof(query_str_out)-1);

    if (strcmp(query_str_out, query_expected))
    {
	fprintf(stderr, "tstquery: query mismatch out=%s expected=%s\n",
		query_str_out, query_expected);
	exit(1);
    }
}

int main(int argc, char **argv)
{
    tst1("", "");
    tst1("x", "RPN @attrset Bib-1 x");
    tst1("@and a b", "RPN @attrset Bib-1 @and a b");
}

/*
 * Local variables:
 * c-basic-offset: 4
 * indent-tabs-mode: nil
 * End:
 * vim: shiftwidth=4 tabstop=8 expandtab
 */

/*
 * Copyright (c) 1998-2005, Index Data.
 * See the file LICENSE for details.
 * 
 * $Id: tstquery.cpp,v 1.2 2006-03-29 13:14:15 adam Exp $
 */

#include <stdlib.h>
#include <yazpp/z-query.h>

using namespace yazpp_1;

void tst1(const char *query_str_in, const char *query_expected)
{
    Yaz_Z_Query q;

    q = query_str_in;

    Yaz_Z_Query q2;

    q2 = q;

    char query_str_out[100];
    q2.print(query_str_out, sizeof(query_str_out)-1);

    if (strcmp(query_str_out, query_expected))
    {
	fprintf(stderr, "tstquery: query mismatch out=%s expected=%s\n",
		query_str_out, query_expected);
	exit(1);
    }
}

int main(int argc, char **argv)
{
    tst1("", "");
    tst1("x", "RPN: @attrset Bib-1 x");
    tst1("@and a b", "RPN: @attrset Bib-1 @and a b");
}

/*
 * Local variables:
 * c-basic-offset: 4
 * indent-tabs-mode: nil
 * End:
 * vim: shiftwidth=4 tabstop=8 expandtab
 */

--- 
+++ 
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1998-2005, Index Data.
+ * Copyright (c) 1998-2006, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: tstquery.cpp,v 1.2 2006-03-29 13:14:15 adam Exp $
+ * $Id: tstquery.cpp,v 1.3 2006-07-07 12:57:15 adam Exp $
  */
 
 #include <stdlib.h>
@@ -34,8 +34,8 @@
 int main(int argc, char **argv)
 {
     tst1("", "");
-    tst1("x", "RPN: @attrset Bib-1 x");
-    tst1("@and a b", "RPN: @attrset Bib-1 @and a b");
+    tst1("x", "RPN @attrset Bib-1 x");
+    tst1("@and a b", "RPN @attrset Bib-1 @and a b");
 }
 
 /*
Update test becuase yaz_query_to_wrbuf now omits : before
query type in string output.
