X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fopacdisp.c;h=e16d64370b33a94b8e5f5348cb2f8112c5e48da7;hp=79c1dde29a958c7f6bc25404f6d4e3151670cdde;hb=a679666e56f9f6ea19e4c22e36089ccb3716dd0f;hpb=77d6853aec94df6c69da9cd35d8ba982b9b12299

diff --git a/src/opacdisp.c b/src/opacdisp.c
index 79c1dde..e16d643 100644
--- a/src/opacdisp.c
+++ b/src/opacdisp.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: opacdisp.c,v 1.5 2005-02-25 17:05:09 adam Exp $
  */
 /**
  * \file opacdisp.c
@@ -17,20 +15,21 @@
 #include <yaz/proto.h>
 #include <yaz/marcdisp.h>
 
-static void opac_element_str(WRBUF wrbuf, int l, const char *elem,
-			     const char *data)
+static void opac_element_str(WRBUF wrbuf, yaz_iconv_t cd, 
+                             int l, const char *elem,
+                             const char *data)
 {
     if (data)
     {
-	while (--l >= 0)
-	    wrbuf_puts(wrbuf, " ");
-	wrbuf_puts(wrbuf, "<");
-	wrbuf_puts(wrbuf, elem);
-	wrbuf_puts(wrbuf, ">");
-	wrbuf_xmlputs(wrbuf, data);
-	wrbuf_puts(wrbuf, "</");
-	wrbuf_puts(wrbuf, elem);
-	wrbuf_puts(wrbuf, ">\n");
+        while (--l >= 0)
+            wrbuf_puts(wrbuf, " ");
+        wrbuf_puts(wrbuf, "<");
+        wrbuf_puts(wrbuf, elem);
+        wrbuf_puts(wrbuf, ">");
+        wrbuf_iconv_puts_cdata(wrbuf, cd, data);
+        wrbuf_puts(wrbuf, "</");
+        wrbuf_puts(wrbuf, elem);
+        wrbuf_puts(wrbuf, ">\n");
     }
 }
 
@@ -38,123 +37,127 @@ static void opac_element_bool(WRBUF wrbuf, int l, const char *elem, int *data)
 {
     if (data)
     {
-	while (--l >= 0)
-	    wrbuf_puts(wrbuf, " ");
-	wrbuf_puts(wrbuf, "<");
-	wrbuf_puts(wrbuf, elem);
-	if (*data)
+        while (--l >= 0)
+            wrbuf_puts(wrbuf, " ");
+        wrbuf_puts(wrbuf, "<");
+        wrbuf_puts(wrbuf, elem);
+        if (*data)
             wrbuf_puts(wrbuf, " value=\"1\"");
-	else
+        else
             wrbuf_puts(wrbuf, " value=\"0\"");
-	wrbuf_puts(wrbuf, "/>\n");
+        wrbuf_puts(wrbuf, "/>\n");
     }
 }
 
 void yaz_opac_decode_wrbuf(yaz_marc_t mt, Z_OPACRecord *r, WRBUF wrbuf)
 {
     int i;
+    yaz_iconv_t cd = yaz_marc_get_iconv(mt);
 
-    wrbuf_puts(wrbuf, "<holdings>\n");
-
+    wrbuf_puts(wrbuf, "<opacRecord>\n");
     if (r->bibliographicRecord)
     {
-	Z_External *ext = r->bibliographicRecord;
-	
-	wrbuf_puts (wrbuf, "  <bibliographicRecord>\n");
-	if (ext->which == Z_External_octet)
-	    yaz_marc_decode_wrbuf(mt, ext->u.octet_aligned->buf,
-				  ext->u.octet_aligned->len, wrbuf);
-	wrbuf_puts (wrbuf, "  </bibliographicRecord>\n");
+        Z_External *ext = r->bibliographicRecord;
+        
+        wrbuf_puts(wrbuf, "  <bibliographicRecord>\n");
+        if (ext->which == Z_External_octet)
+            yaz_marc_decode_wrbuf(mt, (const char *) ext->u.octet_aligned->buf,
+                                  ext->u.octet_aligned->len, wrbuf);
+        wrbuf_puts(wrbuf, "  </bibliographicRecord>\n");
     }
+    wrbuf_puts(wrbuf, "<holdings>\n");
+
     for (i = 0; i < r->num_holdingsData; i++)
     {
-	Z_HoldingsRecord *h = r->holdingsData[i];
-	wrbuf_puts(wrbuf, " <holding>\n");
+        Z_HoldingsRecord *h = r->holdingsData[i];
+        wrbuf_puts(wrbuf, " <holding>\n");
 
-	if (h->which == Z_HoldingsRecord_marcHoldingsRecord)
-	{
-	    Z_External *ext = h->u.marcHoldingsRecord;
+        if (h->which == Z_HoldingsRecord_marcHoldingsRecord)
+        {
+            Z_External *ext = h->u.marcHoldingsRecord;
 
-	    wrbuf_puts (wrbuf, "  <marcHoldingsRecord>\n");
-	    if (ext->which == Z_External_octet)
-		yaz_marc_decode_wrbuf(mt, ext->u.octet_aligned->buf,
-				      ext->u.octet_aligned->len, wrbuf);
-	    wrbuf_puts (wrbuf, "  </marcHoldingsRecord>\n");
-	}
-	else if (h->which == Z_HoldingsRecord_holdingsAndCirc)
-	{
-	    int j;
-	    
-	    Z_HoldingsAndCircData *d = h->u.holdingsAndCirc;
-	
-	    opac_element_str(wrbuf, 2, "typeOfRecord", d->typeOfRecord);
-	    opac_element_str(wrbuf, 2, "encodingLevel", d->encodingLevel);
-	    opac_element_str(wrbuf, 2, "format", d->format);
-	    opac_element_str(wrbuf, 2, "receiptAcqStatus", d->receiptAcqStatus);
-	    opac_element_str (wrbuf, 2, "generalRetention", d->generalRetention);
-	    opac_element_str (wrbuf, 2, "completeness", d->completeness);
-	    opac_element_str (wrbuf, 2, "dateOfReport", d->dateOfReport);
-	    opac_element_str (wrbuf, 2, "nucCode", d->nucCode);
-	    opac_element_str (wrbuf, 2, "localLocation", d->localLocation);
-	    opac_element_str (wrbuf, 2, "shelvingLocation", d->shelvingLocation);
-	    opac_element_str (wrbuf, 2, "callNumber", d->callNumber);
-	    opac_element_str (wrbuf, 2, "shelvingData", d->shelvingData);
-	    
-	    opac_element_str (wrbuf, 2, "copyNumber", d->copyNumber);
-	    opac_element_str (wrbuf, 2, "publicNote", d->publicNote);
-	    opac_element_str (wrbuf, 2, "reproductionNote", d->reproductionNote);
-	    opac_element_str (wrbuf, 2, "termsUseRepro", d->termsUseRepro);
-	    opac_element_str (wrbuf, 2, "enumAndChron", d->enumAndChron);
-	    if (d->num_volumes)
-	    {
-		wrbuf_puts (wrbuf, "  <volumes>\n");
-		for (j = 0; j<d->num_volumes; j++)
-		{
-		    wrbuf_puts (wrbuf, "   <volume>\n");
-		    opac_element_str (wrbuf, 4, "enumeration",
-				      d->volumes[j]->enumeration);
-		    opac_element_str (wrbuf, 4, "chronology",
-				      d->volumes[j]->chronology);
-		    opac_element_str (wrbuf, 4, "enumAndChron",
-				      d->volumes[j]->enumAndChron);
-		    wrbuf_puts (wrbuf, "   </volume>\n");
-		}
-		wrbuf_puts (wrbuf, "  </volumes>\n");
-	    }
-	    if (d->num_circulationData)
-	    {
-		wrbuf_puts (wrbuf, "  <circulations>\n");
-		for (j = 0; j<d->num_circulationData; j++)
-		{
-		    wrbuf_puts (wrbuf,"   <circulation>\n");
-		    opac_element_bool (wrbuf, 4, "availableNow",
-				       d->circulationData[j]->availableNow);
-		    opac_element_str (wrbuf, 4, "availabiltyDate",
-				      d->circulationData[j]->availablityDate);
-		    opac_element_str (wrbuf, 4, "availableThru",
-				      d->circulationData[j]->availableThru);
-		    opac_element_str (wrbuf, 4, "restrictions",
-				      d->circulationData[j]->restrictions);
-		    opac_element_str (wrbuf, 4, "itemId",
-				      d->circulationData[j]->itemId);
-		    opac_element_bool (wrbuf, 4, "renewable",
-				       d->circulationData[j]->renewable);
-		    opac_element_bool (wrbuf, 4, "onHold",
-				       d->circulationData[j]->onHold);
-		    opac_element_str (wrbuf, 4, "enumAndChron",
-				      d->circulationData[j]->enumAndChron);
-		    opac_element_str (wrbuf, 4, "midspine",
-				      d->circulationData[j]->midspine);
-		    opac_element_str (wrbuf, 4, "temporaryLocation",
-				      d->circulationData[j]->temporaryLocation);
-		    wrbuf_puts (wrbuf, "   </circulation>\n");
-		}
-		wrbuf_puts (wrbuf, "  </circulations>\n");
-	    }
-	}
-	wrbuf_puts(wrbuf, " </holding>\n");
+            wrbuf_puts(wrbuf, "  <marcHoldingsRecord>\n");
+            if (ext->which == Z_External_octet)
+                yaz_marc_decode_wrbuf(mt, (const char *)
+                                      ext->u.octet_aligned->buf,
+                                      ext->u.octet_aligned->len, wrbuf);
+            wrbuf_puts(wrbuf, "  </marcHoldingsRecord>\n");
+        }
+        else if (h->which == Z_HoldingsRecord_holdingsAndCirc)
+        {
+            int j;
+            
+            Z_HoldingsAndCircData *d = h->u.holdingsAndCirc;
+        
+            opac_element_str(wrbuf, cd, 2, "typeOfRecord", d->typeOfRecord);
+            opac_element_str(wrbuf, cd, 2, "encodingLevel", d->encodingLevel);
+            opac_element_str(wrbuf, cd, 2, "format", d->format);
+            opac_element_str(wrbuf, cd, 2, "receiptAcqStatus", d->receiptAcqStatus);
+            opac_element_str(wrbuf, cd, 2, "generalRetention", d->generalRetention);
+            opac_element_str(wrbuf, cd, 2, "completeness", d->completeness);
+            opac_element_str(wrbuf, cd, 2, "dateOfReport", d->dateOfReport);
+            opac_element_str(wrbuf, cd, 2, "nucCode", d->nucCode);
+            opac_element_str(wrbuf, cd, 2, "localLocation", d->localLocation);
+            opac_element_str(wrbuf, cd, 2, "shelvingLocation", d->shelvingLocation);
+            opac_element_str(wrbuf, cd, 2, "callNumber", d->callNumber);
+            opac_element_str(wrbuf, cd, 2, "shelvingData", d->shelvingData);
+            
+            opac_element_str(wrbuf, cd, 2, "copyNumber", d->copyNumber);
+            opac_element_str(wrbuf, cd, 2, "publicNote", d->publicNote);
+            opac_element_str(wrbuf, cd, 2, "reproductionNote", d->reproductionNote);
+            opac_element_str(wrbuf, cd, 2, "termsUseRepro", d->termsUseRepro);
+            opac_element_str(wrbuf, cd, 2, "enumAndChron", d->enumAndChron);
+            if (d->num_volumes)
+            {
+                wrbuf_puts (wrbuf, "  <volumes>\n");
+                for (j = 0; j<d->num_volumes; j++)
+                {
+                    wrbuf_puts (wrbuf, "   <volume>\n");
+                    opac_element_str(wrbuf, cd, 4, "enumeration",
+                                     d->volumes[j]->enumeration);
+                    opac_element_str(wrbuf, cd, 4, "chronology",
+                                     d->volumes[j]->chronology);
+                    opac_element_str(wrbuf, cd, 4, "enumAndChron",
+                                     d->volumes[j]->enumAndChron);
+                    wrbuf_puts(wrbuf, "   </volume>\n");
+                }
+                wrbuf_puts(wrbuf, "  </volumes>\n");
+            }
+            if (d->num_circulationData)
+            {
+                wrbuf_puts (wrbuf, "  <circulations>\n");
+                for (j = 0; j<d->num_circulationData; j++)
+                {
+                    wrbuf_puts(wrbuf,"   <circulation>\n");
+                    opac_element_bool(wrbuf, 4, "availableNow",
+                                      d->circulationData[j]->availableNow);
+                    opac_element_str(wrbuf, cd, 4, "availabiltyDate",
+                                     d->circulationData[j]->availablityDate);
+                    opac_element_str(wrbuf, cd, 4, "availableThru",
+                                      d->circulationData[j]->availableThru);
+                    opac_element_str(wrbuf, cd, 4, "restrictions",
+                                      d->circulationData[j]->restrictions);
+                    opac_element_str(wrbuf, cd, 4, "itemId",
+                                      d->circulationData[j]->itemId);
+                    opac_element_bool(wrbuf, 4, "renewable",
+                                      d->circulationData[j]->renewable);
+                    opac_element_bool(wrbuf, 4, "onHold",
+                                      d->circulationData[j]->onHold);
+                    opac_element_str(wrbuf, cd, 4, "enumAndChron",
+                                      d->circulationData[j]->enumAndChron);
+                    opac_element_str(wrbuf, cd, 4, "midspine",
+                                      d->circulationData[j]->midspine);
+                    opac_element_str(wrbuf, cd, 4, "temporaryLocation",
+                                      d->circulationData[j]->temporaryLocation);
+                    wrbuf_puts(wrbuf, "   </circulation>\n");
+                }
+                wrbuf_puts(wrbuf, "  </circulations>\n");
+            }
+        }
+        wrbuf_puts(wrbuf, " </holding>\n");
     }
     wrbuf_puts(wrbuf, "</holdings>\n");
+    wrbuf_puts(wrbuf, "</opacRecord>\n");
 }
 
 void yaz_display_OPAC(WRBUF wrbuf, Z_OPACRecord *opac_rec, int flags)
@@ -166,3 +169,11 @@ void yaz_display_OPAC(WRBUF wrbuf, Z_OPACRecord *opac_rec, int flags)
     yaz_marc_destroy(mt);
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+