Changeset 1067


Ignore:
Timestamp:
2000-04-05T03:02:39+12:00 (24 years ago)
Author:
cs025
Message:

Corba first commit

Location:
branches/corba/gsdl
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • branches/corba/gsdl/Makefile.in

    r993 r1067  
    4646ALLFILES = $(OBJECTS)
    4747
    48 INSTALLDIRS = src/recpt src/txt2db src/db2txt src/hashfile packages/mg
     48INSTALLDIRS = packages/mg src/recpt src/txt2db src/db2txt src/hashfile
    4949
    5050OTHERDIRS = packages/mg lib src/colservr src/recpt src/txt2db src/db2txt src/hashfile
    5151
    5252all:
     53    sed s^XXXX^$(TOPSRC)^ lib/gsdlhome.h.example > lib/gsdlhome.h
     54    mkdir -p bin/$(GSDLOS)
     55
    5356    for odir in $(OTHERDIRS); do \
    5457      echo making $@ in $$odir; \
    … …  
    5760
    5861install:
     62
    5963    for idir in $(INSTALLDIRS); do \
    6064      echo installing $$idir; \
    … …  
    6266    done
    6367
    64 distclean:
     68clean:
    6569    rm -f Makefile config.cache config.h config.log stamp-h
    66     for subdir in $(INSTALLDIRS) $(OTHERDIRS); do \
    67       echo cleaning $@ in $$subdir; \
    68       (cd $$subdir && $(MAKE) distclean) || exit 1; \
    69     done
    70 
    71 clean:
     70    rm lib/gsdlhome.h
    7271    for subdir in $(INSTALLDIRS) $(OTHERDIRS); do \
    7372      echo cleaning $@ in $$subdir; \
    7473      (cd $$subdir && $(MAKE) clean) || exit 1; \
    7574    done
    76 
    7775
    7876# For an explanation of the following Makefile rules, see node

  • branches/corba/gsdl/acconfig.h

    r697 r1067  
    3838#undef USE_FASTCGI
    3939
     40/* Define USE_CORBA if needsbe */
     41#undef USE_CORBA
    4042
    4143
    4244
    43 

  • branches/corba/gsdl/config.h.in

    r998 r1067  
    9999#undef USE_FASTCGI
    100100
     101/* Define USE_CORBA if needsbe */
     102#undef USE_CORBA
     103
    101104/* Define if you have the ftime function.  */
    102105#undef HAVE_FTIME

  • branches/corba/gsdl/configure

    r998 r1067  
    575575fi
    576576
     577
     578USE_CORBA=1
     579cat >> confdefs.h <<\EOF
     580#define USE_CORBA 1
     581EOF
     582
     583
     584
    577585LDFLAGS=
    578586CFLAGS=-O2
    … …  
    582590set dummy gcc; ac_word=$2
    583591echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    584 echo "configure:585: checking for $ac_word" >&5
     592echo "configure:593: checking for $ac_word" >&5
    585593if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    586594  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    612620set dummy cc; ac_word=$2
    613621echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    614 echo "configure:615: checking for $ac_word" >&5
     622echo "configure:623: checking for $ac_word" >&5
    615623if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    616624  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    663671set dummy cl; ac_word=$2
    664672echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    665 echo "configure:666: checking for $ac_word" >&5
     673echo "configure:674: checking for $ac_word" >&5
    666674if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    667675  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    695703
    696704echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
    697 echo "configure:698: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
     705echo "configure:706: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
    698706
    699707ac_ext=c
    … …  
    706714cat > conftest.$ac_ext << EOF
    707715
    708 #line 709 "configure"
     716#line 717 "configure"
    709717#include "confdefs.h"
    710718
    711719main(){return(0);}
    712720EOF
    713 if { (eval echo configure:714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     721if { (eval echo configure:722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    714722  ac_cv_prog_cc_works=yes
    715723  # If we can't run a trivial program, we are probably using a cross compiler.
    … …  
    737745fi
    738746echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
    739 echo "configure:740: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
     747echo "configure:748: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
    740748echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
    741749cross_compiling=$ac_cv_prog_cc_cross
    742750
    743751echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
    744 echo "configure:745: checking whether we are using GNU C" >&5
     752echo "configure:753: checking whether we are using GNU C" >&5
    745753if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    746754  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    751759#endif
    752760EOF
    753 if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
     761if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    754762  ac_cv_prog_gcc=yes
    755763else
    … …  
    770778CFLAGS=
    771779echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
    772 echo "configure:773: checking whether ${CC-cc} accepts -g" >&5
     780echo "configure:781: checking whether ${CC-cc} accepts -g" >&5
    773781if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    774782  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    806814set dummy $ac_prog; ac_word=$2
    807815echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    808 echo "configure:809: checking for $ac_word" >&5
     816echo "configure:817: checking for $ac_word" >&5
    809817if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
    810818  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    838846
    839847echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
    840 echo "configure:841: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
     848echo "configure:849: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
    841849
    842850ac_ext=C
    … …  
    849857cat > conftest.$ac_ext << EOF
    850858
    851 #line 852 "configure"
     859#line 860 "configure"
    852860#include "confdefs.h"
    853861
    854862int main(){return(0);}
    855863EOF
    856 if { (eval echo configure:857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     864if { (eval echo configure:865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    857865  ac_cv_prog_cxx_works=yes
    858866  # If we can't run a trivial program, we are probably using a cross compiler.
    … …  
    880888fi
    881889echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
    882 echo "configure:883: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
     890echo "configure:891: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
    883891echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
    884892cross_compiling=$ac_cv_prog_cxx_cross
    885893
    886894echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
    887 echo "configure:888: checking whether we are using GNU C++" >&5
     895echo "configure:896: checking whether we are using GNU C++" >&5
    888896if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
    889897  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    894902#endif
    895903EOF
    896 if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
     904if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    897905  ac_cv_prog_gxx=yes
    898906else
    … …  
    913921CXXFLAGS=
    914922echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
    915 echo "configure:916: checking whether ${CXX-g++} accepts -g" >&5
     923echo "configure:924: checking whether ${CXX-g++} accepts -g" >&5
    916924if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
    917925  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    944952fi
    945953
    946 for ac_prog in mawk gawk nawk awk
     954for ac_prog in gawk mawk nawk awk
    947955do
    948956# Extract the first word of "$ac_prog", so it can be a program name with args.
    949957set dummy $ac_prog; ac_word=$2
    950958echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    951 echo "configure:952: checking for $ac_word" >&5
     959echo "configure:960: checking for $ac_word" >&5
    952960if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
    953961  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    983991set dummy $ac_prog; ac_word=$2
    984992echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    985 echo "configure:986: checking for $ac_word" >&5
     993echo "configure:994: checking for $ac_word" >&5
    986994if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
    987995  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    10441052# ./install, which can be erroneously created by make from ./install.sh.
    10451053echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
    1046 echo "configure:1047: checking for a BSD compatible install" >&5
     1054echo "configure:1055: checking for a BSD compatible install" >&5
    10471055if test -z "$INSTALL"; then
    10481056if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    … …  
    10971105
    10981106echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
    1099 echo "configure:1100: checking whether ln -s works" >&5
     1107echo "configure:1108: checking whether ln -s works" >&5
    11001108if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    11011109  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    11181126
    11191127echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
    1120 echo "configure:1121: checking whether ${MAKE-make} sets \${MAKE}" >&5
     1128echo "configure:1129: checking whether ${MAKE-make} sets \${MAKE}" >&5
    11211129set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
    11221130if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
    … …  
    11471155set dummy ranlib; ac_word=$2
    11481156echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    1149 echo "configure:1150: checking for $ac_word" >&5
     1157echo "configure:1158: checking for $ac_word" >&5
    11501158if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    11511159  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    11771185
    11781186echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
    1179 echo "configure:1180: checking how to run the C preprocessor" >&5
     1187echo "configure:1188: checking how to run the C preprocessor" >&5
    11801188# On Suns, sometimes $CPP names a directory.
    11811189if test -n "$CPP" && test -d "$CPP"; then
    … …  
    11921200  # not just through cpp.
    11931201  cat > conftest.$ac_ext <<EOF
    1194 #line 1195 "configure"
     1202#line 1203 "configure"
    11951203#include "confdefs.h"
    11961204#include <assert.h>
    … …  
    11981206EOF
    11991207ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1200 { (eval echo configure:1201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1208{ (eval echo configure:1209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    12011209ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    12021210if test -z "$ac_err"; then
    … …  
    12091217  CPP="${CC-cc} -E -traditional-cpp"
    12101218  cat > conftest.$ac_ext <<EOF
    1211 #line 1212 "configure"
     1219#line 1220 "configure"
    12121220#include "confdefs.h"
    12131221#include <assert.h>
    … …  
    12151223EOF
    12161224ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1217 { (eval echo configure:1218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1225{ (eval echo configure:1226: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    12181226ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    12191227if test -z "$ac_err"; then
    … …  
    12261234  CPP="${CC-cc} -nologo -E"
    12271235  cat > conftest.$ac_ext <<EOF
    1228 #line 1229 "configure"
     1236#line 1237 "configure"
    12291237#include "confdefs.h"
    12301238#include <assert.h>
    … …  
    12321240EOF
    12331241ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1234 { (eval echo configure:1235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1242{ (eval echo configure:1243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    12351243ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    12361244if test -z "$ac_err"; then
    … …  
    12571265
    12581266echo $ac_n "checking for AIX""... $ac_c" 1>&6
    1259 echo "configure:1260: checking for AIX" >&5
     1267echo "configure:1268: checking for AIX" >&5
    12601268cat > conftest.$ac_ext <<EOF
    1261 #line 1262 "configure"
     1269#line 1270 "configure"
    12621270#include "confdefs.h"
    12631271#ifdef _AIX
    … …  
    12811289
    12821290echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
    1283 echo "configure:1284: checking for POSIXized ISC" >&5
     1291echo "configure:1292: checking for POSIXized ISC" >&5
    12841292if test -d /etc/conf/kconfig.d &&
    12851293  grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
    … …  
    13031311ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
    13041312echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
    1305 echo "configure:1306: checking for minix/config.h" >&5
     1313echo "configure:1314: checking for minix/config.h" >&5
    13061314if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    13071315  echo $ac_n "(cached) $ac_c" 1>&6
    13081316else
    13091317  cat > conftest.$ac_ext <<EOF
    1310 #line 1311 "configure"
     1318#line 1319 "configure"
    13111319#include "confdefs.h"
    13121320#include <minix/config.h>
    13131321EOF
    13141322ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1315 { (eval echo configure:1316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1323{ (eval echo configure:1324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    13161324ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    13171325if test -z "$ac_err"; then
    … …  
    13511359
    13521360echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
    1353 echo "configure:1354: checking for ${CC-cc} option to accept ANSI C" >&5
     1361echo "configure:1362: checking for ${CC-cc} option to accept ANSI C" >&5
    13541362if eval "test \"`echo '$''{'ac_cv_prog_cc_stdc'+set}'`\" = set"; then
    13551363  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    13671375  CFLAGS="$ac_save_CFLAGS $ac_arg"
    13681376  cat > conftest.$ac_ext <<EOF
    1369 #line 1370 "configure"
     1377#line 1378 "configure"
    13701378#include "confdefs.h"
    13711379#if !defined(__STDC__) || __STDC__ != 1
    … …  
    13791387; return 0; }
    13801388EOF
    1381 if { (eval echo configure:1382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1389if { (eval echo configure:1390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    13821390  rm -rf conftest*
    13831391  ac_cv_prog_cc_stdc="$ac_arg"; break
    … …  
    14001408
    14011409echo $ac_n "checking for function prototypes""... $ac_c" 1>&6
    1402 echo "configure:1403: checking for function prototypes" >&5
     1410echo "configure:1411: checking for function prototypes" >&5
    14031411if test "$ac_cv_prog_cc_stdc" != no; then
    14041412  echo "$ac_t""yes" 1>&6
    … …  
    14141422
    14151423echo $ac_n "checking for working const""... $ac_c" 1>&6
    1416 echo "configure:1417: checking for working const" >&5
     1424echo "configure:1425: checking for working const" >&5
    14171425if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
    14181426  echo $ac_n "(cached) $ac_c" 1>&6
    14191427else
    14201428  cat > conftest.$ac_ext <<EOF
    1421 #line 1422 "configure"
     1429#line 1430 "configure"
    14221430#include "confdefs.h"
    14231431
    … …  
    14681476; return 0; }
    14691477EOF
    1470 if { (eval echo configure:1471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1478if { (eval echo configure:1479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    14711479  rm -rf conftest*
    14721480  ac_cv_c_const=yes
    … …  
    14891497
    14901498echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
    1491 echo "configure:1492: checking for ANSI C header files" >&5
     1499echo "configure:1500: checking for ANSI C header files" >&5
    14921500if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    14931501  echo $ac_n "(cached) $ac_c" 1>&6
    14941502else
    14951503  cat > conftest.$ac_ext <<EOF
    1496 #line 1497 "configure"
     1504#line 1505 "configure"
    14971505#include "confdefs.h"
    14981506#include <stdlib.h>
    … …  
    15021510EOF
    15031511ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1504 { (eval echo configure:1505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1512{ (eval echo configure:1513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    15051513ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    15061514if test -z "$ac_err"; then
    … …  
    15191527  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    15201528cat > conftest.$ac_ext <<EOF
    1521 #line 1522 "configure"
     1529#line 1530 "configure"
    15221530#include "confdefs.h"
    15231531#include <string.h>
    … …  
    15371545  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    15381546cat > conftest.$ac_ext <<EOF
    1539 #line 1540 "configure"
     1547#line 1548 "configure"
    15401548#include "confdefs.h"
    15411549#include <stdlib.h>
    … …  
    15581566else
    15591567  cat > conftest.$ac_ext <<EOF
    1560 #line 1561 "configure"
     1568#line 1569 "configure"
    15611569#include "confdefs.h"
    15621570#include <ctype.h>
    … …  
    15691577
    15701578EOF
    1571 if { (eval echo configure:1572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     1579if { (eval echo configure:1580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    15721580then
    15731581  :
    … …  
    15931601
    15941602echo $ac_n "checking for off_t""... $ac_c" 1>&6
    1595 echo "configure:1596: checking for off_t" >&5
     1603echo "configure:1604: checking for off_t" >&5
    15961604if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
    15971605  echo $ac_n "(cached) $ac_c" 1>&6
    15981606else
    15991607  cat > conftest.$ac_ext <<EOF
    1600 #line 1601 "configure"
     1608#line 1609 "configure"
    16011609#include "confdefs.h"
    16021610#include <sys/types.h>
    … …  
    16261634
    16271635echo $ac_n "checking for size_t""... $ac_c" 1>&6
    1628 echo "configure:1629: checking for size_t" >&5
     1636echo "configure:1637: checking for size_t" >&5
    16291637if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
    16301638  echo $ac_n "(cached) $ac_c" 1>&6
    16311639else
    16321640  cat > conftest.$ac_ext <<EOF
    1633 #line 1634 "configure"
     1641#line 1642 "configure"
    16341642#include "confdefs.h"
    16351643#include <sys/types.h>
    … …  
    16591667
    16601668echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
    1661 echo "configure:1662: checking whether time.h and sys/time.h may both be included" >&5
     1669echo "configure:1670: checking whether time.h and sys/time.h may both be included" >&5
    16621670if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
    16631671  echo $ac_n "(cached) $ac_c" 1>&6
    16641672else
    16651673  cat > conftest.$ac_ext <<EOF
    1666 #line 1667 "configure"
     1674#line 1675 "configure"
    16671675#include "confdefs.h"
    16681676#include <sys/types.h>
    … …  
    16731681; return 0; }
    16741682EOF
    1675 if { (eval echo configure:1676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1683if { (eval echo configure:1684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    16761684  rm -rf conftest*
    16771685  ac_cv_header_time=yes
    … …  
    16941702
    16951703echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
    1696 echo "configure:1697: checking whether struct tm is in sys/time.h or time.h" >&5
     1704echo "configure:1705: checking whether struct tm is in sys/time.h or time.h" >&5
    16971705if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
    16981706  echo $ac_n "(cached) $ac_c" 1>&6
    16991707else
    17001708  cat > conftest.$ac_ext <<EOF
    1701 #line 1702 "configure"
     1709#line 1710 "configure"
    17021710#include "confdefs.h"
    17031711#include <sys/types.h>
    … …  
    17071715; return 0; }
    17081716EOF
    1709 if { (eval echo configure:1710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1717if { (eval echo configure:1718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    17101718  rm -rf conftest*
    17111719  ac_cv_struct_tm=time.h
    … …  
    17301738if test "$ac_cv_prog_cc_stdc" = '-Xc'; then
    17311739cat > conftest.$ac_ext <<EOF
    1732 #line 1733 "configure"
     1740#line 1741 "configure"
    17331741#include "confdefs.h"
    17341742#include <stdio.h>
    … …  
    17381746; return 0; }
    17391747EOF
    1740 if { (eval echo configure:1741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1748if { (eval echo configure:1749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    17411749  :
    17421750else
    … …  
    17511759
    17521760echo $ac_n "checking for main in -lg""... $ac_c" 1>&6
    1753 echo "configure:1754: checking for main in -lg" >&5
     1761echo "configure:1762: checking for main in -lg" >&5
    17541762ac_lib_var=`echo g'_'main | sed 'y%./+-%__p_%'`
    17551763if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    17591767LIBS="-lg  $LIBS"
    17601768cat > conftest.$ac_ext <<EOF
    1761 #line 1762 "configure"
     1769#line 1770 "configure"
    17621770#include "confdefs.h"
    17631771
    … …  
    17661774; return 0; }
    17671775EOF
    1768 if { (eval echo configure:1769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1776if { (eval echo configure:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    17691777  rm -rf conftest*
    17701778  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    17941802
    17951803echo $ac_n "checking for main in -lgdbm""... $ac_c" 1>&6
    1796 echo "configure:1797: checking for main in -lgdbm" >&5
     1804echo "configure:1805: checking for main in -lgdbm" >&5
    17971805ac_lib_var=`echo gdbm'_'main | sed 'y%./+-%__p_%'`
    17981806if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    18021810LIBS="-lgdbm  $LIBS"
    18031811cat > conftest.$ac_ext <<EOF
    1804 #line 1805 "configure"
     1812#line 1813 "configure"
    18051813#include "confdefs.h"
    18061814
    … …  
    18091817; return 0; }
    18101818EOF
    1811 if { (eval echo configure:1812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1819if { (eval echo configure:1820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    18121820  rm -rf conftest*
    18131821  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    18371845
    18381846echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
    1839 echo "configure:1840: checking for main in -lm" >&5
     1847echo "configure:1848: checking for main in -lm" >&5
    18401848ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
    18411849if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    18451853LIBS="-lm  $LIBS"
    18461854cat > conftest.$ac_ext <<EOF
    1847 #line 1848 "configure"
     1855#line 1856 "configure"
    18481856#include "confdefs.h"
    18491857
    … …  
    18521860; return 0; }
    18531861EOF
    1854 if { (eval echo configure:1855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1862if { (eval echo configure:1863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    18551863  rm -rf conftest*
    18561864  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    18801888
    18811889echo $ac_n "checking for main in -lstdc++""... $ac_c" 1>&6
    1882 echo "configure:1883: checking for main in -lstdc++" >&5
     1890echo "configure:1891: checking for main in -lstdc++" >&5
    18831891ac_lib_var=`echo stdc++'_'main | sed 'y%./+-%__p_%'`
    18841892if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    18881896LIBS="-lstdc++  $LIBS"
    18891897cat > conftest.$ac_ext <<EOF
    1890 #line 1891 "configure"
     1898#line 1899 "configure"
    18911899#include "confdefs.h"
    18921900
    … …  
    18951903; return 0; }
    18961904EOF
    1897 if { (eval echo configure:1898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1905if { (eval echo configure:1906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    18981906  rm -rf conftest*
    18991907  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    19231931
    19241932echo $ac_n "checking for main in -lcrypt""... $ac_c" 1>&6
    1925 echo "configure:1926: checking for main in -lcrypt" >&5
     1933echo "configure:1934: checking for main in -lcrypt" >&5
    19261934ac_lib_var=`echo crypt'_'main | sed 'y%./+-%__p_%'`
    19271935if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    19311939LIBS="-lcrypt  $LIBS"
    19321940cat > conftest.$ac_ext <<EOF
    1933 #line 1934 "configure"
     1941#line 1942 "configure"
    19341942#include "confdefs.h"
    19351943
    … …  
    19381946; return 0; }
    19391947EOF
    1940 if { (eval echo configure:1941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1948if { (eval echo configure:1949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    19411949  rm -rf conftest*
    19421950  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    19721980ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    19731981echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
    1974 echo "configure:1975: checking for $ac_hdr that defines DIR" >&5
     1982echo "configure:1983: checking for $ac_hdr that defines DIR" >&5
    19751983if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
    19761984  echo $ac_n "(cached) $ac_c" 1>&6
    19771985else
    19781986  cat > conftest.$ac_ext <<EOF
    1979 #line 1980 "configure"
     1987#line 1988 "configure"
    19801988#include "confdefs.h"
    19811989#include <sys/types.h>
    … …  
    19851993; return 0; }
    19861994EOF
    1987 if { (eval echo configure:1988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1995if { (eval echo configure:1996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    19881996  rm -rf conftest*
    19891997  eval "ac_cv_header_dirent_$ac_safe=yes"
    … …  
    20102018if test $ac_header_dirent = dirent.h; then
    20112019echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
    2012 echo "configure:2013: checking for opendir in -ldir" >&5
     2020echo "configure:2021: checking for opendir in -ldir" >&5
    20132021ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
    20142022if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    20182026LIBS="-ldir  $LIBS"
    20192027cat > conftest.$ac_ext <<EOF
    2020 #line 2021 "configure"
     2028#line 2029 "configure"
    20212029#include "confdefs.h"
    20222030/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    20292037; return 0; }
    20302038EOF
    2031 if { (eval echo configure:2032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2039if { (eval echo configure:2040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    20322040  rm -rf conftest*
    20332041  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    20512059else
    20522060echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
    2053 echo "configure:2054: checking for opendir in -lx" >&5
     2061echo "configure:2062: checking for opendir in -lx" >&5
    20542062ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
    20552063if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    20592067LIBS="-lx  $LIBS"
    20602068cat > conftest.$ac_ext <<EOF
    2061 #line 2062 "configure"
     2069#line 2070 "configure"
    20622070#include "confdefs.h"
    20632071/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    20702078; return 0; }
    20712079EOF
    2072 if { (eval echo configure:2073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2080if { (eval echo configure:2081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    20732081  rm -rf conftest*
    20742082  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    20932101
    20942102echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
    2095 echo "configure:2096: checking for ANSI C header files" >&5
     2103echo "configure:2104: checking for ANSI C header files" >&5
    20962104if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    20972105  echo $ac_n "(cached) $ac_c" 1>&6
    20982106else
    20992107  cat > conftest.$ac_ext <<EOF
    2100 #line 2101 "configure"
     2108#line 2109 "configure"
    21012109#include "confdefs.h"
    21022110#include <stdlib.h>
    … …  
    21062114EOF
    21072115ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2108 { (eval echo configure:2109: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2116{ (eval echo configure:2117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    21092117ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    21102118if test -z "$ac_err"; then
    … …  
    21232131  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    21242132cat > conftest.$ac_ext <<EOF
    2125 #line 2126 "configure"
     2133#line 2134 "configure"
    21262134#include "confdefs.h"
    21272135#include <string.h>
    … …  
    21412149  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    21422150cat > conftest.$ac_ext <<EOF
    2143 #line 2144 "configure"
     2151#line 2152 "configure"
    21442152#include "confdefs.h"
    21452153#include <stdlib.h>
    … …  
    21622170else
    21632171  cat > conftest.$ac_ext <<EOF
    2164 #line 2165 "configure"
     2172#line 2173 "configure"
    21652173#include "confdefs.h"
    21662174#include <ctype.h>
    … …  
    21732181
    21742182EOF
    2175 if { (eval echo configure:2176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     2183if { (eval echo configure:2184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    21762184then
    21772185  :
    … …  
    22002208ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    22012209echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    2202 echo "configure:2203: checking for $ac_hdr" >&5
     2210echo "configure:2211: checking for $ac_hdr" >&5
    22032211if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    22042212  echo $ac_n "(cached) $ac_c" 1>&6
    22052213else
    22062214  cat > conftest.$ac_ext <<EOF
    2207 #line 2208 "configure"
     2215#line 2216 "configure"
    22082216#include "confdefs.h"
    22092217#include <$ac_hdr>
    22102218EOF
    22112219ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2212 { (eval echo configure:2213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2220{ (eval echo configure:2221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    22132221ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    22142222if test -z "$ac_err"; then
    … …  
    22372245
    22382246cat > conftest.$ac_ext <<EOF
    2239 #line 2240 "configure"
     2247#line 2248 "configure"
    22402248#include "confdefs.h"
    22412249#include <stdio.h>
    … …  
    22522260
    22532261cat > conftest.$ac_ext <<EOF
    2254 #line 2255 "configure"
     2262#line 2263 "configure"
    22552263#include "confdefs.h"
    22562264#include <stdio.h>
    … …  
    22672275
    22682276cat > conftest.$ac_ext <<EOF
    2269 #line 2270 "configure"
     2277#line 2278 "configure"
    22702278#include "confdefs.h"
    22712279#include <sys/procfs.h>
    … …  
    22852293# for constant arguments.  Useless!
    22862294echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
    2287 echo "configure:2288: checking for working alloca.h" >&5
     2295echo "configure:2296: checking for working alloca.h" >&5
    22882296if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    22892297  echo $ac_n "(cached) $ac_c" 1>&6
    22902298else
    22912299  cat > conftest.$ac_ext <<EOF
    2292 #line 2293 "configure"
     2300#line 2301 "configure"
    22932301#include "confdefs.h"
    22942302#include <alloca.h>
    … …  
    22972305; return 0; }
    22982306EOF
    2299 if { (eval echo configure:2300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2307if { (eval echo configure:2308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    23002308  rm -rf conftest*
    23012309  ac_cv_header_alloca_h=yes
    … …  
    23182326
    23192327echo $ac_n "checking for alloca""... $ac_c" 1>&6
    2320 echo "configure:2321: checking for alloca" >&5
     2328echo "configure:2329: checking for alloca" >&5
    23212329if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    23222330  echo $ac_n "(cached) $ac_c" 1>&6
    23232331else
    23242332  cat > conftest.$ac_ext <<EOF
    2325 #line 2326 "configure"
     2333#line 2334 "configure"
    23262334#include "confdefs.h"
    23272335
    … …  
    23512359; return 0; }
    23522360EOF
    2353 if { (eval echo configure:2354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2361if { (eval echo configure:2362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    23542362  rm -rf conftest*
    23552363  ac_cv_func_alloca_works=yes
    … …  
    23832391
    23842392echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
    2385 echo "configure:2386: checking whether alloca needs Cray hooks" >&5
     2393echo "configure:2394: checking whether alloca needs Cray hooks" >&5
    23862394if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    23872395  echo $ac_n "(cached) $ac_c" 1>&6
    23882396else
    23892397  cat > conftest.$ac_ext <<EOF
    2390 #line 2391 "configure"
     2398#line 2399 "configure"
    23912399#include "confdefs.h"
    23922400#if defined(CRAY) && ! defined(CRAY2)
    … …  
    24132421for ac_func in _getb67 GETB67 getb67; do
    24142422  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    2415 echo "configure:2416: checking for $ac_func" >&5
     2423echo "configure:2424: checking for $ac_func" >&5
    24162424if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    24172425  echo $ac_n "(cached) $ac_c" 1>&6
    24182426else
    24192427  cat > conftest.$ac_ext <<EOF
    2420 #line 2421 "configure"
     2428#line 2429 "configure"
    24212429#include "confdefs.h"
    24222430/* System header to define __stub macros and hopefully few prototypes,
    … …  
    24412449; return 0; }
    24422450EOF
    2443 if { (eval echo configure:2444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2451if { (eval echo configure:2452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    24442452  rm -rf conftest*
    24452453  eval "ac_cv_func_$ac_func=yes"
    … …  
    24682476
    24692477echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
    2470 echo "configure:2471: checking stack direction for C alloca" >&5
     2478echo "configure:2479: checking stack direction for C alloca" >&5
    24712479if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    24722480  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    24762484else
    24772485  cat > conftest.$ac_ext <<EOF
    2478 #line 2479 "configure"
     2486#line 2487 "configure"
    24792487#include "confdefs.h"
    24802488find_stack_direction ()
    … …  
    24952503}
    24962504EOF
    2497 if { (eval echo configure:2498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     2505if { (eval echo configure:2506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    24982506then
    24992507  ac_cv_c_stack_direction=1
    … …  
    25182526if test $ac_cv_prog_gcc = yes; then
    25192527    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
    2520 echo "configure:2521: checking whether ${CC-cc} needs -traditional" >&5
     2528echo "configure:2529: checking whether ${CC-cc} needs -traditional" >&5
    25212529if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
    25222530  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    25242532    ac_pattern="Autoconf.*'x'"
    25252533  cat > conftest.$ac_ext <<EOF
    2526 #line 2527 "configure"
     2534#line 2535 "configure"
    25272535#include "confdefs.h"
    25282536#include <sgtty.h>
    … …  
    25422550  if test $ac_cv_prog_gcc_traditional = no; then
    25432551    cat > conftest.$ac_ext <<EOF
    2544 #line 2545 "configure"
     2552#line 2553 "configure"
    25452553#include "confdefs.h"
    25462554#include <termio.h>
    … …  
    25642572
    25652573echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
    2566 echo "configure:2567: checking return type of signal handlers" >&5
     2574echo "configure:2575: checking return type of signal handlers" >&5
    25672575if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    25682576  echo $ac_n "(cached) $ac_c" 1>&6
    25692577else
    25702578  cat > conftest.$ac_ext <<EOF
    2571 #line 2572 "configure"
     2579#line 2580 "configure"
    25722580#include "confdefs.h"
    25732581#include <sys/types.h>
    … …  
    25862594; return 0; }
    25872595EOF
    2588 if { (eval echo configure:2589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2596if { (eval echo configure:2597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    25892597  rm -rf conftest*
    25902598  ac_cv_type_signal=void
    … …  
    26052613
    26062614echo $ac_n "checking for vprintf""... $ac_c" 1>&6
    2607 echo "configure:2608: checking for vprintf" >&5
     2615echo "configure:2616: checking for vprintf" >&5
    26082616if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
    26092617  echo $ac_n "(cached) $ac_c" 1>&6
    26102618else
    26112619  cat > conftest.$ac_ext <<EOF
    2612 #line 2613 "configure"
     2620#line 2621 "configure"
    26132621#include "confdefs.h"
    26142622/* System header to define __stub macros and hopefully few prototypes,
    … …  
    26332641; return 0; }
    26342642EOF
    2635 if { (eval echo configure:2636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2643if { (eval echo configure:2644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    26362644  rm -rf conftest*
    26372645  eval "ac_cv_func_vprintf=yes"
    … …  
    26572665if test "$ac_cv_func_vprintf" != yes; then
    26582666echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
    2659 echo "configure:2660: checking for _doprnt" >&5
     2667echo "configure:2668: checking for _doprnt" >&5
    26602668if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
    26612669  echo $ac_n "(cached) $ac_c" 1>&6
    26622670else
    26632671  cat > conftest.$ac_ext <<EOF
    2664 #line 2665 "configure"
     2672#line 2673 "configure"
    26652673#include "confdefs.h"
    26662674/* System header to define __stub macros and hopefully few prototypes,
    … …  
    26852693; return 0; }
    26862694EOF
    2687 if { (eval echo configure:2688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2695if { (eval echo configure:2696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    26882696  rm -rf conftest*
    26892697  eval "ac_cv_func__doprnt=yes"
    … …  
    27122720do
    27132721echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    2714 echo "configure:2715: checking for $ac_func" >&5
     2722echo "configure:2723: checking for $ac_func" >&5
    27152723if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    27162724  echo $ac_n "(cached) $ac_c" 1>&6
    27172725else
    27182726  cat > conftest.$ac_ext <<EOF
    2719 #line 2720 "configure"
     2727#line 2728 "configure"
    27202728#include "confdefs.h"
    27212729/* System header to define __stub macros and hopefully few prototypes,
    … …  
    27402748; return 0; }
    27412749EOF
    2742 if { (eval echo configure:2743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2750if { (eval echo configure:2751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    27432751  rm -rf conftest*
    27442752  eval "ac_cv_func_$ac_func=yes"
    … …  
    27672775do
    27682776echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    2769 echo "configure:2770: checking for $ac_func" >&5
     2777echo "configure:2778: checking for $ac_func" >&5
    27702778if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    27712779  echo $ac_n "(cached) $ac_c" 1>&6
    27722780else
    27732781  cat > conftest.$ac_ext <<EOF
    2774 #line 2775 "configure"
     2782#line 2783 "configure"
    27752783#include "confdefs.h"
    27762784/* System header to define __stub macros and hopefully few prototypes,
    … …  
    27952803; return 0; }
    27962804EOF
    2797 if { (eval echo configure:2798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2805if { (eval echo configure:2806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    27982806  rm -rf conftest*
    27992807  eval "ac_cv_func_$ac_func=yes"
    … …  
    28262834# ---------------------------------------------------------------------------
    28272835echo $ac_n "checking for HP-UX needing gmalloc""... $ac_c" 1>&6
    2828 echo "configure:2829: checking for HP-UX needing gmalloc" >&5
     2836echo "configure:2837: checking for HP-UX needing gmalloc" >&5
    28292837if test "`(uname -s) 2> /dev/null`" = 'HP-UX'; then
    28302838  echo "$ac_t""yes" 1>&6
    … …  
    28392847do
    28402848echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    2841 echo "configure:2842: checking for $ac_func" >&5
     2849echo "configure:2850: checking for $ac_func" >&5
    28422850if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    28432851  echo $ac_n "(cached) $ac_c" 1>&6
    28442852else
    28452853  cat > conftest.$ac_ext <<EOF
    2846 #line 2847 "configure"
     2854#line 2855 "configure"
    28472855#include "confdefs.h"
    28482856/* System header to define __stub macros and hopefully few prototypes,
    … …  
    28672875; return 0; }
    28682876EOF
    2869 if { (eval echo configure:2870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2877if { (eval echo configure:2878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    28702878  rm -rf conftest*
    28712879  eval "ac_cv_func_$ac_func=yes"
    … …  
    28942902
    28952903echo $ac_n "checking if malloc debugging is wanted""... $ac_c" 1>&6
    2896 echo "configure:2897: checking if malloc debugging is wanted" >&5
     2904echo "configure:2905: checking if malloc debugging is wanted" >&5
    28972905# Check whether --with-dmalloc or --without-dmalloc was given.
    28982906if test "${with_dmalloc+set}" = set; then
    … …  
    29152923
    29162924echo $ac_n "checking which of rx or regex is wanted""... $ac_c" 1>&6
    2917 echo "configure:2918: checking which of rx or regex is wanted" >&5
     2925echo "configure:2926: checking which of rx or regex is wanted" >&5
    29182926# Check whether --with-regex or --without-regex was given.
    29192927if test "${with_regex+set}" = set; then
    … …  
    29332941  echo "$ac_t""rx" 1>&6
    29342942  echo $ac_n "checking for re_rx_search""... $ac_c" 1>&6
    2935 echo "configure:2936: checking for re_rx_search" >&5
     2943echo "configure:2944: checking for re_rx_search" >&5
    29362944if eval "test \"`echo '$''{'ac_cv_func_re_rx_search'+set}'`\" = set"; then
    29372945  echo $ac_n "(cached) $ac_c" 1>&6
    29382946else
    29392947  cat > conftest.$ac_ext <<EOF
    2940 #line 2941 "configure"
     2948#line 2949 "configure"
    29412949#include "confdefs.h"
    29422950/* System header to define __stub macros and hopefully few prototypes,
    … …  
    29612969; return 0; }
    29622970EOF
    2963 if { (eval echo configure:2964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2971if { (eval echo configure:2972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    29642972  rm -rf conftest*
    29652973  eval "ac_cv_func_re_rx_search=yes"
    … …  
    30013009
    30023010echo $ac_n "checking "that the GDBM library is available"""... $ac_c" 1>&6
    3003 echo "configure:3004: checking "that the GDBM library is available"" >&5
     3011echo "configure:3012: checking "that the GDBM library is available"" >&5
    30043012cat > conftest.$ac_ext <<EOF
    3005 #line 3006 "configure"
     3013#line 3014 "configure"
    30063014#include "confdefs.h"
    30073015#include <gdbm.h>
    … …  
    30113019; return 0; }
    30123020EOF
    3013 if { (eval echo configure:3014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     3021if { (eval echo configure:3022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    30143022  rm -rf conftest*
    30153023  success=yes
    … …  
    30283036
    30293037echo $ac_n "checking "that Perl 5 is available"""... $ac_c" 1>&6
    3030 echo "configure:3031: checking "that Perl 5 is available"" >&5
     3038echo "configure:3039: checking "that Perl 5 is available"" >&5
    30313039success="no"
    30323040pl_path="$PATH"
    … …  
    30583066success=no
    30593067echo $ac_n "checking "whether STL library has known faults"""... $ac_c" 1>&6
    3060 echo "configure:3061: checking "whether STL library has known faults"" >&5
     3068echo "configure:3069: checking "whether STL library has known faults"" >&5
    30613069
    30623070cat > conftest.$ac_ext <<EOF
    3063 #line 3064 "configure"
     3071#line 3072 "configure"
    30643072#include "confdefs.h"
    30653073#include <vector>
    … …  
    30693077; return 0; }
    30703078EOF
    3071 if { (eval echo configure:3072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     3079if { (eval echo configure:3080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    30723080  rm -rf conftest*
    30733081  success=yes
    … …  
    30803088if test $success = "no"; then
    30813089cat > conftest.$ac_ext <<EOF
    3082 #line 3083 "configure"
     3090#line 3091 "configure"
    30833091#include "confdefs.h"
    30843092#include <vector.h>
    … …  
    30883096; return 0; }
    30893097EOF
    3090 if { (eval echo configure:3091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     3098if { (eval echo configure:3099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    30913099  rm -rf conftest*
    30923100  success="yes"
    … …  
    31003108if test $success = "no"; then
    31013109cat > conftest.$ac_ext <<EOF
    3102 #line 3103 "configure"
     3110#line 3111 "configure"
    31033111#include "confdefs.h"
    31043112#include <ospace\\std\\vector>
    … …  
    31083116; return 0; }
    31093117EOF
    3110 if { (eval echo configure:3111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     3118if { (eval echo configure:3119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    31113119  rm -rf conftest*
    31123120  success="yes"
    … …  
    31293137
    31303138echo $ac_n "checking for HP-UX needing gmalloc""... $ac_c" 1>&6
    3131 echo "configure:3132: checking for HP-UX needing gmalloc" >&5
     3139echo "configure:3140: checking for HP-UX needing gmalloc" >&5
    31323140if test "`(uname -s) 2> /dev/null`" = 'HP-UX'; then
    31333141  echo "$ac_t""yes" 1>&6
    … …  
    31423150do
    31433151echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    3144 echo "configure:3145: checking for $ac_func" >&5
     3152echo "configure:3153: checking for $ac_func" >&5
    31453153if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    31463154  echo $ac_n "(cached) $ac_c" 1>&6
    31473155else
    31483156  cat > conftest.$ac_ext <<EOF
    3149 #line 3150 "configure"
     3157#line 3158 "configure"
    31503158#include "confdefs.h"
    31513159/* System header to define __stub macros and hopefully few prototypes,
    … …  
    31733181; return 0; }
    31743182EOF
    3175 if { (eval echo configure:3176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     3183if { (eval echo configure:3184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    31763184  rm -rf conftest*
    31773185  eval "ac_cv_func_$ac_func=yes"
    … …  
    32003208
    32013209echo $ac_n "checking if malloc debugging is wanted""... $ac_c" 1>&6
    3202 echo "configure:3203: checking if malloc debugging is wanted" >&5
     3210echo "configure:3211: checking if malloc debugging is wanted" >&5
    32033211# Check whether --with-dmalloc or --without-dmalloc was given.
    32043212if test "${with_dmalloc+set}" = set; then
    … …  
    32213229
    32223230echo $ac_n "checking which of rx or regex is wanted""... $ac_c" 1>&6
    3223 echo "configure:3224: checking which of rx or regex is wanted" >&5
     3231echo "configure:3232: checking which of rx or regex is wanted" >&5
    32243232# Check whether --with-regex or --without-regex was given.
    32253233if test "${with_regex+set}" = set; then
    … …  
    32393247  echo "$ac_t""rx" 1>&6
    32403248  echo $ac_n "checking for re_rx_search""... $ac_c" 1>&6
    3241 echo "configure:3242: checking for re_rx_search" >&5
     3249echo "configure:3250: checking for re_rx_search" >&5
    32423250if eval "test \"`echo '$''{'ac_cv_func_re_rx_search'+set}'`\" = set"; then
    32433251  echo $ac_n "(cached) $ac_c" 1>&6
    32443252else
    32453253  cat > conftest.$ac_ext <<EOF
    3246 #line 3247 "configure"
     3254#line 3255 "configure"
    32473255#include "confdefs.h"
    32483256/* System header to define __stub macros and hopefully few prototypes,
    … …  
    32703278; return 0; }
    32713279EOF
    3272 if { (eval echo configure:3273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     3280if { (eval echo configure:3281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    32733281  rm -rf conftest*
    32743282  eval "ac_cv_func_re_rx_search=yes"
    … …  
    34403448s%@VERSION@%$VERSION%g
    34413449s%@USE_FASTCGI@%$USE_FASTCGI%g
     3450s%@USE_CORBA@%$USE_CORBA%g
    34423451s%@CC@%$CC%g
    34433452s%@CXX@%$CXX%g

  • branches/corba/gsdl/configure.in

    r998 r1067  
    1111AC_SUBST(VERSION)
    1212
     13dnl
     14dnl Set use of fast cgi
     15dnl
    1316USE_FASTCGI=0
    1417if test USE_FASTCGI = 1; then
    … …  
    1619AC_SUBST(USE_FASTCGI)
    1720fi
     21
     22
     23dnl
     24dnl Set use of corba
     25dnl
     26USE_CORBA=1
     27AC_DEFINE(USE_CORBA)
     28AC_SUBST(USE_CORBA, $(USE_CORBA))
    1829
    1930dnl Checks for programs.

  • branches/corba/gsdl/lib/Makefile.in

    r992 r1067  
    2828AR = ar
    2929CC = @CC@
     30CPP = @CXX@
    3031CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual
     32MCFLAGS = @CFLAGS@ -Wall -Wunused
    3133DEFS = @DEFS@
    32 INCLUDES = -I../packages/mg/lib
     34INCLUDES = -I../packages/mg/lib -I..
     35MINCLUDES = -I. -I../packages/mg/lib -I..
    3336RANLIB = @RANLIB@
     37USE_CORBA = @USE_CORBA@
    3438
    3539COMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
     40CPPCOMPILE = $(CPP) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
     41
     42ifneq ($(USE_CORBA), 0)
     43MCOMPILE = mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
     44else
     45MCOMPILE = $(COMPILE)
     46endif
    3647
    3748.SUFFIXES:
    … …  
    4253.SUFFIXES: .cpp .o
    4354.cpp.o:
    44     $(COMPILE) $<
     55    $(CPPCOMPILE) $<
     56
     57.SUFFIXES: .mpp .o
     58.mpp.o:
     59    $(MCOMPILE) $<
    4560
    4661
     62ifneq ($(USE_CORBA), 0)
     63CORBAHEADERS = \
     64  corbaconv_text_t.h corbatext_t.h
     65CORBASOURCES = \
     66  corbaiface.mpp    corbatext_t.mpp  corbaconv_text_t.mpp
     67CORBAOBJECTS = \
     68  corbaiface.o      corbatext_t.o    corbaconv_text_t.o
     69else
     70CORBAHEADERS =
     71CORBASOURCE =
     72CORBAOBJECTS =
     73endif
     74
    4775HEADERS = \
    48   cfgread.h      fileutil.h     gsdlunicode.h  text_t.h \
    49   display.h      gsdlconf.h     gsdltimes.h    gsdltools.h
     76  cfgread.h      fileutil.h     gsdlunicode.h  gsdltools.h text_t.h \
     77  display.h      gsdlconf.h     gsdltimes.h    cnfgable.h  cnfgator.h \
     78  $(CORBAHEADERS)
     79
    5080
    5181SOURCES = \
    52   cfgread.cpp      fileutil.cpp     text_t.cpp \
    53   display.cpp      gsdlunicode.cpp  gsdltimes.cpp  gsdltools.cpp
     82  cfgread.cpp      fileutil.cpp     text_t.cpp     cnfgable.cpp \
     83  display.cpp      gsdlunicode.cpp  gsdltimes.cpp  gsdltools.cpp \
     84  cnfgator.cpp     $(CORBASOURCES)
    5485
    5586OBJECTS = \
    56   cfgread.o        fileutil.o       text_t.o   \
    57   display.o        gsdlunicode.o    gsdltimes.o  gsdltools.o
     87  cfgread.o        fileutil.o       text_t.o     cnfgable.o \
     88  display.o        gsdlunicode.o    gsdltimes.o  gsdltools.o \
     89  cnfgator.o       $(CORBAOBJECTS)
    5890
    5991
    6092all: gsdllib.a
    6193
     94corbaiface.mpp: corbaiface.idl
     95    idl --c++-suffix=mpp $?
    6296
    6397GSDLLIBOBJECTS = $(OBJECTS)
    … …  
    68102    $(RANLIB) gsdllib.a
    69103
    70 distclean:
    71     rm -f $(OBJECTS) gsdllib.a Makefile
    72 
    73104clean:
    74105    rm -f $(OBJECTS) gsdllib.a
    … …  
    78109depend:
    79110    makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES)
     111
     112
     113
     114

  • branches/corba/gsdl/lib/display.cpp

    r995 r1067  
    2828/*
    2929   $Log$
     30   Revision 1.17.2.1  2000/04/04 15:02:28  cs025
     31   Corba first commit
     32
    3033   Revision 1.17  2000/02/29 21:00:38  sjboddie
    3134   fixed some compiler warnings
    … …  
    16251628    }
    16261629
     1630  // GRB: deal with remaining code properly as it faults
     1631  return false;
     1632
    16271633  if (logout != NULL) {
    16281634    (*logout) << text_t2ascii << "Warning: _" <<

  • branches/corba/gsdl/lib/text_t.cpp

    r665 r1067  
    2828/*
    2929   $Log$
     30   Revision 1.15.2.1  2000/04/04 15:02:29  cs025
     31   Corba first commit
     32
    3033   Revision 1.15  1999/10/14 22:52:39  sjboddie
    3134   joinchar can join using text_t string now too
    … …  
    7578
    7679 */
    77 
    7880
    7981#include "text_t.h"
    … …  
    9193#endif
    9294
     95#ifdef HAVE_CONFIG_H
     96# ifdef __WIN32__
     97#  include "WIN32cfg.h"
     98# else
     99#  include "config.h"
     100# endif
     101#endif
     102
    93103
    94104#include "unitool.h"
    … …  
    117127  appendcstr (s);
    118128}
     129
    119130
    120131void text_t::append (const text_t &t)

  • branches/corba/gsdl/lib/text_t.h

    r665 r1067  
    9999  unsigned short getencoding () {return encoding;};
    100100
     101  usvector& text_as_usvector() { return text ; };
     102  const usvector& text_as_usvector() const { return text ; };
     103
    101104  // basic container support
    102105  iterator begin () {return text.begin();}

  • branches/corba/gsdl/packages/mg/src/text/bool_parser.c

    r531 r1067  
    1 #ifndef lint
    2 static char yysccsid[] = "@(#)yaccpar   1.9 (Berkeley) 02/21/93";
    3 #endif
    4 #define YYBYACC 1
    5 #define YYMAJOR 1
    6 #define YYMINOR 9
    7 #define yyclearin (yychar=(-1))
    8 #define yyerrok (yyerrflag=0)
    9 #define YYRECOVERING (yyerrflag!=0)
    10 #define YYPREFIX "yy"
    11 #line 25 "bool_parser.y"
     1
     2/*  A Bison parser, made from bool_parser.y
     3 by  GNU Bison version 1.27
     4  */
     5
     6#define YYBISON 1  /* Identify Bison output.  */
     7
     8#define TERM    257
     9
     10#line 24 "bool_parser.y"
     11
    1212 
    1313#include "sysfuncs.h"
    … …  
    4848static u_long invf_ptr;
    4949static u_long invf_len;
    50 #line 65 "bool_parser.y"
     50
     51#line 66 "bool_parser.y"
    5152typedef union {
    5253  char *text;
    5354  bool_tree_node *node;
    5455} YYSTYPE;
    55 #line 55 "y.tab.c"
    56 #define TERM 257
    57 #define YYERRCODE 256
    58 short yylhs[] = {                                        -1,
    59     0,    1,    1,    1,    1,    2,    2,    3,    3,    3,
    60     4,    4,
    61 };
    62 short yylen[] = {                                         2,
    63     1,    1,    3,    1,    1,    1,    2,    3,    2,    1,
    64     3,    1,
    65 };
    66 short yydefred[] = {                                      0,
    67     2,    0,    4,    5,    0,    0,    6,   10,    0,    0,
    68     0,    7,    0,    9,    0,    3,    8,    0,
    69 };
    70 short yydgoto[] = {                                       6,
    71     7,    8,    9,   10,
    72 };
    73 short yysindex[] = {                                    -32,
    74     0,  -32,    0,    0,  -32,    0,    0,    0,  -33, -118,
    75   -37,    0,  -32,    0,  -32,    0,    0,  -33,
    76 };
    77 short yyrindex[] = {                                      0,
    78     0,    0,    0,    0,    0,    0,    0,    0,    2,   12,
    79     0,    0,    0,    0,    0,    0,    0,    3,
    80 };
    81 short yygindex[] = {                                      0,
    82     0,    6,   -2,   14,
    83 };
    84 #define YYTABLESIZE 225
    85 short yytable[] = {                                       5,
    86     5,   12,   11,   16,   13,   15,    2,    2,    3,    3,
    87    12,    1,   18,    0,   14,   11,    0,    0,   17,    0,
    88     0,    0,    0,   14,    0,    0,    0,    0,    0,    0,
    89     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    90     0,    0,   12,   11,    0,    0,    0,    0,    0,    0,
    91     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    92     0,    4,    4,    0,    0,    0,    0,    0,    0,    0,
    93     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    94     0,    0,    0,    0,    0,    0,   15,    0,    0,    0,
    95     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    96     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    97     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    98     0,    0,    0,    0,    0,   12,   11,    0,    0,    0,
    99     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    100     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    101     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    102     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    103     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    104     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    105     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    106     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    107     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
    108     0,    0,    0,    1,    1,
    109 };
    110 short yycheck[] = {                                      33,
    111    33,    0,    0,   41,   38,  124,   40,   40,   42,   42,
    112     5,    0,   15,   -1,    9,    2,   -1,   -1,   13,   -1,
    113    -1,   -1,   -1,   18,   -1,   -1,   -1,   -1,   -1,   -1,
    114    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    115    -1,   -1,   41,   41,   -1,   -1,   -1,   -1,   -1,   -1,
    116    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    117    -1,   95,   95,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    118    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    119    -1,   -1,   -1,   -1,   -1,   -1,  124,   -1,   -1,   -1,
    120    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    121    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    122    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    123    -1,   -1,   -1,   -1,   -1,  124,  124,   -1,   -1,   -1,
    124    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    125    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    126    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    127    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    128    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    129    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    130    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    131    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    132    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    133    -1,   -1,   -1,  257,  257,
    134 };
    135 #define YYFINAL 6
    136 #ifndef YYDEBUG
    137 #define YYDEBUG 0
    138 #endif
    139 #define YYMAXTOKEN 257
    140 #if YYDEBUG
    141 char *yyname[] = {
    142 "end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
    143 "'!'",0,0,0,0,"'&'",0,"'('","')'","'*'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
    144 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"'_'",0,0,0,0,0,
    145 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"'|'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,
    146 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
    147 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
    148 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
    149 "TERM",
    150 };
    151 char *yyrule[] = {
    152 "$accept : query",
    153 "query : or",
    154 "term : TERM",
    155 "term : '(' or ')'",
    156 "term : '*'",
    157 "term : '_'",
    158 "not : term",
    159 "not : '!' not",
    160 "and : and '&' not",
    161 "and : and not",
    162 "and : not",
    163 "or : or '|' and",
    164 "or : and",
    165 };
    166 #endif
    167 #ifdef YYSTACKSIZE
     56#include <stdio.h>
     57
     58#ifndef __cplusplus
     59#ifndef __STDC__
     60#define const
     61#endif
     62#endif
     63
     64
     65
     66#define YYFINAL     20
     67#define YYFLAG      -32768
     68#define YYNTBASE    11
     69
     70#define YYTRANSLATE(x) ((unsigned)(x) <= 257 ? yytranslate[x] : 16)
     71
     72static const char yytranslate[] = {     0,
     73     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     74     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     75     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     76     2,     2,     8,     2,     2,     2,     2,     9,     2,     4,
     77     5,     6,     2,     2,     2,     2,     2,     2,     2,     2,
     78     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     79     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     80     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     81     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     82     2,     2,     2,     2,     7,     2,     2,     2,     2,     2,
     83     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     84     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     85     2,     2,     2,    10,     2,     2,     2,     2,     2,     2,
     86     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     87     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     88     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     89     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     90     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     91     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     92     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     93     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     94     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     95     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     96     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     97     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
     98     2,     2,     2,     2,     2,     1,     3
     99};
     100
     101#if YYDEBUG != 0
     102static const short yyprhs[] = {     0,
     103     0,     2,     4,     8,    10,    12,    14,    17,    21,    24,
     104    26,    30
     105};
     106
     107static const short yyrhs[] = {    15,
     108     0,     3,     0,     4,    15,     5,     0,     6,     0,     7,
     109     0,    12,     0,     8,    13,     0,    14,     9,    13,     0,
     110    14,    13,     0,    13,     0,    15,    10,    14,     0,    14,
     111     0
     112};
     113
     114#endif
     115
     116#if YYDEBUG != 0
     117static const short yyrline[] = { 0,
     118    76,    80,    81,    82,    83,    86,    87,    90,    91,    92,
     119    95,    96
     120};
     121#endif
     122
     123
     124#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
     125
     126static const char * const yytname[] = {   "$","error","$undefined.","TERM","'('",
     127"')'","'*'","'_'","'!'","'&'","'|'","query","term","not","and","or", NULL
     128};
     129#endif
     130
     131static const short yyr1[] = {     0,
     132    11,    12,    12,    12,    12,    13,    13,    14,    14,    14,
     133    15,    15
     134};
     135
     136static const short yyr2[] = {     0,
     137     1,     1,     3,     1,     1,     1,     2,     3,     2,     1,
     138     3,     1
     139};
     140
     141static const short yydefact[] = {     0,
     142     2,     0,     4,     5,     0,     6,    10,    12,     1,     0,
     143     7,     0,     9,     0,     3,     8,    11,     0,     0,     0
     144};
     145
     146static const short yydefgoto[] = {    18,
     147     6,     7,     8,     9
     148};
     149
     150static const short yypact[] = {    10,
     151-32768,    10,-32768,-32768,    10,-32768,-32768,     2,    -9,    14,
     152-32768,    10,-32768,    10,-32768,-32768,     2,     4,    15,-32768
     153};
     154
     155static const short yypgoto[] = {-32768,
     156-32768,    -5,   -12,    18
     157};
     158
     159
     160#define YYLAST      24
     161
     162
     163static const short yytable[] = {    11,
     164    14,    17,    13,    19,     1,     2,    16,     3,     4,     5,
     165    12,    13,     1,     2,    20,     3,     4,     5,    15,    10,
     166     0,     0,     0,    14
     167};
     168
     169static const short yycheck[] = {     5,
     170    10,    14,     8,     0,     3,     4,    12,     6,     7,     8,
     171     9,    17,     3,     4,     0,     6,     7,     8,     5,     2,
     172    -1,    -1,    -1,    10
     173};
     174/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
     175#line 3 "/usr/lib/bison.simple"
     176/* This file comes from bison-1.27.  */
     177
     178/* Skeleton output parser for bison,
     179   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
     180
     181   This program is free software; you can redistribute it and/or modify
     182   it under the terms of the GNU General Public License as published by
     183   the Free Software Foundation; either version 2, or (at your option)
     184   any later version.
     185
     186   This program is distributed in the hope that it will be useful,
     187   but WITHOUT ANY WARRANTY; without even the implied warranty of
     188   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     189   GNU General Public License for more details.
     190
     191   You should have received a copy of the GNU General Public License
     192   along with this program; if not, write to the Free Software
     193   Foundation, Inc., 59 Temple Place - Suite 330,
     194   Boston, MA 02111-1307, USA.  */
     195
     196/* As a special exception, when this file is copied by Bison into a
     197   Bison output file, you may use that output file without restriction.
     198   This special exception was added by the Free Software Foundation
     199   in version 1.24 of Bison.  */
     200
     201/* This is the parser code that is written into each bison parser
     202  when the %semantic_parser declaration is not specified in the grammar.
     203  It was written by Richard Stallman by simplifying the hairy parser
     204  used when %semantic_parser is specified.  */
     205
     206#ifndef YYSTACK_USE_ALLOCA
     207#ifdef alloca
     208#define YYSTACK_USE_ALLOCA
     209#else /* alloca not defined */
     210#ifdef __GNUC__
     211#define YYSTACK_USE_ALLOCA
     212#define alloca __builtin_alloca
     213#else /* not GNU C.  */
     214#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
     215#define YYSTACK_USE_ALLOCA
     216#include <alloca.h>
     217#else /* not sparc */
     218/* We think this test detects Watcom and Microsoft C.  */
     219/* This used to test MSDOS, but that is a bad idea
     220   since that symbol is in the user namespace.  */
     221#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
     222#if 0 /* No need for malloc.h, which pollutes the namespace;
     223     instead, just don't use alloca.  */
     224#include <malloc.h>
     225#endif
     226#else /* not MSDOS, or __TURBOC__ */
     227#if defined(_AIX)
     228/* I don't know what this was needed for, but it pollutes the namespace.
     229   So I turned it off.   rms, 2 May 1997.  */
     230/* #include <malloc.h>  */
     231 #pragma alloca
     232#define YYSTACK_USE_ALLOCA
     233#else /* not MSDOS, or __TURBOC__, or _AIX */
     234#if 0
     235#ifdef __hpux /* [email protected] says this works for HPUX 9.05 and up,
     236         and on HPUX 10.  Eventually we can turn this on.  */
     237#define YYSTACK_USE_ALLOCA
     238#define alloca __builtin_alloca
     239#endif /* __hpux */
     240#endif
     241#endif /* not _AIX */
     242#endif /* not MSDOS, or __TURBOC__ */
     243#endif /* not sparc */
     244#endif /* not GNU C */
     245#endif /* alloca not defined */
     246#endif /* YYSTACK_USE_ALLOCA not defined */
     247
     248#ifdef YYSTACK_USE_ALLOCA
     249#define YYSTACK_ALLOC alloca
     250#else
     251#define YYSTACK_ALLOC malloc
     252#endif
     253
     254/* Note: there must be only one dollar sign in this file.
     255   It is replaced by the list of actions, each action
     256   as one case of the switch.  */
     257
     258#define yyerrok     (yyerrstatus = 0)
     259#define yyclearin   (yychar = YYEMPTY)
     260#define YYEMPTY     -2
     261#define YYEOF       0
     262#define YYACCEPT    goto yyacceptlab
     263#define YYABORT     goto yyabortlab
     264#define YYERROR     goto yyerrlab1
     265/* Like YYERROR except do call yyerror.
     266   This remains here temporarily to ease the
     267   transition to the new meaning of YYERROR, for GCC.
     268   Once GCC version 2 has supplanted version 1, this can go.  */
     269#define YYFAIL      goto yyerrlab
     270#define YYRECOVERING()  (!!yyerrstatus)
     271#define YYBACKUP(token, value) \
     272do                              \
     273  if (yychar == YYEMPTY && yylen == 1)              \
     274    { yychar = (token), yylval = (value);           \
     275      yychar1 = YYTRANSLATE (yychar);               \
     276      YYPOPSTACK;                       \
     277      goto yybackup;                        \
     278    }                               \
     279  else                              \
     280    { yyerror ("syntax error: cannot back up"); YYERROR; }  \
     281while (0)
     282
     283#define YYTERROR    1
     284#define YYERRCODE   256
     285
     286#ifndef YYPURE
     287#define YYLEX       yylex()
     288#endif
     289
     290#ifdef YYPURE
     291#ifdef YYLSP_NEEDED
     292#ifdef YYLEX_PARAM
     293#define YYLEX       yylex(&yylval, &yylloc, YYLEX_PARAM)
     294#else
     295#define YYLEX       yylex(&yylval, &yylloc)
     296#endif
     297#else /* not YYLSP_NEEDED */
     298#ifdef YYLEX_PARAM
     299#define YYLEX       yylex(&yylval, YYLEX_PARAM)
     300#else
     301#define YYLEX       yylex(&yylval)
     302#endif
     303#endif /* not YYLSP_NEEDED */
     304#endif
     305
     306/* If nonreentrant, generate the variables here */
     307
     308#ifndef YYPURE
     309
     310int yychar;         /*  the lookahead symbol        */
     311YYSTYPE yylval;         /*  the semantic value of the       */
     312                /*  lookahead symbol            */
     313
     314#ifdef YYLSP_NEEDED
     315YYLTYPE yylloc;         /*  location data for the lookahead */
     316                /*  symbol              */
     317#endif
     318
     319int yynerrs;            /*  number of parse errors so far       */
     320#endif  /* not YYPURE */
     321
     322#if YYDEBUG != 0
     323int yydebug;            /*  nonzero means print parse trace */
     324/* Since this is uninitialized, it does not stop multiple parsers
     325   from coexisting.  */
     326#endif
     327
     328/*  YYINITDEPTH indicates the initial size of the parser's stacks   */
     329
     330#ifndef YYINITDEPTH
     331#define YYINITDEPTH 200
     332#endif
     333
     334/*  YYMAXDEPTH is the maximum size the stacks can grow to
     335    (effective only if the built-in stack extension method is used).  */
     336
     337#if YYMAXDEPTH == 0
    168338#undef YYMAXDEPTH
    169 #define YYMAXDEPTH YYSTACKSIZE
     339#endif
     340
     341#ifndef YYMAXDEPTH
     342#define YYMAXDEPTH 10000
     343#endif
     344
     345
     346/* Define __yy_memcpy.  Note that the size argument
     347   should be passed with type unsigned int, because that is what the non-GCC
     348   definitions require.  With GCC, __builtin_memcpy takes an arg
     349   of type size_t, but it can handle unsigned int.  */
     350
     351#if __GNUC__ > 1        /* GNU C and GNU C++ define this.  */
     352#define __yy_memcpy(TO,FROM,COUNT)  __builtin_memcpy(TO,FROM,COUNT)
     353#else               /* not GNU C or C++ */
     354#ifndef __cplusplus
     355
     356/* This is the most reliable way to avoid incompatibilities
     357   in available built-in functions on various systems.  */
     358static void
     359__yy_memcpy (to, from, count)
     360     char *to;
     361     char *from;
     362     unsigned int count;
     363{
     364  register char *f = from;
     365  register char *t = to;
     366  register int i = count;
     367
     368  while (i-- > 0)
     369    *t++ = *f++;
     370}
     371
     372#else /* __cplusplus */
     373
     374/* This is the most reliable way to avoid incompatibilities
     375   in available built-in functions on various systems.  */
     376static void
     377__yy_memcpy (char *to, char *from, unsigned int count)
     378{
     379  register char *t = to;
     380  register char *f = from;
     381  register int i = count;
     382
     383  while (i-- > 0)
     384    *t++ = *f++;
     385}
     386
     387#endif
     388#endif
     389
     390
     391#line 216 "/usr/lib/bison.simple"
     392
     393/* The user can define YYPARSE_PARAM as the name of an argument to be passed
     394   into yyparse.  The argument should have type void *.
     395   It should actually point to an object.
     396   Grammar actions can access the variable by casting it
     397   to the proper pointer type.  */
     398
     399#ifdef YYPARSE_PARAM
     400#ifdef __cplusplus
     401#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
     402#define YYPARSE_PARAM_DECL
     403#else /* not __cplusplus */
     404#define YYPARSE_PARAM_ARG YYPARSE_PARAM
     405#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
     406#endif /* not __cplusplus */
     407#else /* not YYPARSE_PARAM */
     408#define YYPARSE_PARAM_ARG
     409#define YYPARSE_PARAM_DECL
     410#endif /* not YYPARSE_PARAM */
     411
     412/* Prevent warning if -Wstrict-prototypes.  */
     413#ifdef __GNUC__
     414#ifdef YYPARSE_PARAM
     415int yyparse (void *);
    170416#else
    171 #ifdef YYMAXDEPTH
    172 #define YYSTACKSIZE YYMAXDEPTH
     417int yyparse (void);
     418#endif
     419#endif
     420
     421int
     422yyparse(YYPARSE_PARAM_ARG)
     423     YYPARSE_PARAM_DECL
     424{
     425  register int yystate;
     426  register int yyn;
     427  register short *yyssp;
     428  register YYSTYPE *yyvsp;
     429  int yyerrstatus;  /*  number of tokens to shift before error messages enabled */
     430  int yychar1 = 0;      /*  lookahead token as an internal (translated) token number */
     431
     432  short yyssa[YYINITDEPTH]; /*  the state stack         */
     433  YYSTYPE yyvsa[YYINITDEPTH];   /*  the semantic value stack        */
     434
     435  short *yyss = yyssa;      /*  refer to the stacks thru separate pointers */
     436  YYSTYPE *yyvs = yyvsa;    /*  to allow yyoverflow to reallocate them elsewhere */
     437
     438#ifdef YYLSP_NEEDED
     439  YYLTYPE yylsa[YYINITDEPTH];   /*  the location stack          */
     440  YYLTYPE *yyls = yylsa;
     441  YYLTYPE *yylsp;
     442
     443#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
    173444#else
    174 #define YYSTACKSIZE 500
    175 #define YYMAXDEPTH 500
    176 #endif
    177 #endif
    178 int yydebug;
    179 int yynerrs;
    180 int yyerrflag;
    181 int yychar;
    182 short *yyssp;
    183 YYSTYPE *yyvsp;
    184 YYSTYPE yyval;
    185 YYSTYPE yylval;
    186 short yyss[YYSTACKSIZE];
    187 YYSTYPE yyvs[YYSTACKSIZE];
    188 #define yystacksize YYSTACKSIZE
     445#define YYPOPSTACK   (yyvsp--, yyssp--)
     446#endif
     447
     448  int yystacksize = YYINITDEPTH;
     449  int yyfree_stacks = 0;
     450
     451#ifdef YYPURE
     452  int yychar;
     453  YYSTYPE yylval;
     454  int yynerrs;
     455#ifdef YYLSP_NEEDED
     456  YYLTYPE yylloc;
     457#endif
     458#endif
     459
     460  YYSTYPE yyval;        /*  the variable used to return     */
     461                /*  semantic values from the action */
     462                /*  routines                */
     463
     464  int yylen;
     465
     466#if YYDEBUG != 0
     467  if (yydebug)
     468    fprintf(stderr, "Starting parse\n");
     469#endif
     470
     471  yystate = 0;
     472  yyerrstatus = 0;
     473  yynerrs = 0;
     474  yychar = YYEMPTY;     /* Cause a token to be read.  */
     475
     476  /* Initialize stack pointers.
     477     Waste one element of value and location stack
     478     so that they stay on the same level as the state stack.
     479     The wasted elements are never initialized.  */
     480
     481  yyssp = yyss - 1;
     482  yyvsp = yyvs;
     483#ifdef YYLSP_NEEDED
     484  yylsp = yyls;
     485#endif
     486
     487/* Push a new state, which is found in  yystate  .  */
     488/* In all cases, when you get here, the value and location stacks
     489   have just been pushed. so pushing a state here evens the stacks.  */
     490yynewstate:
     491
     492  *++yyssp = yystate;
     493
     494  if (yyssp >= yyss + yystacksize - 1)
     495    {
     496      /* Give user a chance to reallocate the stack */
     497      /* Use copies of these so that the &'s don't force the real ones into memory. */
     498      YYSTYPE *yyvs1 = yyvs;
     499      short *yyss1 = yyss;
     500#ifdef YYLSP_NEEDED
     501      YYLTYPE *yyls1 = yyls;
     502#endif
     503
     504      /* Get the current used size of the three stacks, in elements.  */
     505      int size = yyssp - yyss + 1;
     506
     507#ifdef yyoverflow
     508      /* Each stack pointer address is followed by the size of
     509     the data in use in that stack, in bytes.  */
     510#ifdef YYLSP_NEEDED
     511      /* This used to be a conditional around just the two extra args,
     512     but that might be undefined if yyoverflow is a macro.  */
     513      yyoverflow("parser stack overflow",
     514         &yyss1, size * sizeof (*yyssp),
     515         &yyvs1, size * sizeof (*yyvsp),
     516         &yyls1, size * sizeof (*yylsp),
     517         &yystacksize);
     518#else
     519      yyoverflow("parser stack overflow",
     520         &yyss1, size * sizeof (*yyssp),
     521         &yyvs1, size * sizeof (*yyvsp),
     522         &yystacksize);
     523#endif
     524
     525      yyss = yyss1; yyvs = yyvs1;
     526#ifdef YYLSP_NEEDED
     527      yyls = yyls1;
     528#endif
     529#else /* no yyoverflow */
     530      /* Extend the stack our own way.  */
     531      if (yystacksize >= YYMAXDEPTH)
     532    {
     533      yyerror("parser stack overflow");
     534      if (yyfree_stacks)
     535        {
     536          free (yyss);
     537          free (yyvs);
     538#ifdef YYLSP_NEEDED
     539          free (yyls);
     540#endif
     541        }
     542      return 2;
     543    }
     544      yystacksize *= 2;
     545      if (yystacksize > YYMAXDEPTH)
     546    yystacksize = YYMAXDEPTH;
     547#ifndef YYSTACK_USE_ALLOCA
     548      yyfree_stacks = 1;
     549#endif
     550      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
     551      __yy_memcpy ((char *)yyss, (char *)yyss1,
     552           size * (unsigned int) sizeof (*yyssp));
     553      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
     554      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
     555           size * (unsigned int) sizeof (*yyvsp));
     556#ifdef YYLSP_NEEDED
     557      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
     558      __yy_memcpy ((char *)yyls, (char *)yyls1,
     559           size * (unsigned int) sizeof (*yylsp));
     560#endif
     561#endif /* no yyoverflow */
     562
     563      yyssp = yyss + size - 1;
     564      yyvsp = yyvs + size - 1;
     565#ifdef YYLSP_NEEDED
     566      yylsp = yyls + size - 1;
     567#endif
     568
     569#if YYDEBUG != 0
     570      if (yydebug)
     571    fprintf(stderr, "Stack size increased to %d\n", yystacksize);
     572#endif
     573
     574      if (yyssp >= yyss + yystacksize - 1)
     575    YYABORT;
     576    }
     577
     578#if YYDEBUG != 0
     579  if (yydebug)
     580    fprintf(stderr, "Entering state %d\n", yystate);
     581#endif
     582
     583  goto yybackup;
     584 yybackup:
     585
     586/* Do appropriate processing given the current state.  */
     587/* Read a lookahead token if we need one and don't already have one.  */
     588/* yyresume: */
     589
     590  /* First try to decide what to do without reference to lookahead token.  */
     591
     592  yyn = yypact[yystate];
     593  if (yyn == YYFLAG)
     594    goto yydefault;
     595
     596  /* Not known => get a lookahead token if don't already have one.  */
     597
     598  /* yychar is either YYEMPTY or YYEOF
     599     or a valid token in external form.  */
     600
     601  if (yychar == YYEMPTY)
     602    {
     603#if YYDEBUG != 0
     604      if (yydebug)
     605    fprintf(stderr, "Reading a token: ");
     606#endif
     607      yychar = YYLEX;
     608    }
     609
     610  /* Convert token to internal form (in yychar1) for indexing tables with */
     611
     612  if (yychar <= 0)      /* This means end of input. */
     613    {
     614      yychar1 = 0;
     615      yychar = YYEOF;       /* Don't call YYLEX any more */
     616
     617#if YYDEBUG != 0
     618      if (yydebug)
     619    fprintf(stderr, "Now at end of input.\n");
     620#endif
     621    }
     622  else
     623    {
     624      yychar1 = YYTRANSLATE(yychar);
     625
     626#if YYDEBUG != 0
     627      if (yydebug)
     628    {
     629      fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
     630      /* Give the individual parser a way to print the precise meaning
     631         of a token, for further debugging info.  */
     632#ifdef YYPRINT
     633      YYPRINT (stderr, yychar, yylval);
     634#endif
     635      fprintf (stderr, ")\n");
     636    }
     637#endif
     638    }
     639
     640  yyn += yychar1;
     641  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
     642    goto yydefault;
     643
     644  yyn = yytable[yyn];
     645
     646  /* yyn is what to do for this token type in this state.
     647     Negative => reduce, -yyn is rule number.
     648     Positive => shift, yyn is new state.
     649       New state is final state => don't bother to shift,
     650       just return success.
     651     0, or most negative number => error.  */
     652
     653  if (yyn < 0)
     654    {
     655      if (yyn == YYFLAG)
     656    goto yyerrlab;
     657      yyn = -yyn;
     658      goto yyreduce;
     659    }
     660  else if (yyn == 0)
     661    goto yyerrlab;
     662
     663  if (yyn == YYFINAL)
     664    YYACCEPT;
     665
     666  /* Shift the lookahead token.  */
     667
     668#if YYDEBUG != 0
     669  if (yydebug)
     670    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
     671#endif
     672
     673  /* Discard the token being shifted unless it is eof.  */
     674  if (yychar != YYEOF)
     675    yychar = YYEMPTY;
     676
     677  *++yyvsp = yylval;
     678#ifdef YYLSP_NEEDED
     679  *++yylsp = yylloc;
     680#endif
     681
     682  /* count tokens shifted since error; after three, turn off error status.  */
     683  if (yyerrstatus) yyerrstatus--;
     684
     685  yystate = yyn;
     686  goto yynewstate;
     687
     688/* Do the default action for the current state.  */
     689yydefault:
     690
     691  yyn = yydefact[yystate];
     692  if (yyn == 0)
     693    goto yyerrlab;
     694
     695/* Do a reduction.  yyn is the number of a rule to reduce with.  */
     696yyreduce:
     697  yylen = yyr2[yyn];
     698  if (yylen > 0)
     699    yyval = yyvsp[1-yylen]; /* implement default value of the action */
     700
     701#if YYDEBUG != 0
     702  if (yydebug)
     703    {
     704      int i;
     705
     706      fprintf (stderr, "Reducing via rule %d (line %d), ",
     707           yyn, yyrline[yyn]);
     708
     709      /* Print the symbols being reduced, and their result.  */
     710      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
     711    fprintf (stderr, "%s ", yytname[yyrhs[i]]);
     712      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
     713    }
     714#endif
     715
     716
     717  switch (yyn) {
     718
     719case 1:
     720#line 76 "bool_parser.y"
     721{ tree_base = yyvsp[0].node;;
     722    break;}
     723case 2:
     724#line 80 "bool_parser.y"
     725{ yyval.node = CreateBoolTermNode(term_list, yyvsp[0].text, 1, word_num, count, doc_count, invf_ptr, invf_len, stemmer_num); ;
     726    break;}
     727case 3:
     728#line 81 "bool_parser.y"
     729{ yyval.node = yyvsp[-1].node; ;
     730    break;}
     731case 4:
     732#line 82 "bool_parser.y"
     733{ yyval.node = CreateBoolTreeNode(N_all, NULL, NULL); ;
     734    break;}
     735case 5:
     736#line 83 "bool_parser.y"
     737{ yyval.node = CreateBoolTreeNode(N_none, NULL, NULL); ;
     738    break;}
     739case 7:
     740#line 87 "bool_parser.y"
     741{ yyval.node = CreateBoolTreeNode(N_not, yyvsp[0].node, NULL); ;
     742    break;}
     743case 8:
     744#line 90 "bool_parser.y"
     745{ yyval.node = CreateBoolTreeNode(N_and, yyvsp[-2].node, yyvsp[0].node); ;
     746    break;}
     747case 9:
     748#line 91 "bool_parser.y"
     749{ yyval.node = CreateBoolTreeNode(N_and, yyvsp[-1].node, yyvsp[0].node); ;
     750    break;}
     751case 11:
     752#line 95 "bool_parser.y"
     753{ yyval.node = CreateBoolTreeNode(N_or, yyvsp[-2].node, yyvsp[0].node); ;
     754    break;}
     755}
     756   /* the action file gets copied in in place of this dollarsign */
     757#line 542 "/usr/lib/bison.simple"
     758
     759
     760  yyvsp -= yylen;
     761  yyssp -= yylen;
     762#ifdef YYLSP_NEEDED
     763  yylsp -= yylen;
     764#endif
     765
     766#if YYDEBUG != 0
     767  if (yydebug)
     768    {
     769      short *ssp1 = yyss - 1;
     770      fprintf (stderr, "state stack now");
     771      while (ssp1 != yyssp)
     772    fprintf (stderr, " %d", *++ssp1);
     773      fprintf (stderr, "\n");
     774    }
     775#endif
     776
     777  *++yyvsp = yyval;
     778
     779#ifdef YYLSP_NEEDED
     780  yylsp++;
     781  if (yylen == 0)
     782    {
     783      yylsp->first_line = yylloc.first_line;
     784      yylsp->first_column = yylloc.first_column;
     785      yylsp->last_line = (yylsp-1)->last_line;
     786      yylsp->last_column = (yylsp-1)->last_column;
     787      yylsp->text = 0;
     788    }
     789  else
     790    {
     791      yylsp->last_line = (yylsp+yylen-1)->last_line;
     792      yylsp->last_column = (yylsp+yylen-1)->last_column;
     793    }
     794#endif
     795
     796  /* Now "shift" the result of the reduction.
     797     Determine what state that goes to,
     798     based on the state we popped back to
     799     and the rule number reduced by.  */
     800
     801  yyn = yyr1[yyn];
     802
     803  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
     804  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
     805    yystate = yytable[yystate];
     806  else
     807    yystate = yydefgoto[yyn - YYNTBASE];
     808
     809  goto yynewstate;
     810
     811yyerrlab:   /* here on detecting error */
     812
     813  if (! yyerrstatus)
     814    /* If not already recovering from an error, report this error.  */
     815    {
     816      ++yynerrs;
     817
     818#ifdef YYERROR_VERBOSE
     819      yyn = yypact[yystate];
     820
     821      if (yyn > YYFLAG && yyn < YYLAST)
     822    {
     823      int size = 0;
     824      char *msg;
     825      int x, count;
     826
     827      count = 0;
     828      /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
     829      for (x = (yyn < 0 ? -yyn : 0);
     830           x < (sizeof(yytname) / sizeof(char *)); x++)
     831        if (yycheck[x + yyn] == x)
     832          size += strlen(yytname[x]) + 15, count++;
     833      msg = (char *) malloc(size + 15);
     834      if (msg != 0)
     835        {
     836          strcpy(msg, "parse error");
     837
     838          if (count < 5)
     839        {
     840          count = 0;
     841          for (x = (yyn < 0 ? -yyn : 0);
     842               x < (sizeof(yytname) / sizeof(char *)); x++)
     843            if (yycheck[x + yyn] == x)
     844              {
     845            strcat(msg, count == 0 ? ", expecting `" : " or `");
     846            strcat(msg, yytname[x]);
     847            strcat(msg, "'");
     848            count++;
     849              }
     850        }
     851          yyerror(msg);
     852          free(msg);
     853        }
     854      else
     855        yyerror ("parse error; also virtual memory exceeded");
     856    }
     857      else
     858#endif /* YYERROR_VERBOSE */
     859    yyerror("parse error");
     860    }
     861
     862  goto yyerrlab1;
     863yyerrlab1:   /* here on error raised explicitly by an action */
     864
     865  if (yyerrstatus == 3)
     866    {
     867      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
     868
     869      /* return failure if at end of input */
     870      if (yychar == YYEOF)
     871    YYABORT;
     872
     873#if YYDEBUG != 0
     874      if (yydebug)
     875    fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
     876#endif
     877
     878      yychar = YYEMPTY;
     879    }
     880
     881  /* Else will try to reuse lookahead token
     882     after shifting the error token.  */
     883
     884  yyerrstatus = 3;      /* Each real token shifted decrements this */
     885
     886  goto yyerrhandle;
     887
     888yyerrdefault:  /* current state does not do anything special for the error token. */
     889
     890#if 0
     891  /* This is wrong; only states that explicitly want error tokens
     892     should shift them.  */
     893  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
     894  if (yyn) goto yydefault;
     895#endif
     896
     897yyerrpop:   /* pop the current state because it cannot handle the error token */
     898
     899  if (yyssp == yyss) YYABORT;
     900  yyvsp--;
     901  yystate = *--yyssp;
     902#ifdef YYLSP_NEEDED
     903  yylsp--;
     904#endif
     905
     906#if YYDEBUG != 0
     907  if (yydebug)
     908    {
     909      short *ssp1 = yyss - 1;
     910      fprintf (stderr, "Error: state stack now");
     911      while (ssp1 != yyssp)
     912    fprintf (stderr, " %d", *++ssp1);
     913      fprintf (stderr, "\n");
     914    }
     915#endif
     916
     917yyerrhandle:
     918
     919  yyn = yypact[yystate];
     920  if (yyn == YYFLAG)
     921    goto yyerrdefault;
     922
     923  yyn += YYTERROR;
     924  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
     925    goto yyerrdefault;
     926
     927  yyn = yytable[yyn];
     928  if (yyn < 0)
     929    {
     930      if (yyn == YYFLAG)
     931    goto yyerrpop;
     932      yyn = -yyn;
     933      goto yyreduce;
     934    }
     935  else if (yyn == 0)
     936    goto yyerrpop;
     937
     938  if (yyn == YYFINAL)
     939    YYACCEPT;
     940
     941#if YYDEBUG != 0
     942  if (yydebug)
     943    fprintf(stderr, "Shifting error token, ");
     944#endif
     945
     946  *++yyvsp = yylval;
     947#ifdef YYLSP_NEEDED
     948  *++yylsp = yylloc;
     949#endif
     950
     951  yystate = yyn;
     952  goto yynewstate;
     953
     954 yyacceptlab:
     955  /* YYACCEPT comes here.  */
     956  if (yyfree_stacks)
     957    {
     958      free (yyss);
     959      free (yyvs);
     960#ifdef YYLSP_NEEDED
     961      free (yyls);
     962#endif
     963    }
     964  return 0;
     965
     966 yyabortlab:
     967  /* YYABORT comes here.  */
     968  if (yyfree_stacks)
     969    {
     970      free (yyss);
     971      free (yyvs);
     972#ifdef YYLSP_NEEDED
     973      free (yyls);
     974#endif
     975    }
     976  return 1;
     977}
    189978#line 99 "bool_parser.y"
     979
    190980 
    191981/* Bison on one mips machine defined "const" to be nothing but
    … …  
    3811171bool_tree_node *
    3821172ParseBool(char *query_line, int query_len,
    383           TermList **the_term_list, int the_stemmer_num, int the_stem_method,
    384       int *res,
     1173          TermList **the_term_list, int the_stemmer_num, int the_stem_method, int *res,
    3851174      stemmed_dict * the_sd, int is_indexed,   /* [RPAP - Jan 97: Stem Index Change] */
    3861175      QueryTermList **the_query_term_list)  /* [RPAP - Feb 97: Term Frequency] */
    … …  
    4071196 
    4081197
    409 #line 407 "y.tab.c"
    410 #define YYABORT goto yyabort
    411 #define YYREJECT goto yyabort
    412 #define YYACCEPT goto yyaccept
    413 #define YYERROR goto yyerrlab
    414 int
    415 yyparse()
    416 {
    417     register int yym, yyn, yystate;
    418 #if YYDEBUG
    419     register char *yys;
    420     extern char *getenv();
    421 
    422     if (yys = getenv("YYDEBUG"))
    423     {
    424         yyn = *yys;
    425         if (yyn >= '0' && yyn <= '9')
    426             yydebug = yyn - '0';
    427     }
    428 #endif
    429 
    430     yynerrs = 0;
    431     yyerrflag = 0;
    432     yychar = (-1);
    433 
    434     yyssp = yyss;
    435     yyvsp = yyvs;
    436     *yyssp = yystate = 0;
    437 
    438 yyloop:
    439     if (yyn = yydefred[yystate]) goto yyreduce;
    440     if (yychar < 0)
    441     {
    442         if ((yychar = yylex()) < 0) yychar = 0;
    443 #if YYDEBUG
    444         if (yydebug)
    445         {
    446             yys = 0;
    447             if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
    448             if (!yys) yys = "illegal-symbol";
    449             printf("%sdebug: state %d, reading %d (%s)\n",
    450                     YYPREFIX, yystate, yychar, yys);
    451         }
    452 #endif
    453     }
    454     if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
    455             yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
    456     {
    457 #if YYDEBUG
    458         if (yydebug)
    459             printf("%sdebug: state %d, shifting to state %d\n",
    460                     YYPREFIX, yystate, yytable[yyn]);
    461 #endif
    462         if (yyssp >= yyss + yystacksize - 1)
    463         {
    464             goto yyoverflow;
    465         }
    466         *++yyssp = yystate = yytable[yyn];
    467         *++yyvsp = yylval;
    468         yychar = (-1);
    469         if (yyerrflag > 0)  --yyerrflag;
    470         goto yyloop;
    471     }
    472     if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
    473             yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
    474     {
    475         yyn = yytable[yyn];
    476         goto yyreduce;
    477     }
    478     if (yyerrflag) goto yyinrecovery;
    479 #ifdef lint
    480     goto yynewerror;
    481 #endif
    482 yynewerror:
    483     yyerror("syntax error");
    484 #ifdef lint
    485     goto yyerrlab;
    486 #endif
    487 yyerrlab:
    488     ++yynerrs;
    489 yyinrecovery:
    490     if (yyerrflag < 3)
    491     {
    492         yyerrflag = 3;
    493         for (;;)
    494         {
    495             if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 &&
    496                     yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
    497             {
    498 #if YYDEBUG
    499                 if (yydebug)
    500                     printf("%sdebug: state %d, error recovery shifting\
    501  to state %d\n", YYPREFIX, *yyssp, yytable[yyn]);
    502 #endif
    503                 if (yyssp >= yyss + yystacksize - 1)
    504                 {
    505                     goto yyoverflow;
    506                 }
    507                 *++yyssp = yystate = yytable[yyn];
    508                 *++yyvsp = yylval;
    509                 goto yyloop;
    510             }
    511             else
    512             {
    513 #if YYDEBUG
    514                 if (yydebug)
    515                     printf("%sdebug: error recovery discarding state %d\n",
    516                             YYPREFIX, *yyssp);
    517 #endif
    518                 if (yyssp <= yyss) goto yyabort;
    519                 --yyssp;
    520                 --yyvsp;
    521             }
    522         }
    523     }
    524     else
    525     {
    526         if (yychar == 0) goto yyabort;
    527 #if YYDEBUG
    528         if (yydebug)
    529         {
    530             yys = 0;
    531             if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
    532             if (!yys) yys = "illegal-symbol";
    533             printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
    534                     YYPREFIX, yystate, yychar, yys);
    535         }
    536 #endif
    537         yychar = (-1);
    538         goto yyloop;
    539     }
    540 yyreduce:
    541 #if YYDEBUG
    542     if (yydebug)
    543         printf("%sdebug: state %d, reducing by rule %d (%s)\n",
    544                 YYPREFIX, yystate, yyn, yyrule[yyn]);
    545 #endif
    546     yym = yylen[yyn];
    547     yyval = yyvsp[1-yym];
    548     switch (yyn)
    549     {
    550 case 1:
    551 #line 75 "bool_parser.y"
    552 { tree_base = yyvsp[0].node;}
    553 break;
    554 case 2:
    555 #line 79 "bool_parser.y"
    556 { yyval.node = CreateBoolTermNode(term_list, yyvsp[0].text, 1, word_num, count, doc_count, invf_ptr, invf_len, stemmer_num); }
    557 break;
    558 case 3:
    559 #line 80 "bool_parser.y"
    560 { yyval.node = yyvsp[-1].node; }
    561 break;
    562 case 4:
    563 #line 81 "bool_parser.y"
    564 { yyval.node = CreateBoolTreeNode(N_all, NULL, NULL); }
    565 break;
    566 case 5:
    567 #line 82 "bool_parser.y"
    568 { yyval.node = CreateBoolTreeNode(N_none, NULL, NULL); }
    569 break;
    570 case 7:
    571 #line 86 "bool_parser.y"
    572 { yyval.node = CreateBoolTreeNode(N_not, yyvsp[0].node, NULL); }
    573 break;
    574 case 8:
    575 #line 89 "bool_parser.y"
    576 { yyval.node = CreateBoolTreeNode(N_and, yyvsp[-2].node, yyvsp[0].node); }
    577 break;
    578 case 9:
    579 #line 90 "bool_parser.y"
    580 { yyval.node = CreateBoolTreeNode(N_and, yyvsp[-1].node, yyvsp[0].node); }
    581 break;
    582 case 11:
    583 #line 94 "bool_parser.y"
    584 { yyval.node = CreateBoolTreeNode(N_or, yyvsp[-2].node, yyvsp[0].node); }
    585 break;
    586 #line 584 "y.tab.c"
    587     }
    588     yyssp -= yym;
    589     yystate = *yyssp;
    590     yyvsp -= yym;
    591     yym = yylhs[yyn];
    592     if (yystate == 0 && yym == 0)
    593     {
    594 #if YYDEBUG
    595         if (yydebug)
    596             printf("%sdebug: after reduction, shifting from state 0 to\
    597  state %d\n", YYPREFIX, YYFINAL);
    598 #endif
    599         yystate = YYFINAL;
    600         *++yyssp = YYFINAL;
    601         *++yyvsp = yyval;
    602         if (yychar < 0)
    603         {
    604             if ((yychar = yylex()) < 0) yychar = 0;
    605 #if YYDEBUG
    606             if (yydebug)
    607             {
    608                 yys = 0;
    609                 if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
    610                 if (!yys) yys = "illegal-symbol";
    611                 printf("%sdebug: state %d, reading %d (%s)\n",
    612                         YYPREFIX, YYFINAL, yychar, yys);
    613             }
    614 #endif
    615         }
    616         if (yychar == 0) goto yyaccept;
    617         goto yyloop;
    618     }
    619     if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
    620             yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
    621         yystate = yytable[yyn];
    622     else
    623         yystate = yydgoto[yym];
    624 #if YYDEBUG
    625     if (yydebug)
    626         printf("%sdebug: after reduction, shifting from state %d \
    627 to state %d\n", YYPREFIX, *yyssp, yystate);
    628 #endif
    629     if (yyssp >= yyss + yystacksize - 1)
    630     {
    631         goto yyoverflow;
    632     }
    633     *++yyssp = yystate;
    634     *++yyvsp = yyval;
    635     goto yyloop;
    636 yyoverflow:
    637     yyerror("yacc stack overflow");
    638 yyabort:
    639     return (1);
    640 yyaccept:
    641     return (0);
    642 }
    643 

  • branches/corba/gsdl/src/colservr/Makefile.in

    r1021 r1067  
    2828AR = ar
    2929CC = @CC@
     30CPP = @CXX@
    3031CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual
     32MCFLAGS = @CFLAGS@ -Wall -Wunused
     33DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER @DEFS@
    3134
    3235USE_FASTCGI = @USE_FASTCGI@
    3336ifneq ($(USE_FASTCGI), 1)
    34 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER @DEFS@
    35 
    36 INCLUDES = -I../.. -I../../lib -I../recpt -I../../packages/mg \
     37INCLUDES = -I. -I../.. -I../../lib -I../recpt -I../../packages/mg \
    3738       -I../../packages/mg/lib -I../../packages/mg/src/text
    3839else
    39 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER -DUSE_FASTCGI @DEFS@
    40 
    41 INCLUDES = -I../.. -I../../lib -I../recpt -I../../packages/mg \
     40INCLUDES = -I. -I../../lib -I../recpt -I../../packages/mg \
    4241       -I../../packages/mg/lib -I../../packages/mg/src/text \
    4342           -I../../packages/fcgi/include
    4443endif
    4544
     45USE_CORBA = @USE_CORBA@
     46
    4647RANLIB = @RANLIB@
    4748LDFLAGS = @LDFLAGS@
    48 #LIBS = -lgdbm -lstdc++ -lm
    49 LIBS = @LIBS@
     49LIBS = -lgdbm -lstdc++ -lm
    5050
    5151GSDLOS = @gsdlos@
    … …  
    5353
    5454COMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
    55 LINK = $(CC) $(LDFLAGS) -o $@
     55LINK = $(CPP) $(LDFLAGS) -o $@
     56
     57CPPCOMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
     58CPPLINK = $(CPP) $(LDFLAGS) -o $@
     59
     60MCOMPILE = mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(INCLUDES) -c
     61MLINK = mico-ld $(LDFLAGS) -lmico2.2.7 -o $@
    5662
    5763.SUFFIXES:
    … …  
    6268.SUFFIXES: .cpp .o
    6369.cpp.o:
    64     $(COMPILE) $<
     70    $(CPPCOMPILE) $<
     71
     72.SUFFIXES: .mpp .o
     73.mpp.o:
     74    $(MCOMPILE) $<
     75
     76ifneq ($(USE_CORBA), 0)
     77CORBAHEADERS = \
     78  corbaServer.h
     79CORBASOURCES = \
     80  corbaServer.mpp
     81CORBAOBJECTS = \
     82  corbaServer.o
     83else
     84CORBAHEADERS =
     85CORBASOURCES =
     86CORBAOBJECTS =
     87endif
    6588
    6689HEADERS = mgq.h mgsearch.h querycache.h queryinfo.h collectserver.h \
    6790          colservrconfig.h maptools.h filter.h source.h browsefilter.h \
    68           queryfilter.h mggdbmsource.h phrasesearch.h phrasequeryfilter.h
     91          queryfilter.h mggdbmsource.h phrasesearch.h phrasequeryfilter.h \
     92      collectset.h $(CORBAHEADERS)
    6993
    7094SOURCES = mgq.c mgsearch.cpp querycache.cpp queryinfo.cpp collectserver.cpp \
    7195          colservrconfig.cpp maptools.cpp filter.cpp source.cpp \
    7296          browsefilter.cpp queryfilter.cpp mggdbmsource.cpp phrasesearch.cpp \
    73           phrasequeryfilter.cpp
     97          phrasequeryfilter.cpp collectset.cpp $(CORBASOURCES)
    7498
    7599OBJECTS = mgq.o mgsearch.o querycache.o queryinfo.o collectserver.o \
    76100          colservrconfig.o maptools.o filter.o source.o browsefilter.o \
    77           queryfilter.o mggdbmsource.o phrasesearch.o phrasequeryfilter.o
     101          queryfilter.o mggdbmsource.o phrasesearch.o phrasequeryfilter.o \
     102      collectset.o $(CORBAOBJECTS)
    78103
    79104all : $(OBJECTS)
    80 
    81 distclean:
    82     rm -f $(OBJECTS) Makefile
    83105
    84106clean:
    … …  
    89111depend:
    90112    makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES)
     113
     114

  • branches/corba/gsdl/src/colservr/collectserver.h

    r804 r1067  
    3030#define COLLECTSERVER_H
    3131
     32// Library header files
    3233#include "gsdlconf.h"
    3334#include "text_t.h"
    … …  
    3637#include "source.h"
    3738#include "cfgread.h"
     39#include "cnfgable.h"
    3840
    3941#if defined(GSDL_USE_OBJECTSPACE)
    … …  
    6264
    6365
    64 class collectserver {
     66class collectserver : public configurable {
    6567protected:
    6668  colservrconf configinfo;

  • branches/corba/gsdl/src/colservr/colservrconfig.cpp

    r534 r1067  
    2828/*
    2929   $Log$
     30   Revision 1.2.2.1  2000/04/04 15:02:31  cs025
     31   Corba first commit
     32
    3033   Revision 1.2  1999/09/07 04:57:20  sjboddie
    3134   added gpl notice
    … …  
    6770  }
    6871
     72  return cserver.read_configfile(filename);
     73  /*
    6974  // read in the collection configuration file
    7075  text_t key;
    … …  
    8893  }
    8994  return false;
     95  */
    9096}
    9197
    … …  
    105111  }
    106112
     113  return cserver.read_configfile(filename);
     114
     115  /*
    107116  // read in the build configuration file
    108117  text_t key;
    … …  
    126135  }
    127136  return false;
     137  */
    128138}
    129139

  • branches/corba/gsdl/src/colservr/mgsearch.cpp

    r633 r1067  
    2828/*
    2929   $Log$
     30   Revision 1.22.2.1  2000/04/04 15:02:32  cs025
     31   Corba first commit
     32
    3033   Revision 1.22  1999/09/24 02:41:21  rjmcnab
    3134   change to use has_unicode_letdig in text_t
    … …  
    391394}
    392395
    393 
     396/**
     397 * search directs the whole execution of the search; a number of other
     398 * functions in this class are called as a result, and precondition
     399 * checks are also made
     400 */
    394401bool mgsearchclass::search(const queryparamclass &queryparams,
    395402               queryresultsclass &queryresults) {
    396403  assert (cache != NULL);
    397404
     405  // clear any previous results
    398406  queryresults.clear();
    399407
    … …  
    406414  if (makeindexcurrent (queryparams.index, queryparams.subcollection,
    407415            queryparams.language, queryparams.collection)) {
     416    // initialise the form of results
    408417    setsearchmode (queryparams);
     418
     419    // execute the query
    409420    submitquery (queryparams);
     421
     422    // retrieve the results
    410423    getresults (queryparams, queryresults);
     424
    411425    return true;
    412426  }
    … …  
    453467}
    454468
    455 
     469/**
     470 * submitquery constructs the query string (into UTF8 encoding)
     471 * and submits it using mgq_ask to the mg search engine.  Most
     472 * of the processing will be done inside Greenstone
     473 */
    456474void mgsearchclass::submitquery (const queryparamclass &queryparams)
    457475{
    458   // sort out the query string
     476  // sort out the query string; copy it, remove all special characters
     477  // and then convert it to a string in UTF8 format
    459478  text_t ttquerystring = queryparams.querystring;
    460479  filterquery (ttquerystring);
    … …  
    464483  mgq_ask(querystring);
    465484
     485  // destroy the temporary character array
    466486  delete querystring;
    467487}
    468488
    469 
     489/**
     490 * getrults is called to retrieve the required data on the docs
     491 * which responded to the query submitted in submitquery above.
     492 *
     493 * It calls the local mgquery (mgq) interface to MG several times,
     494 * to obtain the document numbers, term frequencies, term variants
     495 * etc.  All processing of the query will be done by Greenstone
     496 * thereafter
     497 */
    470498void mgsearchclass::getresults (const queryparamclass &queryparams,
    471499                queryresultsclass &queryresults) {
    472 
     500  // get the configuration for the maximum number of documents to
     501  // retrieve
    473502  int howmany = queryparams.maxdocs;
    474503  if (howmany == -1) howmany = MAXNUMDOCS;
    … …  
    504533}
    505534
     535/**
     536 * Tidies the given querystring, removing special characters
     537 */
    506538void mgsearchclass::filterquery (text_t &ttquerystring) {
    507539  text_t::iterator ithere = ttquerystring.begin ();

  • branches/corba/gsdl/src/db2txt/Makefile.in

    r1004 r1067  
    3030AR = ar
    3131CC = @CC@
     32CPP = @CXX@
    3233CCFLAGS = -Wall @CFLAGS@
    3334DEFS = @DEFS@
    … …  
    4243 
    4344COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
     45CPPCOMPILE = $(CPP) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
    4446LINK = $(CC) $(LDFLAGS) -o $@
     47CPPLINK = $(CPP) $(LDFLAGS) -o $@
    4548 
    4649.SUFFIXES:
    … …  
    5154.SUFFIXES: .cpp .o
    5255.cpp.o:
    53     $(COMPILE) $<
     56    $(CPPCOMPILE) $<
    5457 
    5558

  • branches/corba/gsdl/src/recpt/Makefile.in

    r1004 r1067  
    2727AR = ar
    2828CC = @CC@
     29CPP = @CXX@
    2930CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual
    30 
    31 USE_FASTCGI = @USE_FASTCGI@
    32 ifneq ($(USE_FASTCGI), 1)
    3331DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER \
    3432       -DGSDLUSAGELOG @DEFS@
    3533
     34USE_FASTCGI = @USE_FASTCGI@
     35ifneq ($(USE_FASTCGI), 1)
    3636INCLUDES = -I../../lib -I. -I../colservr -I../../packages/mg \
    37        -I../../packages/mg/lib -I../../packages/mg/src/text 
     37       -I../../packages/mg/lib -I../../packages/mg/src/text
    3838else
    39 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER \
    40        -DGSDLUSAGELOG -DUSE_FASTCGI @DEFS@
    41 
    4239INCLUDES = -I../../lib -I. -I../colservr -I../../packages/mg \
    4340       -I../../packages/mg/lib -I../../packages/mg/src/text \
    4441           -I../../packages/fcgi/include
    4542endif
     43MINCLUDES = -I. -I../../lib -I../colservr
     44
     45USE_CORBA = @USE_CORBA@
    4646
    4747RANLIB = @RANLIB@
    4848LDFLAGS = @LDFLAGS@
    49 #LIBS = -lgdbm -lstdc++ -lm #-lcrypt
    50 LIBS = @LIBS@
     49LIBS = -lgdbm -lstdc++ -lm -lcrypt
    5150
    5251GSDLOS = @gsdlos@
    … …  
    5554COMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
    5655LINK = $(CC) $(LDFLAGS) -o $@
     56
     57CPPCOMPILE = $(CPP) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
     58CPPLINK = $(CPP) $(LDFLAGS) -o $@
     59
     60MCOMPILE = mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
     61MLINK = mico-ld -static $(LDFLAGS) -o $@
     62MLIBS = $(LIBS) -lmico2.2.7                 
    5763
    5864.SUFFIXES:
    … …  
    6369.SUFFIXES: .cpp .o
    6470.cpp.o:
    65     $(COMPILE) $<
     71    $(CPPCOMPILE) $<
     72
     73.SUFFIXES: .mpp .o
     74.mpp.o:
     75    $(MCOMPILE) $<
    6676
    6777COMMONHEADERS = receptionist.h cgiwrapper.h cgiargs.h action.h browserclass.h \
    … …  
    7787RECEPTHEADERS =
    7888
     89ifeq ($(USE_CORBA), 1)
     90LIBRARYHEADERS = nullproto.h corbaproto.h
     91else
    7992LIBRARYHEADERS = nullproto.h
     93endif
    8094
    8195HEADERS = $(COMMONHEADERS) $(RECPTHEADERS) $(LIBRARYHEADERS)
    … …  
    95109RECPTSOURCES = recptmain.cpp
    96110
     111####LIBRARYSOURCES = nullproto.cpp corbaproto.mpp librarymain.cpp
    97112LIBRARYSOURCES = nullproto.cpp librarymain.cpp
    98113
    … …  
    113128RECPTOBJECTS = recptmain.o
    114129
     130####LIBRARYOBJECTS = nullproto.o corbaproto.o librarymain.o
    115131LIBRARYOBJECTS = nullproto.o librarymain.o
    116132
    … …  
    131147                  ../colservr/mggdbmsource.o \
    132148                  ../colservr/phrasesearch.o \
    133                   ../colservr/phrasequeryfilter.o
    134 
    135 
     149                  ../colservr/phrasequeryfilter.o \
     150          ../colservr/collectset.o
     151
     152ifeq ($(USE_CORBA), 1)
     153EXEC = recpt library corbaserver corbarecptldd
     154else
    136155EXEC = recpt library
     156endif
    137157
    138158all: $(EXEC)
    139 
    140 distclean:
    141     rm -f $(OBJECTS) $(EXEC) Makefile
    142159
    143160clean:
    … …  
    145162
    146163install:
    147     install -m 755 -s library ../../cgi-bin/library
     164    cp recpt /home/nzdl/nzdl-1.2/cgi-bin/recpt; \
     165    cp library /home/nzdl/nzdl-1.2/cgi-bin/library
     166#   cp $(EXEC) /home/nzdl/nzdl-1.2/cgi-bin
    148167
    149168depend:
    … …  
    166185
    167186recpt: $(RECPT_OBJS)
    168     $(LINK) $(RECPT_OBJS) $(LIBS)
     187    $(CPPLINK) $(RECPT_OBJS) $(LIBS)
    169188
    170189# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    … …  
    184203
    185204library: $(LIBRARY_OBJS)
    186     $(LINK) $(LIBRARY_OBJS) $(LIBS)
     205    $(CPPLINK) $(LIBRARY_OBJS) $(LIBS)
     206
     207# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
     208
     209RECPTLIB_OBJECTS = nullproto.o corbaproto.o \
     210                   ../../lib/corbatext_t.o ../../lib/corbaconv_text_t.o
     211ifneq ($(USE_FASTCGI), 1)
     212RLIBRARY_OBJS = $(COMMONOBJECTS) $(RECPTLIB_OBJECTS) $(COLSERVROBJECTS) \
     213    ../../lib/gsdllib.a  \
     214    ../../packages/mg/src/text/libtextin.a \
     215    ../../packages/mg/lib/libmg.a
     216else
     217RLIBRARY_OBJS = $(COMMONOBJECTS) $(RECPTLIB_OBJECTS) $(COLSERVROBJECTS) \
     218    ../../lib/gsdllib.a  \
     219    ../../packages/mg/src/text/libtextin.a \
     220    ../../packages/mg/lib/libmg.a \
     221    ../../packages/fcgi/libfcgi/libfcgi.a
     222endif
     223RECPTLIB_OBJS = $(RLIBRARY_OBJS) ../colservr/corbaServer.o
     224
     225corbaserver: $(RECPTLIB_OBJS)
     226    $(MLINK) $(RECPTLIB_OBJS) $(MLIBS)
     227
     228# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
     229
     230CORBARECPT_OBJECTS = nullproto.o corbaproto.o corbaclient.o
     231ifneq ($(USE_FASTCGI), 1)
     232CORBARECPT_OBJS = $(COMMONOBJECTS) $(CORBARECPT_OBJECTS) $(COLSERVROBJECTS) \
     233    ../../lib/gsdllib.a  \
     234    ../../packages/mg/src/text/libtextin.a \
     235    ../../packages/mg/lib/libmg.a
     236else
     237CORBARECPT_OBJS = $(COMMONOBJECTS) $(CORBARECPT_OBJECTS) $(COLSERVROBJECTS) \
     238    ../../lib/gsdllib.a  \
     239    ../../packages/mg/src/text/libtextin.a \
     240    ../../packages/mg/lib/libmg.a \
     241    ../../packages/fcgi/libfcgi/libfcgi.a
     242endif
     243
     244corbarecptldd: $(CORBARECPT_OBJS)
     245    $(MLINK) $(CORBARECPT_OBJS) $(MLIBS)
     246
     247test:

  • branches/corba/gsdl/src/recpt/browserclass.h

    r765 r1067  
    7676  void set_filter_options (FilterRequest_t &request, cgiargsclass &args);
    7777 
    78   // returns the number of tabs to add before displaying the
     78  // output_section_group returns the number of tabs to add before displaying the
    7979  // next section group
     80  // The first version takes one result of a search/query action, the
     81  // second takes all the results; ResultDocInfo_t is actually a child struct
     82  // of FilterResponse_t items.  The second version tends to output parts of an
     83  // abstract structure (e.g. for a table of contents/classifier list, the first
     84  // for an individual document
    8085  virtual int output_section_group (ResultDocInfo_t &section, cgiargsclass &args,
    8186                    const text_t &collection, int colnumber,

  • branches/corba/gsdl/src/recpt/browsetools.cpp

    r1059 r1067  
    2929/*
    3030   $Log$
     31   Revision 1.41.2.1  2000/04/04 15:02:34  cs025
     32   Corba first commit
     33
    3134   Revision 1.41  2000/04/03 07:25:02  sjboddie
    3235   replaced old DocumentIcon and DocumentContents format options
    … …  
    472475  text_t OID = args["d"];
    473476  text_t classification = "Document";
     477
     478  // if we're not outputting the TOC for a valid OID, then we should be giving
     479  // the TOC of a classification
    474480  if (OID.empty()) {
    475481    OID = args["cl"];
    476482    get_top (OID, classification);
    477   } else if (fulltoc)
     483  }
     484  // if we're to give the full TOC of a document, get the parent for the whole
     485  // document now
     486  else if (fulltoc)
    478487    get_top (args["cl"], classification);   
    479488
    … …  
    559568}
    560569
     570/**
     571 * This function outputs the contents of a classifier list to the reader -
     572 * the document will in fact be empty, so this does the "real" output
     573 */
    561574void output_toc (cgiargsclass &args, browsermapclass *browsermap,
    562575                 text_tmap &formatstrings, recptproto *collectproto,

  • branches/corba/gsdl/src/recpt/cgiwrapper.cpp

    r963 r1067  
    2828/*
    2929   $Log$
     30   Revision 1.22.2.1  2000/04/04 15:02:34  cs025
     31   Corba first commit
     32
    3033   Revision 1.22  2000/02/21 21:56:46  sjboddie
    3134   gsdlhome now comes from gsdlsite.cfg
    … …  
    126129#include <stdlib.h>
    127130#include <assert.h>
     131#include <iostream.h>
    128132
    129133#if defined(GSDL_USE_OBJECTSPACE)
    … …  
    386390  recpt.configure ("httpimg", "/gsdl/images");
    387391  char *script_name = getenv("SCRIPT_NAME");
     392
     393  // configure receptionist
    388394  if (script_name != NULL) recpt.configure("gwcgi", script_name);
    389395  else recpt.configure("gwcgi", "/cgi-bin/gw");
    390396
    391   // read in the configuration files.
     397  // read in the configuration files; check for empty collection sets
     398  // enroute
    392399  text_t gsdlhome;
    393400  if (!site_cfg_read (recpt, gsdlhome, maxrequests)) {
    … …  
    525532
    526533
     534    // if there has been no error so far, perform the production of the
     535    // output page
    527536    if (errorpage.empty()) {
    528537      text_t error_file = filename_cat (gsdlhome, "etc", "errout.txt");
    … …  
    537546    errout.close ();
    538547    page_errorparseargs(gsdlhome, errorpage);
    539       } else {
     548      }
     549      else {
     550    // produce the output page
    540551    if (!recpt.produce_cgi_page (args, pageout, errout, fastcgienv)) {
    541552      errout.close ();
    542553      page_errorcgipage(gsdlhome, errorpage);
    543     } else {
     554    }
     555    else {
    544556      errout.close ();
    545557    }

  • branches/corba/gsdl/src/recpt/cgiwrapper.h

    r533 r1067  
    3232
    3333#include "receptionist.h"
     34#include "collectset.h"
    3435
    3536// cgiwrapper does everything necessary to output a page
    … …  
    3738// collection then "collection" should be set, otherwise it
    3839// should equal "".
     40//
     41// NB: the collectset MAY NOT exist for remote protocols (e.g.
     42//     the corba protocol; as references must point to a non-
     43//     null instance, we must therefore use a pointer - sorry!
    3944void cgiwrapper (receptionist &recpt, text_t collection);
    4045

  • branches/corba/gsdl/src/recpt/documentaction.cpp

    r1059 r1067  
    2828/*
    2929   $Log$
     30   Revision 1.36.2.1  2000/04/04 15:02:35  cs025
     31   Corba first commit
     32
    3033   Revision 1.36  2000/04/03 07:26:28  sjboddie
    3134   replaced old DocumentIcon and DocumentContents format options
    … …  
    11311134      ResultDocInfo_tarray::iterator sechere = inforesponse.docInfo.begin();
    11321135      ResultDocInfo_tarray::iterator secend = inforesponse.docInfo.end();
    1133    
     1136
    11341137      if (arg_gt == 1) {
    11351138    // check if there are more than 10 sections containing text to be expanded -

  • branches/corba/gsdl/src/recpt/librarymain.cpp

    r994 r1067  
    2828/*
    2929   $Log$
     30   Revision 1.24.2.1  2000/04/04 15:02:36  cs025
     31   Corba first commit
     32
    3033   Revision 1.24  2000/02/29 20:59:02  sjboddie
    3134   added error message when unable to read from collect directory - should
    … …  
    122125#include "mggdbmsource.h"
    123126#include "fileutil.h"
     127// #include "collectset.h"
    124128#include <assert.h>
    125129
    … …  
    149153int main () {
    150154  receptionist recpt;
    151   nullproto nproto;
     155  nullproto    nproto;
     156  collectset  *cservers;
     157  text_t       gsdlhome;
     158
     159  cservers = new collectset(gsdlhome);
     160
     161  nproto.set_collectset(cservers);
     162 
     163  /*
    152164  text_tarray collections;
    153 
    154   // get gsdlhome (if we fail the error will be picked up later -- in
    155   // cgiwrapper)
    156   text_t gsdlhome;
    157   if (site_cfg_read (gsdlhome)) {
    158     text_t collectdir = filename_cat (gsdlhome, "collect");
    159     if (!read_dir (collectdir, collections)) {
    160       cerr << "couldn't read collect directory - make sure gsdlhome field is correct in gsdlsite.cfg\n";
    161       exit (1);
    162     }
    163   }
     165  if (!read_dir (GSDL_GSDLHOME "/collect", collections)) exit (1);
    164166
    165167  text_tarray::const_iterator thiscol = collections.begin();
    166168  text_tarray::const_iterator endcol = collections.end();
    167  
     169
    168170  while (thiscol != endcol) {
    169    
     171
    170172    // ignore the modelcol
    171     if (*thiscol == "modelcol") {thiscol ++; continue;}
    172    
     173    if (*thiscol == "modelcol") {
     174      thiscol ++;
     175      continue;
     176    }
     177
    173178    // this memory is created but never destroyed
    174179    // we're also not doing any error checking to make sure we didn't
    … …  
    181186    filterclass *filter = new filterclass ();
    182187    cserver->add_filter (filter);
    183      
     188   
    184189    // add a browse filter
    185190    browsefilterclass *browsefilter = new browsefilterclass();
    … …  
    192197    queryfilter->set_mgsearchptr (mgsearch);
    193198    cserver->add_filter (queryfilter);
    194    
     199
    195200    // add a mg and gdbm source
    196201    mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
    … …  
    206211    thiscol ++;
    207212  }
     213  */
    208214 
    209215  // add the protocol to the receptionist
    210216  recpt.add_protocol (&nproto);
    211  
     217
    212218  // add other converters
    213219  utf8inconvertclass utf8inconvert;
    … …  
    282288}
    283289
    284 
    285 
    286 
    287 

  • branches/corba/gsdl/src/recpt/nullproto.cpp

    r801 r1067  
    2828/*
    2929   $Log$
     30   Revision 1.12.2.1  2000/04/04 15:02:36  cs025
     31   Corba first commit
     32
    3033   Revision 1.12  1999/12/05 21:23:39  sjboddie
    3134   support for multiple gsdlhomes and gdbmhomes
    … …  
    7780
    7881#include "nullproto.h"
    79 #include "colservrconfig.h"
    8082#include <assert.h>
    8183
    … …  
    8688  // it should be done just after the collection server has been
    8789  // created
    88   if (key == "collection" || key == "collectdir") return;
    8990
    90   collectservermapclass::iterator here = cservers.begin();
    91   collectservermapclass::iterator end = cservers.end();
    92 
    93   while (here != end) {
    94     assert ((*here).second.c != NULL);
    95     if ((*here).second.c != NULL) {
    96       if (key == "collectinfo") {
    97     if ((*here).first == cfgline[0]) {
    98       (*here).second.c->configure ("gsdlhome", cfgline[1]);
    99       (*here).second.c->configure ("gdbmhome", cfgline[2]);
    100     }
    101       } else {
    102     (*here).second.c->configure (key, cfgline);
    103       }
    104     }
    105 
    106     here++;
     91  // the protocol should not configure the collection set; it should be
     92  // done direct to the collection server set
     93  if (key == "gsdlhome") {
     94    cset->configure(key, cfgline);
    10795  }
    10896}
    … …  
    11098// this init will configure and init each of the collection servers
    11199bool nullproto::init (ostream &logout) {
    112   collectservermapclass::iterator here = cservers.begin();
    113   collectservermapclass::iterator end = cservers.end();
    114 
    115   while (here != end) {
    116     assert ((*here).second.c != NULL);
    117     if ((*here).second.c != NULL) {
    118       const colservrconf &configinfo = (*here).second.c->get_configinfo ();
    119 
    120       // configure this collection server
    121 
    122       // note that we read build.cfg before collect.cfg so that the indexmaps
    123       // are available to decode defaultindex, defaultsubcollection, and
    124       // defaultlanguage
    125       if (!build_cfg_read (*((*here).second.c), configinfo.gsdlhome,
    126                configinfo.collection)) {
    127     outconvertclass text_t2ascii;
    128     logout << text_t2ascii
    129            << "Warning: couldn't read build.cfg file for collection \"" //****
    130            << configinfo.collection << "\", gsdlhome=\""
    131            << configinfo.gsdlhome << "\"\n";
    132     //  return false; //****
    133     here ++;
    134     continue;
    135       }
    136 
    137       if (!collect_cfg_read (*((*here).second.c), configinfo.gsdlhome,
    138                  configinfo.collection)) {
    139     outconvertclass text_t2ascii;
    140     logout << text_t2ascii
    141            << "Warning: couldn't read collect.cfg file for collection \""
    142            << configinfo.collection << "\", gsdlhome=\""
    143            << configinfo.gsdlhome << "\"\n";
    144     //  return false; //****
    145     here ++;
    146     continue;
    147       }
    148 
    149       if (!(*here).second.c->init (logout)) return false;
    150     }
    151     here++;
    152   }
    153 
    154   return true;
     100  return cset->init(logout);
    155101}
    156102
    … …  
    162108void nullproto::get_collection_list (text_tarray &collist, comerror_t &err,
    163109                     ostream &/*logout*/) {
    164   collist.erase(collist.begin(),collist.end());
    165   err = noError;
    166 
    167   collectservermapclass::iterator here = cservers.begin();
    168   collectservermapclass::iterator end = cservers.end();
    169   while (here != end) {
    170     assert ((*here).second.c != NULL);
    171     if ((*here).second.c != NULL) {
    172       collist.push_back ((*here).second.c->get_collection_name());
    173     }
    174     here++;
    175   }
     110  cset->getCollectionList(collist);
     111  err = noError; // no error is guaranteed - collection server shouldn't
     112                 // about receptionist error states, logout is irrelevant
    176113}
    177114
    178115void nullproto::has_collection (const text_t &collection, bool &hascollection,
    179116                comerror_t &err, ostream &/*logout*/) {
    180   hascollection = (cservers.getcollectserver(collection) != NULL);
     117  hascollection = (cset->getCollectServer(collection) != NULL);
    181118  err = noError;
    182119}
    … …  
    184121void nullproto::ping (const text_t &collection, bool &wassuccess,
    185122              comerror_t &err, ostream &/*logout*/) {
    186   wassuccess = (cservers.getcollectserver(collection) != NULL);
     123  wassuccess = (cset->getCollectServer(collection) != NULL);
    187124  err = noError;
    188125}
    … …  
    191128                 ColInfoResponse_t &collectinfo,
    192129                 comerror_t &err, ostream &logout) {
    193   collectserver *cserver = cservers.getcollectserver (collection);
     130  collectserver *cserver = cset->getCollectServer (collection);
    194131  if (cserver != NULL) cserver->get_collectinfo (collectinfo, err, logout);
    195132  else err = protocolError;
    … …  
    200137                InfoFiltersResponse_t &response,
    201138                comerror_t &err, ostream &logout) {
    202   collectserver *cserver = cservers.getcollectserver (collection);
     139  collectserver *cserver = cset->getCollectServer (collection);
    203140  if (cserver != NULL) cserver->get_filterinfo (response, err, logout);
    204141  else err = protocolError;
    … …  
    209146                   InfoFilterOptionsResponse_t &response,
    210147                   comerror_t &err, ostream &logout) {
    211   collectserver *cserver = cservers.getcollectserver (collection);
     148  collectserver *cserver = cset->getCollectServer (collection);
    212149  if (cserver != NULL) cserver->get_filteroptions (request, response, err, logout);
    213150  else err = protocolError;
    … …  
    218155            FilterResponse_t &response,
    219156            comerror_t &err, ostream &logout) {
    220   collectserver *cserver = cservers.getcollectserver (collection);
     157  collectserver *cserver = cset->getCollectServer (collection);
    221158  if (cserver != NULL) cserver->filter (request, response, err, logout);
    222159  else err = protocolError;
    … …  
    227164                  DocumentResponse_t &response,
    228165                  comerror_t &err, ostream &logout) {
    229   collectserver *cserver = cservers.getcollectserver (collection);
     166  collectserver *cserver = cset->getCollectServer (collection);
    230167  if (cserver != NULL) cserver->get_document (request, response, err, logout);
    231168  else err = protocolError;

  • branches/corba/gsdl/src/recpt/nullproto.h

    r533 r1067  
    3232#include "gsdlconf.h"
    3333#include "collectserver.h"
     34#include "collectset.h"
    3435#include "recptproto.h"
    3536
    … …  
    3738class nullproto : public recptproto {
    3839protected:
    39   collectservermapclass cservers;
     40  collectset           *cset;
    4041public:
    4142  virtual ~nullproto() {}
    … …  
    4344  // add_collectserver should be called for each collection server
    4445  // before any configuration is done
    45   void add_collectserver (collectserver *thecserver)
    46     {cservers.addcollectserver(thecserver);}
     46  void set_collectset(collectset *set)
     47    { this->cset = set;
     48    }
    4749
    4850  // this configure will configure each of the collection servers

  • branches/corba/gsdl/src/recpt/receptionist.h

    r864 r1067  
    3939#include "converter.h"
    4040#include "cfgread.h"
     41#include "cnfgable.h"
    4142
    4243// the MACROPRECEDENCE macro is used as a default. override
    … …  
    7374
    7475
    75 class receptionist {
     76class receptionist : public configurable {
    7677protected:
    7778  recptconf configinfo;
    … …  
    141142  // it contains. The configuration should take place after everything
    142143  // has been added but before the initialisation.
    143   virtual void configure (const text_t &key, const text_tarray &cfgline);
     144  void configure (const text_t &key, const text_tarray &cfgline);
    144145  virtual void configure (const text_t &key, const text_t &value);
    145146  const recptconf &get_configinfo () {return configinfo;}

  • branches/corba/gsdl/src/recpt/recptconfig.cpp

    r963 r1067  
    2828/*
    2929   $Log$
     30   Revision 1.6.2.1  2000/04/04 15:02:38  cs025
     31   Corba first commit
     32
    3033   Revision 1.6  2000/02/21 21:55:33  sjboddie
    3134   gsdlhome now comes from gsdlsite.cfg
    … …  
    5558#include "fileutil.h"
    5659#include "cfgread.h"
     60#include "cnfgator.h"
    5761
    5862
    … …  
    6872#endif
    6973
     74class __site_configuration : public configurable {
     75private:
     76  text_t *gsdlhome;
     77  int    *maxrequests;
     78public:
     79  __site_configuration (text_t *_gsdlhome, int *_maxrequests) {
     80    gsdlhome = _gsdlhome;
     81    maxrequests = _maxrequests;
     82  }
     83
     84  __site_configuration (text_t *_gsdlhome) {
     85    gsdlhome    = _gsdlhome;
     86    maxrequests = NULL;
     87  }
     88
     89  inline void configure (const text_t &key, const text_tarray &cfgline) {
     90    if (key == "gsdlhome") {
     91      *gsdlhome = cfgline[0];
     92    }
     93
     94    if (key == "maxrequests" &&
     95    maxrequests != NULL) {
     96      *maxrequests = cfgline[0].getint();
     97      if ((*maxrequests) < 1) {
     98    *maxrequests = 1;
     99      }
     100    }
     101  }
     102};
     103
    70104
    71105// reads site configuration file returning true on success
    … …  
    73107// gsdlsite.cfg should be in same directory as library executable
    74108bool site_cfg_read (receptionist &recpt, text_t &gsdlhome, int &maxrequests) {
    75 
     109  // initialise configurator, etc.
     110  __site_configuration sitecfg (&gsdlhome, &maxrequests);
     111  configurator         gsdlconfigurator(&recpt);
     112
     113  gsdlconfigurator.add_configurable(&sitecfg);
     114
     115  // blank the gsdl home text
    76116  gsdlhome.clear();
    77117
     118  /*
    78119  // Look for gsdlsite.cfg in same directory that executable is in.
    79120  text_tarray cfgline;
    … …  
    86127    key = cfgline[0];
    87128    cfgline.erase(cfgline.begin());
    88    
    89     if (key == "maxrequests") {
    90       maxrequests = cfgline[0].getint();
    91       if (maxrequests < 1) maxrequests = 1;
    92     }
    93 
    94     if (key == "gsdlhome")
    95       gsdlhome = cfgline[0];
    96 
     129
     130    sitecfg.configure(key, cfgline);
    97131    // configure the receptionist
    98132    recpt.configure (key, cfgline);
    … …  
    100134    }
    101135    confin.close ();
     136
     137    cout << "GRB: " << maxrequests << endl;
     138
     139    return true;
     140  }
     141  */
     142
     143  if (gsdlconfigurator.configure("gsdlsite.cfg")) {
    102144    return true;
    103145  }
    … …  
    107149// this version just grabs gsdlhome, returns false if it can't find it
    108150bool site_cfg_read (text_t &gsdlhome) {
     151  // get gsdlhome etc
     152  __site_configuration sitecfg(&gsdlhome);
     153  configurator gsdlconfigurator(&sitecfg);
    109154
    110155  gsdlhome.clear();
    111156
     157  if (gsdlconfigurator.configure("gsdlsite.cfg") &&
     158      !gsdlhome.empty()) {
     159    return true;
     160  }
     161  /*
    112162  // Look for gsdlsite.cfg in same directory that executable is in.
    113163  text_tarray cfgline;
    … …  
    126176    confin.close ();
    127177  }
     178  */
    128179  return false;
    129180}
    … …  
    137188  // read in the main configuration file
    138189  bool rv = false;
     190
    139191  text_t key, filename;
    140192  text_tarray cfgline;
    … …  
    142194  filename = filename_cat (filename, "main.cfg");
    143195  if (file_exists (filename)) {
    144     char *cstr = filename.getcstr();
    145     ifstream confin (cstr);
    146     delete cstr;
    147  
    148     if (confin) {
    149       while (read_cfg_line(confin, cfgline) >= 0) {
    150     if (cfgline.size () >= 2) {
    151       key = cfgline[0];
    152       cfgline.erase(cfgline.begin());
    153    
    154       // configure the receptionist
    155       recpt.configure (key, cfgline);
    156     }
    157       }
    158       confin.close ();
    159       rv = true;
    160     }
     196    rv = recpt.read_configfile(filename);
    161197  }
    162198 
    … …  
    175211
    176212    if (!filename.empty()) {
    177       char *cstr = filename.getcstr();
    178       ifstream confin (cstr);
    179       delete cstr;
    180      
    181       if (confin) {
    182     while (read_cfg_line(confin, cfgline) >= 0) {
    183       if (cfgline.size () >= 2) {
    184         key = cfgline[0];
    185         cfgline.erase(cfgline.begin());
    186        
    187         // configure the receptionist
    188         recpt.configure (key, cfgline);
    189       }
    190     }
    191     confin.close ();
    192     rv = true;
    193       }
     213      rv |= recpt.read_configfile(filename);
    194214    }
    195215  }

  • branches/corba/gsdl/src/recpt/recptconfig.h

    r963 r1067  
    3434#include "text_t.h"
    3535#include "receptionist.h"
     36#include "collectset.h"
    3637
    3738

  • branches/corba/gsdl/src/recpt/recptmain.cpp

    r533 r1067  
    2828/*
    2929   $Log$
     30   Revision 1.3.2.1  2000/04/04 15:02:38  cs025
     31   Corba first commit
     32
    3033   Revision 1.3  1999/09/07 04:56:59  sjboddie
    3134   added GPL notice
    … …  
    5255}
    5356
     57

  • branches/corba/gsdl/src/txt2db/Makefile.in

    r1004 r1067  
    2929AR = ar
    3030CC = @CC@
     31CPP = @CXX@
    3132CCFLAGS = -Wall @CFLAGS@
    3233DEFS = @DEFS@
    … …  
    3536LDFLAGS = @LDFLAGS@
    3637DPLIBS = ../../lib/gsdllib.a ../../packages/mg/lib/unitool.o
    37 #LIBS = ../../lib/gsdllib.a ../../packages/mg/lib/unitool.o -lstdc++ -lgdbm
    3838LIBS = ../../lib/gsdllib.a ../../packages/mg/lib/unitool.o @LIBS@
    3939GSDLOS = @gsdlos@
    … …  
    4141 
    4242COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
     43CPPCOMPILE = $(CPP) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
     44MCOMPILE = mico-c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
    4345LINK = $(CC) $(LDFLAGS) -o $@
     46MLINK = mico-ld $(LDFLAGS) -lmico2.2.7 -o $@
     47CPPLINK = $(CPP) $(LDFLAGS) -o $@
    4448 
    4549.SUFFIXES:
    … …  
    5054.SUFFIXES: .cpp .o
    5155.cpp.o:
    52     $(COMPILE) $<
     56    $(CPPCOMPILE) $<
    5357 
     58.SUFFIXES: .mpp .o
     59.mpp.o:
     60    $(MCOMPILE) $<
    5461
    5562HEADERS =
    … …  
    8289
    8390txt2db: $(TXT2DB_OBJS) $(DPLIBS)
    84     $(LINK) $(TXT2DB_OBJS) $(LIBS)
     91    $(MLINK) $(TXT2DB_OBJS) $(LIBS)
    8592
    8693
Note: See TracChangeset for help on using the changeset viewer.