ztest: Last test MARC record in UTF-8 ;was Latin-1

[yaz-moved-to-github.git] / ztest / dummy-opac.c

diff --git a/ztest/dummy-opac.c b/ztest/dummy-opac.c
index e0ef278..7843b20 100644 (file)
--- a/ztest/dummy-opac.c
+++ b/ztest/dummy-opac.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
  */
 
@@ -18,15 +18,18 @@ Z_OPACRecord *dummy_opac(int num, ODR odr, const char *marc_input)
 {
     Z_OPACRecord *rec;
     int i;
-    rec = odr_malloc(odr, sizeof(*rec));
+    rec = (Z_OPACRecord *) odr_malloc(odr, sizeof(*rec));
     rec->bibliographicRecord =
         z_ext_record_usmarc(odr, marc_input, strlen(marc_input));
     rec->num_holdingsData = 1;
-    rec->holdingsData = odr_malloc(odr, sizeof(*rec->holdingsData));
+    rec->holdingsData = (Z_HoldingsRecord **)
+        odr_malloc(odr, sizeof(*rec->holdingsData));
     for (i = 0; i < rec->num_holdingsData; i++)
     {
-        Z_HoldingsRecord *hr = odr_malloc(odr, sizeof(*hr));
-        Z_HoldingsAndCircData *hc = odr_malloc(odr, sizeof(*hc));
+        Z_HoldingsRecord *hr = (Z_HoldingsRecord *)
+            odr_malloc(odr, sizeof(*hr));
+        Z_HoldingsAndCircData *hc = (Z_HoldingsAndCircData *)
+            odr_malloc(odr, sizeof(*hc));
         
         rec->holdingsData[i] = hr;
         hr->which = Z_HoldingsRecord_holdingsAndCirc;
@@ -57,18 +60,18 @@ Z_OPACRecord *dummy_opac(int num, ODR odr, const char *marc_input)
         hc->volumes = 0;
 
         hc->num_circulationData = 1;
-        hc->circulationData = odr_malloc(odr, 
-                                         sizeof(*hc->circulationData));
-        hc->circulationData[0] = odr_malloc(odr, 
-                                            sizeof(**hc->circulationData));
+        hc->circulationData = (Z_CircRecord **)
+             odr_malloc(odr, sizeof(*hc->circulationData));
+        hc->circulationData[0] = (Z_CircRecord *)
+             odr_malloc(odr, sizeof(**hc->circulationData));
 
-        hc->circulationData[0]->availableNow = odr_intdup(odr, 1);
+        hc->circulationData[0]->availableNow = odr_booldup(odr, 1);
         hc->circulationData[0]->availablityDate = 0;
         hc->circulationData[0]->availableThru = 0;
         hc->circulationData[0]->restrictions = 0;
         hc->circulationData[0]->itemId = "1226176";
-        hc->circulationData[0]->renewable = odr_intdup(odr, 0);
-        hc->circulationData[0]->onHold = odr_intdup(odr, 0);
+        hc->circulationData[0]->renewable = odr_booldup(odr, 0);
+        hc->circulationData[0]->onHold = odr_booldup(odr, 0);
         hc->circulationData[0]->enumAndChron = 0;
         hc->circulationData[0]->midspine = 0;
         hc->circulationData[0]->temporaryLocation = 0;
@@ -78,6 +81,7 @@ Z_OPACRecord *dummy_opac(int num, ODR odr, const char *marc_input)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab