← Back to branch summary

~ubuntu-branches/ubuntu/trusty/idzebra/trusty-proposed

« back to all changes in this revision

Viewing changes to index/zebrasrv.c

  • Committer: Bazaar Package Importer
  • Author(s): Vincent Danjean
  • Date: 2010-08-18 11:32:49 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20100818113249-3s44jxc3wg0uu1we
Tags: 2.0.44-1
* New Upstream Version
  Many bug fix
* debian/control: bump standard-version (no change needed)
* debian/rules: really remove generated files before build

Show diffs side-by-side

added added

removed removed

Lines of Context:
index/zebrasrv.c
1
1
/* This file is part of the Zebra server.
2
 
   Copyright (C) 1994-2009 Index Data
 
2
   Copyright (C) 1994-2010 Index Data
3
3
 
4
4
Zebra is free software; you can redistribute it and/or modify it under
5
5
the terms of the GNU General Public License as published by the Free
224
224
        se->subqueryId = term_ref_id ? 
225
225
            odr_strdup(r->stream, term_ref_id) : 0;
226
226
            
227
 
        se->fullQuery = odr_intdup(r->stream, 0);
 
227
        se->fullQuery = odr_booldup(r->stream, 0);
228
228
        se->subqueryExpression = 
229
229
            odr_malloc(r->stream, sizeof(Z_QueryExpression));
230
230
        se->subqueryExpression->which = 
516
516
{
517
517
    ZebraHandle zh = (ZebraHandle) handle;
518
518
    
519
 
    yaz_log(YLOG_LOG, "function: %d", *rr->esr->function);
 
519
    yaz_log(YLOG_LOG, "function: " ODR_INT_PRINTF, *rr->esr->function);
520
520
    if (rr->esr->packageName)
521
521
        yaz_log(YLOG_LOG, "packagename: %s", rr->esr->packageName);
522
 
    yaz_log(YLOG_LOG, "Waitaction: %d", *rr->esr->waitAction);
 
522
    yaz_log(YLOG_LOG, "Waitaction: " ODR_INT_PRINTF, *rr->esr->waitAction);
523
523
 
524
524
    if (!rr->esr->taskSpecificParameters)
525
525
    {
566
566
                    yaz_log(YLOG_LOG, "start");
567
567
                    break;
568
568
                default:
569
 
                    yaz_log(YLOG_LOG, " unknown (%d)", *toKeep->action);
 
569
                    yaz_log(YLOG_LOG, " unknown (" ODR_INT_PRINTF ")",
 
570
                            *toKeep->action);
570
571
                }
571
572
            }
572
573
            if (toKeep->databaseName)