X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fccl_stop_words.c;h=a9e0e5d4a4abe0ab20d27509c4c6a47fca18b24a;hp=6a36e92a19fda95f6d01ed8e7250e31d8dc0e9a1;hb=b06636208651777c08e2456bf3b5953fc3c0f2c2;hpb=73f6b7a6b12a1e0e54c9cc360f552a56726d75fd diff --git a/src/ccl_stop_words.c b/src/ccl_stop_words.c index 6a36e92..a9e0e5d 100644 --- a/src/ccl_stop_words.c +++ b/src/ccl_stop_words.c @@ -1,55 +1,17 @@ -/* - * Copyright (c) 1995, the EUROPAGATE consortium (see below). - * - * The EUROPAGATE consortium members are: - * - * University College Dublin - * Danmarks Teknologiske Videnscenter - * An Chomhairle Leabharlanna - * Consejo Superior de Investigaciones Cientificas - * - * Permission to use, copy, modify, distribute, and sell this software and - * its documentation, in whole or in part, for any purpose, is hereby granted, - * provided that: - * - * 1. This copyright and permission notice appear in all copies of the - * software and its documentation. Notices of copyright or attribution - * which appear at the beginning of any file must remain unchanged. - * - * 2. The names of EUROPAGATE or the project partners may not be used to - * endorse or promote products derived from this software without specific - * prior written permission. - * - * 3. Users of this software (implementors and gateway operators) agree to - * inform the EUROPAGATE consortium of their use of the software. This - * information will be used to evaluate the EUROPAGATE project and the - * software, and to plan further developments. The consortium may use - * the information in later publications. - * - * 4. Users of this software agree to make their best efforts, when - * documenting their use of the software, to acknowledge the EUROPAGATE - * consortium, and the role played by the software in their work. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND, - * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY - * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - * IN NO EVENT SHALL THE EUROPAGATE CONSORTIUM OR ITS MEMBERS BE LIABLE - * FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF - * ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA - * OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND - * ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE - * USE OR PERFORMANCE OF THIS SOFTWARE. - * +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2013 Index Data + * See the file LICENSE for details. */ - -/** +/** * \file ccl_stop_words.c * \brief Removes stop words from terms in RPN tree */ +#if HAVE_CONFIG_H +#include +#endif #include #include -#include #include #include @@ -64,33 +26,34 @@ struct ccl_stop_words { NMEM nmem; /* memory for removed items */ struct ccl_stop_info *removed_items; }; - + static void append_removed_item(ccl_stop_words_t csw, const char *qname, const char *t, size_t len) { - struct ccl_stop_info *csi = nmem_malloc(csw->nmem, sizeof(*csi)); + struct ccl_stop_info *csi = (struct ccl_stop_info *) + nmem_malloc(csw->nmem, sizeof(*csi)); struct ccl_stop_info **csip = &csw->removed_items; if (qname) csi->qualname = nmem_strdup(csw->nmem, qname); else csi->qualname = 0; - csi->term = nmem_malloc(csw->nmem, len+1); + csi->term = (char *) nmem_malloc(csw->nmem, len+1); memcpy(csi->term, t, len); csi->term[len] = '\0'; csi->next = 0; while (*csip) csip = &(*csip)->next; - + *csip = csi; } ccl_stop_words_t ccl_stop_words_create(void) { NMEM nmem = nmem_create(); - ccl_stop_words_t csw = xmalloc(sizeof(*csw)); + ccl_stop_words_t csw = (ccl_stop_words_t) xmalloc(sizeof(*csw)); csw->nmem = nmem; csw->removed_items = 0; csw->blank_chars = xstrdup(" \r\n\t"); @@ -200,11 +163,11 @@ int ccl_stop_words_tree(ccl_stop_words_t csw, CCL_bibset bibset, struct ccl_rpn_node **t) { struct ccl_rpn_node *r; - + /* remove list items */ nmem_reset(csw->nmem); csw->removed_items = 0; - + r = ccl_remove_stop_r(csw, bibset, *t); *t = r; if (csw->removed_items) @@ -234,6 +197,7 @@ int ccl_stop_words_info(ccl_stop_words_t csw, int idx, /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab