From: Adam Dickmeiss Date: Mon, 28 Jan 2013 14:31:47 +0000 (+0100) Subject: Further work on yaz_xml_to_opac X-Git-Tag: v4.2.50~8 X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=c7737ca64f706b92bf37ad107b92d8c73ff82932;p=yaz-moved-to-github.git Further work on yaz_xml_to_opac Incomplete and not tested --- diff --git a/include/yaz/marcdisp.h b/include/yaz/marcdisp.h index bd36fd1..3c98b5b 100644 --- a/include/yaz/marcdisp.h +++ b/include/yaz/marcdisp.h @@ -444,10 +444,13 @@ YAZ_EXPORT void yaz_opac_decode_wrbuf2(yaz_marc_t mt, Z_OPACRecord *r, \param src XML root node (presumably opacRecord node) \param dst Z39.50 OPAC result - allocated by NMEM on marc handle \param cd iconv handle for the OPAC content (not ISO2709 part) - + \param nmem memory for OPACRecord (if NULL, mt NMEM memory is used) + \retval 1 conversion OK + \retval 0 conversion NOT OK \*/ -YAZ_EXPORT void yaz_xml_to_opac(yaz_marc_t mt, xmlNode *src, - Z_OPACRecord **dst, yaz_iconv_t cd); +YAZ_EXPORT int yaz_xml_to_opac(yaz_marc_t mt, xmlNode *src, + Z_OPACRecord **dst, yaz_iconv_t cd, + NMEM nmem); #endif /** \brief flushes records diff --git a/src/xml_to_opac.c b/src/xml_to_opac.c index ab19cff..004f308 100644 --- a/src/xml_to_opac.c +++ b/src/xml_to_opac.c @@ -16,15 +16,225 @@ #include #include +#include +#include #if YAZ_HAVE_XML2 #include #include -void yaz_xml_to_opac(yaz_marc_t mt, xmlNode *src, Z_OPACRecord **dst, - yaz_iconv_t cd) +static int match_element(xmlNode *ptr, const char *elem) { + if (ptr->type == XML_ELEMENT_NODE && !xmlStrcmp(ptr->name, BAD_CAST elem)) + { + return 1; + } + return 0; +} + +static int match_xsd_string_n(xmlNodePtr ptr, const char *elem, NMEM nmem, + char **val, int *len) +{ + if (!match_element(ptr, elem)) + return 0; + ptr = ptr->children; + if (!ptr || ptr->type != XML_TEXT_NODE) + { + *val = ""; + return 1; + } + *val = nmem_strdup(nmem, (const char *) ptr->content); + if (len) + *len = xmlStrlen(ptr->content); + return 1; +} + +static int match_element_next(xmlNode **ptr, const char *elem, NMEM nmem, + char **val) +{ + while (*ptr && (*ptr)->type != XML_ELEMENT_NODE) + (*ptr) = (*ptr)->next; + if (*ptr && match_xsd_string_n(*ptr, elem, nmem, val, 0)) + { + *ptr = (*ptr)->next; + return 1; + } + *val = 0; + return 0; +} + +static int bibliographicRecord(yaz_marc_t mt, xmlNode *ptr, Z_External **ext, + yaz_iconv_t cd, NMEM nmem) +{ + int ret = 0; + if (yaz_marc_read_xml(mt, ptr) == 0) + { + WRBUF wr = wrbuf_alloc(); + if (yaz_marc_write_iso2709(mt, wr) == 0) + { + *ext = z_ext_record_oid_nmem(nmem, yaz_oid_recsyn_usmarc, + wrbuf_buf(wr), wrbuf_len(wr)); + ret = 1; + } + wrbuf_destroy(wr); + } + return ret; +} + +static int volume(xmlNode *ptr, Z_Volume **volp, NMEM nmem) +{ + *volp = (Z_Volume *) nmem_malloc(nmem, sizeof(Z_Volume)); + + match_element_next(&ptr, "enumeration", nmem, &(*volp)->enumeration); + match_element_next(&ptr, "chronology", nmem, &(*volp)->chronology); + match_element_next(&ptr, "enumAndChron", nmem, &(*volp)->enumAndChron); + return 1; +} + +static int volumes(xmlNode *ptr, Z_Volume ***volp, int *num, NMEM nmem) +{ + int i; + xmlNode *ptr0 = ptr; + + for (i = 0; ptr; i++) + { + while (ptr && ptr->type != XML_ELEMENT_NODE) + ptr = ptr->next; + if (!match_element(ptr, "volume")) + return 0; + ptr = ptr->next; + } + *num = i; + *volp = (Z_Volume **) nmem_malloc(nmem, sizeof(**volp) * i); + ptr = ptr0; + for (i = 0; ptr; i++) + { + while (ptr && ptr->type != XML_ELEMENT_NODE) + ptr = ptr->next; + if (!match_element(ptr, "volume")) + return 0; + volume(ptr->children, (*volp) + i, nmem); + ptr = ptr->next; + } + return 1; +} + +static void circulations(xmlNode *ptr, Z_CircRecord ***circp, + int *num, NMEM nmem) +{ + +} + +static int holdingsRecord(xmlNode *ptr, Z_HoldingsRecord **r, NMEM nmem) +{ + Z_HoldingsAndCircData *h; + + *r = (Z_HoldingsRecord *) + nmem_malloc(nmem, sizeof(**r)); + (*r)->which = Z_HoldingsRecord_holdingsAndCirc; + h = (*r)->u.holdingsAndCirc = (Z_HoldingsAndCircData *) + nmem_malloc(nmem, sizeof(*h)); + + match_element_next(&ptr, "typeOfRecord", nmem, &h->typeOfRecord); + match_element_next(&ptr, "encodingLevel", nmem, &h->encodingLevel); + match_element_next(&ptr, "format", nmem, &h->format); + match_element_next(&ptr, "receiptAcqStatus", nmem, &h->receiptAcqStatus); + match_element_next(&ptr, "generalRetention", nmem, &h->generalRetention); + match_element_next(&ptr, "completeness", nmem, &h->completeness); + match_element_next(&ptr, "dateOfReport", nmem, &h->dateOfReport); + match_element_next(&ptr, "nucCode", nmem, &h->nucCode); + match_element_next(&ptr, "localLocation", nmem, &h->localLocation); + match_element_next(&ptr, "shelvingLocation", nmem, &h->shelvingLocation); + match_element_next(&ptr, "callNumber", nmem, &h->callNumber); + match_element_next(&ptr, "shelvingData", nmem, &h->shelvingData); + match_element_next(&ptr, "copyNumber", nmem, &h->copyNumber); + match_element_next(&ptr, "publicNote", nmem, &h->publicNote); + match_element_next(&ptr, "reproductionNote", nmem, &h->reproductionNote); + match_element_next(&ptr, "termsUseRepro", nmem, &h->termsUseRepro); + match_element_next(&ptr, "enumAndChron", nmem, &h->enumAndChron); + + h->num_volumes = 0; + h->volumes = 0; + while (ptr && ptr->type != XML_ELEMENT_NODE) + ptr = ptr->next; + if (match_element(ptr, "volumes")) + { + volumes(ptr->children, &h->volumes, &h->num_volumes, nmem); + ptr = ptr->next; + } + + h->num_circulationData = 0; + h->circulationData = 0; + while (ptr && ptr->type != XML_ELEMENT_NODE) + ptr = ptr->next; + if (match_element(ptr, "circulations")) + { + circulations(ptr->children, &h->circulationData, + &h->num_circulationData, nmem); + ptr = ptr->next; + } + return 1; +} + +int yaz_xml_to_opac(yaz_marc_t mt, xmlNode *ptr, Z_OPACRecord **dst, + yaz_iconv_t cd, NMEM nmem) +{ + int i; + Z_External *ext = 0; + Z_OPACRecord *opac; + xmlNode *ptr0; + + if (!nmem) + nmem = yaz_marc_get_nmem(mt); + if (!match_element(ptr, "opacRecord")) + return 0; + ptr = ptr->children; + while (ptr && ptr->type != XML_ELEMENT_NODE) + ptr = ptr->next; + if (!match_element(ptr, "bibliographicRecord")) + return 0; + if (!bibliographicRecord(mt, ptr->children, &ext, cd, nmem)) + return 0; + *dst = opac = (Z_OPACRecord *) nmem_malloc(nmem, sizeof(*opac)); + opac->num_holdingsData = 0; + opac->holdingsData = 0; + opac->bibliographicRecord = ext; + + while (ptr && ptr->type != XML_ELEMENT_NODE) + ptr = ptr->next; + if (!match_element(ptr, "holdings")) + return 0; + + ptr = ptr->children; + ptr0 = ptr; + for (i = 0; ptr; i++) + { + while (ptr && ptr->type != XML_ELEMENT_NODE) + ptr = ptr->next; + if (!ptr) + break; + if (!match_element(ptr, "holding")) + return 0; + ptr = ptr->next; + } + opac->num_holdingsData = i; + opac->holdingsData = (Z_HoldingsRecord **) + nmem_malloc(nmem, sizeof(*opac->holdingsData) * i); + ptr = ptr0; + for (i = 0; ptr; i++) + { + while (ptr && ptr->type != XML_ELEMENT_NODE) + ptr = ptr->next; + if (!ptr) + break; + if (!match_element(ptr, "holding")) + return 0; + if (!holdingsRecord(ptr->children, opac->holdingsData + i, nmem)) + return 0; + ptr = ptr->next; + } + return 1; } #endif