- Timestamp:
- 2000-04-05T03:02:39+12:00 (24 years ago)
- Location:
- branches/corba/gsdl
- Files:
-
- 29 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/corba/gsdl/Makefile.in
r993 r1067 46 46 ALLFILES = $(OBJECTS) 47 47 48 INSTALLDIRS = src/recpt src/txt2db src/db2txt src/hashfile packages/mg48 INSTALLDIRS = packages/mg src/recpt src/txt2db src/db2txt src/hashfile 49 49 50 50 OTHERDIRS = packages/mg lib src/colservr src/recpt src/txt2db src/db2txt src/hashfile 51 51 52 52 all: 53 sed s^XXXX^$(TOPSRC)^ lib/gsdlhome.h.example > lib/gsdlhome.h 54 mkdir -p bin/$(GSDLOS) 55 53 56 for odir in $(OTHERDIRS); do \ 54 57 echo making $@ in $$odir; \ … … 57 60 58 61 install: 62 59 63 for idir in $(INSTALLDIRS); do \ 60 64 echo installing $$idir; \ … … 62 66 done 63 67 64 distclean:68 clean: 65 69 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 72 71 for subdir in $(INSTALLDIRS) $(OTHERDIRS); do \ 73 72 echo cleaning $@ in $$subdir; \ 74 73 (cd $$subdir && $(MAKE) clean) || exit 1; \ 75 74 done 76 77 75 78 76 # For an explanation of the following Makefile rules, see node -
branches/corba/gsdl/acconfig.h
r697 r1067 38 38 #undef USE_FASTCGI 39 39 40 /* Define USE_CORBA if needsbe */ 41 #undef USE_CORBA 40 42 41 43 42 44 43 -
branches/corba/gsdl/config.h.in
r998 r1067 99 99 #undef USE_FASTCGI 100 100 101 /* Define USE_CORBA if needsbe */ 102 #undef USE_CORBA 103 101 104 /* Define if you have the ftime function. */ 102 105 #undef HAVE_FTIME -
branches/corba/gsdl/configure
r998 r1067 575 575 fi 576 576 577 578 USE_CORBA=1 579 cat >> confdefs.h <<\EOF 580 #define USE_CORBA 1 581 EOF 582 583 584 577 585 LDFLAGS= 578 586 CFLAGS=-O2 … … 582 590 set dummy gcc; ac_word=$2 583 591 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 584 echo "configure:5 85: checking for $ac_word" >&5592 echo "configure:593: checking for $ac_word" >&5 585 593 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then 586 594 echo $ac_n "(cached) $ac_c" 1>&6 … … 612 620 set dummy cc; ac_word=$2 613 621 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 614 echo "configure:6 15: checking for $ac_word" >&5622 echo "configure:623: checking for $ac_word" >&5 615 623 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then 616 624 echo $ac_n "(cached) $ac_c" 1>&6 … … 663 671 set dummy cl; ac_word=$2 664 672 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 665 echo "configure:6 66: checking for $ac_word" >&5673 echo "configure:674: checking for $ac_word" >&5 666 674 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then 667 675 echo $ac_n "(cached) $ac_c" 1>&6 … … 695 703 696 704 echo $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" >&5705 echo "configure:706: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 698 706 699 707 ac_ext=c … … 706 714 cat > conftest.$ac_ext << EOF 707 715 708 #line 7 09"configure"716 #line 717 "configure" 709 717 #include "confdefs.h" 710 718 711 719 main(){return(0);} 712 720 EOF 713 if { (eval echo configure:7 14: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then721 if { (eval echo configure:722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 714 722 ac_cv_prog_cc_works=yes 715 723 # If we can't run a trivial program, we are probably using a cross compiler. … … 737 745 fi 738 746 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 739 echo "configure:74 0: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5747 echo "configure:748: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 740 748 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 741 749 cross_compiling=$ac_cv_prog_cc_cross 742 750 743 751 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 744 echo "configure:7 45: checking whether we are using GNU C" >&5752 echo "configure:753: checking whether we are using GNU C" >&5 745 753 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then 746 754 echo $ac_n "(cached) $ac_c" 1>&6 … … 751 759 #endif 752 760 EOF 753 if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:7 54: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then761 if { 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 754 762 ac_cv_prog_gcc=yes 755 763 else … … 770 778 CFLAGS= 771 779 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 772 echo "configure:7 73: checking whether ${CC-cc} accepts -g" >&5780 echo "configure:781: checking whether ${CC-cc} accepts -g" >&5 773 781 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then 774 782 echo $ac_n "(cached) $ac_c" 1>&6 … … 806 814 set dummy $ac_prog; ac_word=$2 807 815 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 808 echo "configure:8 09: checking for $ac_word" >&5816 echo "configure:817: checking for $ac_word" >&5 809 817 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then 810 818 echo $ac_n "(cached) $ac_c" 1>&6 … … 838 846 839 847 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 840 echo "configure:84 1: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5848 echo "configure:849: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 841 849 842 850 ac_ext=C … … 849 857 cat > conftest.$ac_ext << EOF 850 858 851 #line 8 52"configure"859 #line 860 "configure" 852 860 #include "confdefs.h" 853 861 854 862 int main(){return(0);} 855 863 EOF 856 if { (eval echo configure:8 57: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then864 if { (eval echo configure:865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 857 865 ac_cv_prog_cxx_works=yes 858 866 # If we can't run a trivial program, we are probably using a cross compiler. … … 880 888 fi 881 889 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 882 echo "configure:8 83: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5890 echo "configure:891: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 883 891 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 884 892 cross_compiling=$ac_cv_prog_cxx_cross 885 893 886 894 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 887 echo "configure:8 88: checking whether we are using GNU C++" >&5895 echo "configure:896: checking whether we are using GNU C++" >&5 888 896 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then 889 897 echo $ac_n "(cached) $ac_c" 1>&6 … … 894 902 #endif 895 903 EOF 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; then904 if { 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 897 905 ac_cv_prog_gxx=yes 898 906 else … … 913 921 CXXFLAGS= 914 922 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 915 echo "configure:9 16: checking whether ${CXX-g++} accepts -g" >&5923 echo "configure:924: checking whether ${CXX-g++} accepts -g" >&5 916 924 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then 917 925 echo $ac_n "(cached) $ac_c" 1>&6 … … 944 952 fi 945 953 946 for ac_prog in mawk gawk nawk awk954 for ac_prog in gawk mawk nawk awk 947 955 do 948 956 # Extract the first word of "$ac_prog", so it can be a program name with args. 949 957 set dummy $ac_prog; ac_word=$2 950 958 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 951 echo "configure:9 52: checking for $ac_word" >&5959 echo "configure:960: checking for $ac_word" >&5 952 960 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then 953 961 echo $ac_n "(cached) $ac_c" 1>&6 … … 983 991 set dummy $ac_prog; ac_word=$2 984 992 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 985 echo "configure:9 86: checking for $ac_word" >&5993 echo "configure:994: checking for $ac_word" >&5 986 994 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then 987 995 echo $ac_n "(cached) $ac_c" 1>&6 … … 1044 1052 # ./install, which can be erroneously created by make from ./install.sh. 1045 1053 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 1046 echo "configure:10 47: checking for a BSD compatible install" >&51054 echo "configure:1055: checking for a BSD compatible install" >&5 1047 1055 if test -z "$INSTALL"; then 1048 1056 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then … … 1097 1105 1098 1106 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 1099 echo "configure:110 0: checking whether ln -s works" >&51107 echo "configure:1108: checking whether ln -s works" >&5 1100 1108 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then 1101 1109 echo $ac_n "(cached) $ac_c" 1>&6 … … 1118 1126 1119 1127 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 1120 echo "configure:112 1: checking whether ${MAKE-make} sets \${MAKE}" >&51128 echo "configure:1129: checking whether ${MAKE-make} sets \${MAKE}" >&5 1121 1129 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` 1122 1130 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then … … 1147 1155 set dummy ranlib; ac_word=$2 1148 1156 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 1149 echo "configure:115 0: checking for $ac_word" >&51157 echo "configure:1158: checking for $ac_word" >&5 1150 1158 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then 1151 1159 echo $ac_n "(cached) $ac_c" 1>&6 … … 1177 1185 1178 1186 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 1179 echo "configure:118 0: checking how to run the C preprocessor" >&51187 echo "configure:1188: checking how to run the C preprocessor" >&5 1180 1188 # On Suns, sometimes $CPP names a directory. 1181 1189 if test -n "$CPP" && test -d "$CPP"; then … … 1192 1200 # not just through cpp. 1193 1201 cat > conftest.$ac_ext <<EOF 1194 #line 1 195"configure"1202 #line 1203 "configure" 1195 1203 #include "confdefs.h" 1196 1204 #include <assert.h> … … 1198 1206 EOF 1199 1207 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 1200 { (eval echo configure:120 1: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }1208 { (eval echo configure:1209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1201 1209 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 1202 1210 if test -z "$ac_err"; then … … 1209 1217 CPP="${CC-cc} -E -traditional-cpp" 1210 1218 cat > conftest.$ac_ext <<EOF 1211 #line 12 12"configure"1219 #line 1220 "configure" 1212 1220 #include "confdefs.h" 1213 1221 #include <assert.h> … … 1215 1223 EOF 1216 1224 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 1217 { (eval echo configure:12 18: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }1225 { (eval echo configure:1226: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1218 1226 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 1219 1227 if test -z "$ac_err"; then … … 1226 1234 CPP="${CC-cc} -nologo -E" 1227 1235 cat > conftest.$ac_ext <<EOF 1228 #line 12 29"configure"1236 #line 1237 "configure" 1229 1237 #include "confdefs.h" 1230 1238 #include <assert.h> … … 1232 1240 EOF 1233 1241 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 1234 { (eval echo configure:12 35: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }1242 { (eval echo configure:1243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1235 1243 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 1236 1244 if test -z "$ac_err"; then … … 1257 1265 1258 1266 echo $ac_n "checking for AIX""... $ac_c" 1>&6 1259 echo "configure:126 0: checking for AIX" >&51267 echo "configure:1268: checking for AIX" >&5 1260 1268 cat > conftest.$ac_ext <<EOF 1261 #line 12 62"configure"1269 #line 1270 "configure" 1262 1270 #include "confdefs.h" 1263 1271 #ifdef _AIX … … 1281 1289 1282 1290 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 1283 echo "configure:12 84: checking for POSIXized ISC" >&51291 echo "configure:1292: checking for POSIXized ISC" >&5 1284 1292 if test -d /etc/conf/kconfig.d && 1285 1293 grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 … … 1303 1311 ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` 1304 1312 echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 1305 echo "configure:13 06: checking for minix/config.h" >&51313 echo "configure:1314: checking for minix/config.h" >&5 1306 1314 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 1307 1315 echo $ac_n "(cached) $ac_c" 1>&6 1308 1316 else 1309 1317 cat > conftest.$ac_ext <<EOF 1310 #line 131 1"configure"1318 #line 1319 "configure" 1311 1319 #include "confdefs.h" 1312 1320 #include <minix/config.h> 1313 1321 EOF 1314 1322 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 1315 { (eval echo configure:13 16: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }1323 { (eval echo configure:1324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1316 1324 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 1317 1325 if test -z "$ac_err"; then … … 1351 1359 1352 1360 echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 1353 echo "configure:13 54: checking for ${CC-cc} option to accept ANSI C" >&51361 echo "configure:1362: checking for ${CC-cc} option to accept ANSI C" >&5 1354 1362 if eval "test \"`echo '$''{'ac_cv_prog_cc_stdc'+set}'`\" = set"; then 1355 1363 echo $ac_n "(cached) $ac_c" 1>&6 … … 1367 1375 CFLAGS="$ac_save_CFLAGS $ac_arg" 1368 1376 cat > conftest.$ac_ext <<EOF 1369 #line 137 0"configure"1377 #line 1378 "configure" 1370 1378 #include "confdefs.h" 1371 1379 #if !defined(__STDC__) || __STDC__ != 1 … … 1379 1387 ; return 0; } 1380 1388 EOF 1381 if { (eval echo configure:13 82: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then1389 if { (eval echo configure:1390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 1382 1390 rm -rf conftest* 1383 1391 ac_cv_prog_cc_stdc="$ac_arg"; break … … 1400 1408 1401 1409 echo $ac_n "checking for function prototypes""... $ac_c" 1>&6 1402 echo "configure:14 03: checking for function prototypes" >&51410 echo "configure:1411: checking for function prototypes" >&5 1403 1411 if test "$ac_cv_prog_cc_stdc" != no; then 1404 1412 echo "$ac_t""yes" 1>&6 … … 1414 1422 1415 1423 echo $ac_n "checking for working const""... $ac_c" 1>&6 1416 echo "configure:14 17: checking for working const" >&51424 echo "configure:1425: checking for working const" >&5 1417 1425 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then 1418 1426 echo $ac_n "(cached) $ac_c" 1>&6 1419 1427 else 1420 1428 cat > conftest.$ac_ext <<EOF 1421 #line 14 22"configure"1429 #line 1430 "configure" 1422 1430 #include "confdefs.h" 1423 1431 … … 1468 1476 ; return 0; } 1469 1477 EOF 1470 if { (eval echo configure:147 1: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then1478 if { (eval echo configure:1479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 1471 1479 rm -rf conftest* 1472 1480 ac_cv_c_const=yes … … 1489 1497 1490 1498 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 1491 echo "configure:1 492: checking for ANSI C header files" >&51499 echo "configure:1500: checking for ANSI C header files" >&5 1492 1500 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then 1493 1501 echo $ac_n "(cached) $ac_c" 1>&6 1494 1502 else 1495 1503 cat > conftest.$ac_ext <<EOF 1496 #line 1 497"configure"1504 #line 1505 "configure" 1497 1505 #include "confdefs.h" 1498 1506 #include <stdlib.h> … … 1502 1510 EOF 1503 1511 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 1504 { (eval echo configure:15 05: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }1512 { (eval echo configure:1513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1505 1513 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 1506 1514 if test -z "$ac_err"; then … … 1519 1527 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 1520 1528 cat > conftest.$ac_ext <<EOF 1521 #line 15 22"configure"1529 #line 1530 "configure" 1522 1530 #include "confdefs.h" 1523 1531 #include <string.h> … … 1537 1545 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 1538 1546 cat > conftest.$ac_ext <<EOF 1539 #line 154 0"configure"1547 #line 1548 "configure" 1540 1548 #include "confdefs.h" 1541 1549 #include <stdlib.h> … … 1558 1566 else 1559 1567 cat > conftest.$ac_ext <<EOF 1560 #line 156 1"configure"1568 #line 1569 "configure" 1561 1569 #include "confdefs.h" 1562 1570 #include <ctype.h> … … 1569 1577 1570 1578 EOF 1571 if { (eval echo configure:15 72: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null1579 if { (eval echo configure:1580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 1572 1580 then 1573 1581 : … … 1593 1601 1594 1602 echo $ac_n "checking for off_t""... $ac_c" 1>&6 1595 echo "configure:1 596: checking for off_t" >&51603 echo "configure:1604: checking for off_t" >&5 1596 1604 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then 1597 1605 echo $ac_n "(cached) $ac_c" 1>&6 1598 1606 else 1599 1607 cat > conftest.$ac_ext <<EOF 1600 #line 160 1"configure"1608 #line 1609 "configure" 1601 1609 #include "confdefs.h" 1602 1610 #include <sys/types.h> … … 1626 1634 1627 1635 echo $ac_n "checking for size_t""... $ac_c" 1>&6 1628 echo "configure:16 29: checking for size_t" >&51636 echo "configure:1637: checking for size_t" >&5 1629 1637 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then 1630 1638 echo $ac_n "(cached) $ac_c" 1>&6 1631 1639 else 1632 1640 cat > conftest.$ac_ext <<EOF 1633 #line 16 34"configure"1641 #line 1642 "configure" 1634 1642 #include "confdefs.h" 1635 1643 #include <sys/types.h> … … 1659 1667 1660 1668 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 1661 echo "configure:16 62: checking whether time.h and sys/time.h may both be included" >&51669 echo "configure:1670: checking whether time.h and sys/time.h may both be included" >&5 1662 1670 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then 1663 1671 echo $ac_n "(cached) $ac_c" 1>&6 1664 1672 else 1665 1673 cat > conftest.$ac_ext <<EOF 1666 #line 16 67"configure"1674 #line 1675 "configure" 1667 1675 #include "confdefs.h" 1668 1676 #include <sys/types.h> … … 1673 1681 ; return 0; } 1674 1682 EOF 1675 if { (eval echo configure:16 76: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then1683 if { (eval echo configure:1684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 1676 1684 rm -rf conftest* 1677 1685 ac_cv_header_time=yes … … 1694 1702 1695 1703 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 1696 echo "configure:1 697: checking whether struct tm is in sys/time.h or time.h" >&51704 echo "configure:1705: checking whether struct tm is in sys/time.h or time.h" >&5 1697 1705 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then 1698 1706 echo $ac_n "(cached) $ac_c" 1>&6 1699 1707 else 1700 1708 cat > conftest.$ac_ext <<EOF 1701 #line 17 02"configure"1709 #line 1710 "configure" 1702 1710 #include "confdefs.h" 1703 1711 #include <sys/types.h> … … 1707 1715 ; return 0; } 1708 1716 EOF 1709 if { (eval echo configure:171 0: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then1717 if { (eval echo configure:1718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 1710 1718 rm -rf conftest* 1711 1719 ac_cv_struct_tm=time.h … … 1730 1738 if test "$ac_cv_prog_cc_stdc" = '-Xc'; then 1731 1739 cat > conftest.$ac_ext <<EOF 1732 #line 17 33"configure"1740 #line 1741 "configure" 1733 1741 #include "confdefs.h" 1734 1742 #include <stdio.h> … … 1738 1746 ; return 0; } 1739 1747 EOF 1740 if { (eval echo configure:174 1: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then1748 if { (eval echo configure:1749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 1741 1749 : 1742 1750 else … … 1751 1759 1752 1760 echo $ac_n "checking for main in -lg""... $ac_c" 1>&6 1753 echo "configure:17 54: checking for main in -lg" >&51761 echo "configure:1762: checking for main in -lg" >&5 1754 1762 ac_lib_var=`echo g'_'main | sed 'y%./+-%__p_%'` 1755 1763 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then … … 1759 1767 LIBS="-lg $LIBS" 1760 1768 cat > conftest.$ac_ext <<EOF 1761 #line 17 62"configure"1769 #line 1770 "configure" 1762 1770 #include "confdefs.h" 1763 1771 … … 1766 1774 ; return 0; } 1767 1775 EOF 1768 if { (eval echo configure:17 69: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then1776 if { (eval echo configure:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 1769 1777 rm -rf conftest* 1770 1778 eval "ac_cv_lib_$ac_lib_var=yes" … … 1794 1802 1795 1803 echo $ac_n "checking for main in -lgdbm""... $ac_c" 1>&6 1796 echo "configure:1 797: checking for main in -lgdbm" >&51804 echo "configure:1805: checking for main in -lgdbm" >&5 1797 1805 ac_lib_var=`echo gdbm'_'main | sed 'y%./+-%__p_%'` 1798 1806 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then … … 1802 1810 LIBS="-lgdbm $LIBS" 1803 1811 cat > conftest.$ac_ext <<EOF 1804 #line 18 05"configure"1812 #line 1813 "configure" 1805 1813 #include "confdefs.h" 1806 1814 … … 1809 1817 ; return 0; } 1810 1818 EOF 1811 if { (eval echo configure:18 12: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then1819 if { (eval echo configure:1820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 1812 1820 rm -rf conftest* 1813 1821 eval "ac_cv_lib_$ac_lib_var=yes" … … 1837 1845 1838 1846 echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 1839 echo "configure:184 0: checking for main in -lm" >&51847 echo "configure:1848: checking for main in -lm" >&5 1840 1848 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` 1841 1849 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then … … 1845 1853 LIBS="-lm $LIBS" 1846 1854 cat > conftest.$ac_ext <<EOF 1847 #line 18 48"configure"1855 #line 1856 "configure" 1848 1856 #include "confdefs.h" 1849 1857 … … 1852 1860 ; return 0; } 1853 1861 EOF 1854 if { (eval echo configure:18 55: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then1862 if { (eval echo configure:1863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 1855 1863 rm -rf conftest* 1856 1864 eval "ac_cv_lib_$ac_lib_var=yes" … … 1880 1888 1881 1889 echo $ac_n "checking for main in -lstdc++""... $ac_c" 1>&6 1882 echo "configure:18 83: checking for main in -lstdc++" >&51890 echo "configure:1891: checking for main in -lstdc++" >&5 1883 1891 ac_lib_var=`echo stdc++'_'main | sed 'y%./+-%__p_%'` 1884 1892 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then … … 1888 1896 LIBS="-lstdc++ $LIBS" 1889 1897 cat > conftest.$ac_ext <<EOF 1890 #line 189 1"configure"1898 #line 1899 "configure" 1891 1899 #include "confdefs.h" 1892 1900 … … 1895 1903 ; return 0; } 1896 1904 EOF 1897 if { (eval echo configure:1 898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then1905 if { (eval echo configure:1906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 1898 1906 rm -rf conftest* 1899 1907 eval "ac_cv_lib_$ac_lib_var=yes" … … 1923 1931 1924 1932 echo $ac_n "checking for main in -lcrypt""... $ac_c" 1>&6 1925 echo "configure:19 26: checking for main in -lcrypt" >&51933 echo "configure:1934: checking for main in -lcrypt" >&5 1926 1934 ac_lib_var=`echo crypt'_'main | sed 'y%./+-%__p_%'` 1927 1935 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then … … 1931 1939 LIBS="-lcrypt $LIBS" 1932 1940 cat > conftest.$ac_ext <<EOF 1933 #line 19 34"configure"1941 #line 1942 "configure" 1934 1942 #include "confdefs.h" 1935 1943 … … 1938 1946 ; return 0; } 1939 1947 EOF 1940 if { (eval echo configure:194 1: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then1948 if { (eval echo configure:1949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 1941 1949 rm -rf conftest* 1942 1950 eval "ac_cv_lib_$ac_lib_var=yes" … … 1972 1980 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 1973 1981 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 1974 echo "configure:19 75: checking for $ac_hdr that defines DIR" >&51982 echo "configure:1983: checking for $ac_hdr that defines DIR" >&5 1975 1983 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then 1976 1984 echo $ac_n "(cached) $ac_c" 1>&6 1977 1985 else 1978 1986 cat > conftest.$ac_ext <<EOF 1979 #line 198 0"configure"1987 #line 1988 "configure" 1980 1988 #include "confdefs.h" 1981 1989 #include <sys/types.h> … … 1985 1993 ; return 0; } 1986 1994 EOF 1987 if { (eval echo configure:19 88: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then1995 if { (eval echo configure:1996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 1988 1996 rm -rf conftest* 1989 1997 eval "ac_cv_header_dirent_$ac_safe=yes" … … 2010 2018 if test $ac_header_dirent = dirent.h; then 2011 2019 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 2012 echo "configure:20 13: checking for opendir in -ldir" >&52020 echo "configure:2021: checking for opendir in -ldir" >&5 2013 2021 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` 2014 2022 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then … … 2018 2026 LIBS="-ldir $LIBS" 2019 2027 cat > conftest.$ac_ext <<EOF 2020 #line 202 1"configure"2028 #line 2029 "configure" 2021 2029 #include "confdefs.h" 2022 2030 /* Override any gcc2 internal prototype to avoid an error. */ … … 2029 2037 ; return 0; } 2030 2038 EOF 2031 if { (eval echo configure:20 32: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then2039 if { (eval echo configure:2040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2032 2040 rm -rf conftest* 2033 2041 eval "ac_cv_lib_$ac_lib_var=yes" … … 2051 2059 else 2052 2060 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 2053 echo "configure:20 54: checking for opendir in -lx" >&52061 echo "configure:2062: checking for opendir in -lx" >&5 2054 2062 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` 2055 2063 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then … … 2059 2067 LIBS="-lx $LIBS" 2060 2068 cat > conftest.$ac_ext <<EOF 2061 #line 20 62"configure"2069 #line 2070 "configure" 2062 2070 #include "confdefs.h" 2063 2071 /* Override any gcc2 internal prototype to avoid an error. */ … … 2070 2078 ; return 0; } 2071 2079 EOF 2072 if { (eval echo configure:20 73: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then2080 if { (eval echo configure:2081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2073 2081 rm -rf conftest* 2074 2082 eval "ac_cv_lib_$ac_lib_var=yes" … … 2093 2101 2094 2102 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 2095 echo "configure:2 096: checking for ANSI C header files" >&52103 echo "configure:2104: checking for ANSI C header files" >&5 2096 2104 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then 2097 2105 echo $ac_n "(cached) $ac_c" 1>&6 2098 2106 else 2099 2107 cat > conftest.$ac_ext <<EOF 2100 #line 210 1"configure"2108 #line 2109 "configure" 2101 2109 #include "confdefs.h" 2102 2110 #include <stdlib.h> … … 2106 2114 EOF 2107 2115 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 2108 { (eval echo configure:21 09: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }2116 { (eval echo configure:2117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 2109 2117 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 2110 2118 if test -z "$ac_err"; then … … 2123 2131 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 2124 2132 cat > conftest.$ac_ext <<EOF 2125 #line 21 26"configure"2133 #line 2134 "configure" 2126 2134 #include "confdefs.h" 2127 2135 #include <string.h> … … 2141 2149 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 2142 2150 cat > conftest.$ac_ext <<EOF 2143 #line 21 44"configure"2151 #line 2152 "configure" 2144 2152 #include "confdefs.h" 2145 2153 #include <stdlib.h> … … 2162 2170 else 2163 2171 cat > conftest.$ac_ext <<EOF 2164 #line 21 65"configure"2172 #line 2173 "configure" 2165 2173 #include "confdefs.h" 2166 2174 #include <ctype.h> … … 2173 2181 2174 2182 EOF 2175 if { (eval echo configure:21 76: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null2183 if { (eval echo configure:2184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 2176 2184 then 2177 2185 : … … 2200 2208 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 2201 2209 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 2202 echo "configure:22 03: checking for $ac_hdr" >&52210 echo "configure:2211: checking for $ac_hdr" >&5 2203 2211 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 2204 2212 echo $ac_n "(cached) $ac_c" 1>&6 2205 2213 else 2206 2214 cat > conftest.$ac_ext <<EOF 2207 #line 22 08"configure"2215 #line 2216 "configure" 2208 2216 #include "confdefs.h" 2209 2217 #include <$ac_hdr> 2210 2218 EOF 2211 2219 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 2212 { (eval echo configure:22 13: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }2220 { (eval echo configure:2221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 2213 2221 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 2214 2222 if test -z "$ac_err"; then … … 2237 2245 2238 2246 cat > conftest.$ac_ext <<EOF 2239 #line 224 0"configure"2247 #line 2248 "configure" 2240 2248 #include "confdefs.h" 2241 2249 #include <stdio.h> … … 2252 2260 2253 2261 cat > conftest.$ac_ext <<EOF 2254 #line 22 55"configure"2262 #line 2263 "configure" 2255 2263 #include "confdefs.h" 2256 2264 #include <stdio.h> … … 2267 2275 2268 2276 cat > conftest.$ac_ext <<EOF 2269 #line 227 0"configure"2277 #line 2278 "configure" 2270 2278 #include "confdefs.h" 2271 2279 #include <sys/procfs.h> … … 2285 2293 # for constant arguments. Useless! 2286 2294 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 2287 echo "configure:22 88: checking for working alloca.h" >&52295 echo "configure:2296: checking for working alloca.h" >&5 2288 2296 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then 2289 2297 echo $ac_n "(cached) $ac_c" 1>&6 2290 2298 else 2291 2299 cat > conftest.$ac_ext <<EOF 2292 #line 2 293"configure"2300 #line 2301 "configure" 2293 2301 #include "confdefs.h" 2294 2302 #include <alloca.h> … … 2297 2305 ; return 0; } 2298 2306 EOF 2299 if { (eval echo configure:230 0: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then2307 if { (eval echo configure:2308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2300 2308 rm -rf conftest* 2301 2309 ac_cv_header_alloca_h=yes … … 2318 2326 2319 2327 echo $ac_n "checking for alloca""... $ac_c" 1>&6 2320 echo "configure:232 1: checking for alloca" >&52328 echo "configure:2329: checking for alloca" >&5 2321 2329 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then 2322 2330 echo $ac_n "(cached) $ac_c" 1>&6 2323 2331 else 2324 2332 cat > conftest.$ac_ext <<EOF 2325 #line 23 26"configure"2333 #line 2334 "configure" 2326 2334 #include "confdefs.h" 2327 2335 … … 2351 2359 ; return 0; } 2352 2360 EOF 2353 if { (eval echo configure:23 54: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then2361 if { (eval echo configure:2362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2354 2362 rm -rf conftest* 2355 2363 ac_cv_func_alloca_works=yes … … 2383 2391 2384 2392 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 2385 echo "configure:23 86: checking whether alloca needs Cray hooks" >&52393 echo "configure:2394: checking whether alloca needs Cray hooks" >&5 2386 2394 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then 2387 2395 echo $ac_n "(cached) $ac_c" 1>&6 2388 2396 else 2389 2397 cat > conftest.$ac_ext <<EOF 2390 #line 239 1"configure"2398 #line 2399 "configure" 2391 2399 #include "confdefs.h" 2392 2400 #if defined(CRAY) && ! defined(CRAY2) … … 2413 2421 for ac_func in _getb67 GETB67 getb67; do 2414 2422 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 2415 echo "configure:24 16: checking for $ac_func" >&52423 echo "configure:2424: checking for $ac_func" >&5 2416 2424 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 2417 2425 echo $ac_n "(cached) $ac_c" 1>&6 2418 2426 else 2419 2427 cat > conftest.$ac_ext <<EOF 2420 #line 242 1"configure"2428 #line 2429 "configure" 2421 2429 #include "confdefs.h" 2422 2430 /* System header to define __stub macros and hopefully few prototypes, … … 2441 2449 ; return 0; } 2442 2450 EOF 2443 if { (eval echo configure:24 44: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then2451 if { (eval echo configure:2452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2444 2452 rm -rf conftest* 2445 2453 eval "ac_cv_func_$ac_func=yes" … … 2468 2476 2469 2477 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 2470 echo "configure:247 1: checking stack direction for C alloca" >&52478 echo "configure:2479: checking stack direction for C alloca" >&5 2471 2479 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then 2472 2480 echo $ac_n "(cached) $ac_c" 1>&6 … … 2476 2484 else 2477 2485 cat > conftest.$ac_ext <<EOF 2478 #line 24 79"configure"2486 #line 2487 "configure" 2479 2487 #include "confdefs.h" 2480 2488 find_stack_direction () … … 2495 2503 } 2496 2504 EOF 2497 if { (eval echo configure:2 498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null2505 if { (eval echo configure:2506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 2498 2506 then 2499 2507 ac_cv_c_stack_direction=1 … … 2518 2526 if test $ac_cv_prog_gcc = yes; then 2519 2527 echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 2520 echo "configure:252 1: checking whether ${CC-cc} needs -traditional" >&52528 echo "configure:2529: checking whether ${CC-cc} needs -traditional" >&5 2521 2529 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then 2522 2530 echo $ac_n "(cached) $ac_c" 1>&6 … … 2524 2532 ac_pattern="Autoconf.*'x'" 2525 2533 cat > conftest.$ac_ext <<EOF 2526 #line 25 27"configure"2534 #line 2535 "configure" 2527 2535 #include "confdefs.h" 2528 2536 #include <sgtty.h> … … 2542 2550 if test $ac_cv_prog_gcc_traditional = no; then 2543 2551 cat > conftest.$ac_ext <<EOF 2544 #line 25 45"configure"2552 #line 2553 "configure" 2545 2553 #include "confdefs.h" 2546 2554 #include <termio.h> … … 2564 2572 2565 2573 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 2566 echo "configure:25 67: checking return type of signal handlers" >&52574 echo "configure:2575: checking return type of signal handlers" >&5 2567 2575 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then 2568 2576 echo $ac_n "(cached) $ac_c" 1>&6 2569 2577 else 2570 2578 cat > conftest.$ac_ext <<EOF 2571 #line 25 72"configure"2579 #line 2580 "configure" 2572 2580 #include "confdefs.h" 2573 2581 #include <sys/types.h> … … 2586 2594 ; return 0; } 2587 2595 EOF 2588 if { (eval echo configure:25 89: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then2596 if { (eval echo configure:2597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 2589 2597 rm -rf conftest* 2590 2598 ac_cv_type_signal=void … … 2605 2613 2606 2614 echo $ac_n "checking for vprintf""... $ac_c" 1>&6 2607 echo "configure:26 08: checking for vprintf" >&52615 echo "configure:2616: checking for vprintf" >&5 2608 2616 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then 2609 2617 echo $ac_n "(cached) $ac_c" 1>&6 2610 2618 else 2611 2619 cat > conftest.$ac_ext <<EOF 2612 #line 26 13"configure"2620 #line 2621 "configure" 2613 2621 #include "confdefs.h" 2614 2622 /* System header to define __stub macros and hopefully few prototypes, … … 2633 2641 ; return 0; } 2634 2642 EOF 2635 if { (eval echo configure:26 36: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then2643 if { (eval echo configure:2644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2636 2644 rm -rf conftest* 2637 2645 eval "ac_cv_func_vprintf=yes" … … 2657 2665 if test "$ac_cv_func_vprintf" != yes; then 2658 2666 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 2659 echo "configure:266 0: checking for _doprnt" >&52667 echo "configure:2668: checking for _doprnt" >&5 2660 2668 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then 2661 2669 echo $ac_n "(cached) $ac_c" 1>&6 2662 2670 else 2663 2671 cat > conftest.$ac_ext <<EOF 2664 #line 26 65"configure"2672 #line 2673 "configure" 2665 2673 #include "confdefs.h" 2666 2674 /* System header to define __stub macros and hopefully few prototypes, … … 2685 2693 ; return 0; } 2686 2694 EOF 2687 if { (eval echo configure:26 88: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then2695 if { (eval echo configure:2696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2688 2696 rm -rf conftest* 2689 2697 eval "ac_cv_func__doprnt=yes" … … 2712 2720 do 2713 2721 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 2714 echo "configure:27 15: checking for $ac_func" >&52722 echo "configure:2723: checking for $ac_func" >&5 2715 2723 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 2716 2724 echo $ac_n "(cached) $ac_c" 1>&6 2717 2725 else 2718 2726 cat > conftest.$ac_ext <<EOF 2719 #line 272 0"configure"2727 #line 2728 "configure" 2720 2728 #include "confdefs.h" 2721 2729 /* System header to define __stub macros and hopefully few prototypes, … … 2740 2748 ; return 0; } 2741 2749 EOF 2742 if { (eval echo configure:27 43: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then2750 if { (eval echo configure:2751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2743 2751 rm -rf conftest* 2744 2752 eval "ac_cv_func_$ac_func=yes" … … 2767 2775 do 2768 2776 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 2769 echo "configure:277 0: checking for $ac_func" >&52777 echo "configure:2778: checking for $ac_func" >&5 2770 2778 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 2771 2779 echo $ac_n "(cached) $ac_c" 1>&6 2772 2780 else 2773 2781 cat > conftest.$ac_ext <<EOF 2774 #line 27 75"configure"2782 #line 2783 "configure" 2775 2783 #include "confdefs.h" 2776 2784 /* System header to define __stub macros and hopefully few prototypes, … … 2795 2803 ; return 0; } 2796 2804 EOF 2797 if { (eval echo configure:2 798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then2805 if { (eval echo configure:2806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2798 2806 rm -rf conftest* 2799 2807 eval "ac_cv_func_$ac_func=yes" … … 2826 2834 # --------------------------------------------------------------------------- 2827 2835 echo $ac_n "checking for HP-UX needing gmalloc""... $ac_c" 1>&6 2828 echo "configure:28 29: checking for HP-UX needing gmalloc" >&52836 echo "configure:2837: checking for HP-UX needing gmalloc" >&5 2829 2837 if test "`(uname -s) 2> /dev/null`" = 'HP-UX'; then 2830 2838 echo "$ac_t""yes" 1>&6 … … 2839 2847 do 2840 2848 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 2841 echo "configure:28 42: checking for $ac_func" >&52849 echo "configure:2850: checking for $ac_func" >&5 2842 2850 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 2843 2851 echo $ac_n "(cached) $ac_c" 1>&6 2844 2852 else 2845 2853 cat > conftest.$ac_ext <<EOF 2846 #line 28 47"configure"2854 #line 2855 "configure" 2847 2855 #include "confdefs.h" 2848 2856 /* System header to define __stub macros and hopefully few prototypes, … … 2867 2875 ; return 0; } 2868 2876 EOF 2869 if { (eval echo configure:287 0: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then2877 if { (eval echo configure:2878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2870 2878 rm -rf conftest* 2871 2879 eval "ac_cv_func_$ac_func=yes" … … 2894 2902 2895 2903 echo $ac_n "checking if malloc debugging is wanted""... $ac_c" 1>&6 2896 echo "configure:2 897: checking if malloc debugging is wanted" >&52904 echo "configure:2905: checking if malloc debugging is wanted" >&5 2897 2905 # Check whether --with-dmalloc or --without-dmalloc was given. 2898 2906 if test "${with_dmalloc+set}" = set; then … … 2915 2923 2916 2924 echo $ac_n "checking which of rx or regex is wanted""... $ac_c" 1>&6 2917 echo "configure:29 18: checking which of rx or regex is wanted" >&52925 echo "configure:2926: checking which of rx or regex is wanted" >&5 2918 2926 # Check whether --with-regex or --without-regex was given. 2919 2927 if test "${with_regex+set}" = set; then … … 2933 2941 echo "$ac_t""rx" 1>&6 2934 2942 echo $ac_n "checking for re_rx_search""... $ac_c" 1>&6 2935 echo "configure:29 36: checking for re_rx_search" >&52943 echo "configure:2944: checking for re_rx_search" >&5 2936 2944 if eval "test \"`echo '$''{'ac_cv_func_re_rx_search'+set}'`\" = set"; then 2937 2945 echo $ac_n "(cached) $ac_c" 1>&6 2938 2946 else 2939 2947 cat > conftest.$ac_ext <<EOF 2940 #line 294 1"configure"2948 #line 2949 "configure" 2941 2949 #include "confdefs.h" 2942 2950 /* System header to define __stub macros and hopefully few prototypes, … … 2961 2969 ; return 0; } 2962 2970 EOF 2963 if { (eval echo configure:29 64: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then2971 if { (eval echo configure:2972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2964 2972 rm -rf conftest* 2965 2973 eval "ac_cv_func_re_rx_search=yes" … … 3001 3009 3002 3010 echo $ac_n "checking "that the GDBM library is available"""... $ac_c" 1>&6 3003 echo "configure:30 04: checking "that the GDBM library is available"" >&53011 echo "configure:3012: checking "that the GDBM library is available"" >&5 3004 3012 cat > conftest.$ac_ext <<EOF 3005 #line 30 06"configure"3013 #line 3014 "configure" 3006 3014 #include "confdefs.h" 3007 3015 #include <gdbm.h> … … 3011 3019 ; return 0; } 3012 3020 EOF 3013 if { (eval echo configure:30 14: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then3021 if { (eval echo configure:3022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 3014 3022 rm -rf conftest* 3015 3023 success=yes … … 3028 3036 3029 3037 echo $ac_n "checking "that Perl 5 is available"""... $ac_c" 1>&6 3030 echo "configure:303 1: checking "that Perl 5 is available"" >&53038 echo "configure:3039: checking "that Perl 5 is available"" >&5 3031 3039 success="no" 3032 3040 pl_path="$PATH" … … 3058 3066 success=no 3059 3067 echo $ac_n "checking "whether STL library has known faults"""... $ac_c" 1>&6 3060 echo "configure:306 1: checking "whether STL library has known faults"" >&53068 echo "configure:3069: checking "whether STL library has known faults"" >&5 3061 3069 3062 3070 cat > conftest.$ac_ext <<EOF 3063 #line 30 64"configure"3071 #line 3072 "configure" 3064 3072 #include "confdefs.h" 3065 3073 #include <vector> … … 3069 3077 ; return 0; } 3070 3078 EOF 3071 if { (eval echo configure:30 72: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then3079 if { (eval echo configure:3080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 3072 3080 rm -rf conftest* 3073 3081 success=yes … … 3080 3088 if test $success = "no"; then 3081 3089 cat > conftest.$ac_ext <<EOF 3082 #line 30 83"configure"3090 #line 3091 "configure" 3083 3091 #include "confdefs.h" 3084 3092 #include <vector.h> … … 3088 3096 ; return 0; } 3089 3097 EOF 3090 if { (eval echo configure:309 1: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then3098 if { (eval echo configure:3099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 3091 3099 rm -rf conftest* 3092 3100 success="yes" … … 3100 3108 if test $success = "no"; then 3101 3109 cat > conftest.$ac_ext <<EOF 3102 #line 31 03"configure"3110 #line 3111 "configure" 3103 3111 #include "confdefs.h" 3104 3112 #include <ospace\\std\\vector> … … 3108 3116 ; return 0; } 3109 3117 EOF 3110 if { (eval echo configure:311 1: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then3118 if { (eval echo configure:3119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 3111 3119 rm -rf conftest* 3112 3120 success="yes" … … 3129 3137 3130 3138 echo $ac_n "checking for HP-UX needing gmalloc""... $ac_c" 1>&6 3131 echo "configure:31 32: checking for HP-UX needing gmalloc" >&53139 echo "configure:3140: checking for HP-UX needing gmalloc" >&5 3132 3140 if test "`(uname -s) 2> /dev/null`" = 'HP-UX'; then 3133 3141 echo "$ac_t""yes" 1>&6 … … 3142 3150 do 3143 3151 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 3144 echo "configure:31 45: checking for $ac_func" >&53152 echo "configure:3153: checking for $ac_func" >&5 3145 3153 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 3146 3154 echo $ac_n "(cached) $ac_c" 1>&6 3147 3155 else 3148 3156 cat > conftest.$ac_ext <<EOF 3149 #line 315 0"configure"3157 #line 3158 "configure" 3150 3158 #include "confdefs.h" 3151 3159 /* System header to define __stub macros and hopefully few prototypes, … … 3173 3181 ; return 0; } 3174 3182 EOF 3175 if { (eval echo configure:31 76: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then3183 if { (eval echo configure:3184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 3176 3184 rm -rf conftest* 3177 3185 eval "ac_cv_func_$ac_func=yes" … … 3200 3208 3201 3209 echo $ac_n "checking if malloc debugging is wanted""... $ac_c" 1>&6 3202 echo "configure:32 03: checking if malloc debugging is wanted" >&53210 echo "configure:3211: checking if malloc debugging is wanted" >&5 3203 3211 # Check whether --with-dmalloc or --without-dmalloc was given. 3204 3212 if test "${with_dmalloc+set}" = set; then … … 3221 3229 3222 3230 echo $ac_n "checking which of rx or regex is wanted""... $ac_c" 1>&6 3223 echo "configure:32 24: checking which of rx or regex is wanted" >&53231 echo "configure:3232: checking which of rx or regex is wanted" >&5 3224 3232 # Check whether --with-regex or --without-regex was given. 3225 3233 if test "${with_regex+set}" = set; then … … 3239 3247 echo "$ac_t""rx" 1>&6 3240 3248 echo $ac_n "checking for re_rx_search""... $ac_c" 1>&6 3241 echo "configure:32 42: checking for re_rx_search" >&53249 echo "configure:3250: checking for re_rx_search" >&5 3242 3250 if eval "test \"`echo '$''{'ac_cv_func_re_rx_search'+set}'`\" = set"; then 3243 3251 echo $ac_n "(cached) $ac_c" 1>&6 3244 3252 else 3245 3253 cat > conftest.$ac_ext <<EOF 3246 #line 32 47"configure"3254 #line 3255 "configure" 3247 3255 #include "confdefs.h" 3248 3256 /* System header to define __stub macros and hopefully few prototypes, … … 3270 3278 ; return 0; } 3271 3279 EOF 3272 if { (eval echo configure:32 73: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then3280 if { (eval echo configure:3281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 3273 3281 rm -rf conftest* 3274 3282 eval "ac_cv_func_re_rx_search=yes" … … 3440 3448 s%@VERSION@%$VERSION%g 3441 3449 s%@USE_FASTCGI@%$USE_FASTCGI%g 3450 s%@USE_CORBA@%$USE_CORBA%g 3442 3451 s%@CC@%$CC%g 3443 3452 s%@CXX@%$CXX%g -
branches/corba/gsdl/configure.in
r998 r1067 11 11 AC_SUBST(VERSION) 12 12 13 dnl 14 dnl Set use of fast cgi 15 dnl 13 16 USE_FASTCGI=0 14 17 if test USE_FASTCGI = 1; then … … 16 19 AC_SUBST(USE_FASTCGI) 17 20 fi 21 22 23 dnl 24 dnl Set use of corba 25 dnl 26 USE_CORBA=1 27 AC_DEFINE(USE_CORBA) 28 AC_SUBST(USE_CORBA, $(USE_CORBA)) 18 29 19 30 dnl Checks for programs. -
branches/corba/gsdl/lib/Makefile.in
r992 r1067 28 28 AR = ar 29 29 CC = @CC@ 30 CPP = @CXX@ 30 31 CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual 32 MCFLAGS = @CFLAGS@ -Wall -Wunused 31 33 DEFS = @DEFS@ 32 INCLUDES = -I../packages/mg/lib 34 INCLUDES = -I../packages/mg/lib -I.. 35 MINCLUDES = -I. -I../packages/mg/lib -I.. 33 36 RANLIB = @RANLIB@ 37 USE_CORBA = @USE_CORBA@ 34 38 35 39 COMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES) 40 CPPCOMPILE = $(CPP) -c $(CCFLAGS) $(DEFS) $(INCLUDES) 41 42 ifneq ($(USE_CORBA), 0) 43 MCOMPILE = mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c 44 else 45 MCOMPILE = $(COMPILE) 46 endif 36 47 37 48 .SUFFIXES: … … 42 53 .SUFFIXES: .cpp .o 43 54 .cpp.o: 44 $(COMPILE) $< 55 $(CPPCOMPILE) $< 56 57 .SUFFIXES: .mpp .o 58 .mpp.o: 59 $(MCOMPILE) $< 45 60 46 61 62 ifneq ($(USE_CORBA), 0) 63 CORBAHEADERS = \ 64 corbaconv_text_t.h corbatext_t.h 65 CORBASOURCES = \ 66 corbaiface.mpp corbatext_t.mpp corbaconv_text_t.mpp 67 CORBAOBJECTS = \ 68 corbaiface.o corbatext_t.o corbaconv_text_t.o 69 else 70 CORBAHEADERS = 71 CORBASOURCE = 72 CORBAOBJECTS = 73 endif 74 47 75 HEADERS = \ 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 50 80 51 81 SOURCES = \ 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) 54 85 55 86 OBJECTS = \ 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) 58 90 59 91 60 92 all: gsdllib.a 61 93 94 corbaiface.mpp: corbaiface.idl 95 idl --c++-suffix=mpp $? 62 96 63 97 GSDLLIBOBJECTS = $(OBJECTS) … … 68 102 $(RANLIB) gsdllib.a 69 103 70 distclean:71 rm -f $(OBJECTS) gsdllib.a Makefile72 73 104 clean: 74 105 rm -f $(OBJECTS) gsdllib.a … … 78 109 depend: 79 110 makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES) 111 112 113 114 -
branches/corba/gsdl/lib/display.cpp
r995 r1067 28 28 /* 29 29 $Log$ 30 Revision 1.17.2.1 2000/04/04 15:02:28 cs025 31 Corba first commit 32 30 33 Revision 1.17 2000/02/29 21:00:38 sjboddie 31 34 fixed some compiler warnings … … 1625 1628 } 1626 1629 1630 // GRB: deal with remaining code properly as it faults 1631 return false; 1632 1627 1633 if (logout != NULL) { 1628 1634 (*logout) << text_t2ascii << "Warning: _" << -
branches/corba/gsdl/lib/text_t.cpp
r665 r1067 28 28 /* 29 29 $Log$ 30 Revision 1.15.2.1 2000/04/04 15:02:29 cs025 31 Corba first commit 32 30 33 Revision 1.15 1999/10/14 22:52:39 sjboddie 31 34 joinchar can join using text_t string now too … … 75 78 76 79 */ 77 78 80 79 81 #include "text_t.h" … … 91 93 #endif 92 94 95 #ifdef HAVE_CONFIG_H 96 # ifdef __WIN32__ 97 # include "WIN32cfg.h" 98 # else 99 # include "config.h" 100 # endif 101 #endif 102 93 103 94 104 #include "unitool.h" … … 117 127 appendcstr (s); 118 128 } 129 119 130 120 131 void text_t::append (const text_t &t) -
branches/corba/gsdl/lib/text_t.h
r665 r1067 99 99 unsigned short getencoding () {return encoding;}; 100 100 101 usvector& text_as_usvector() { return text ; }; 102 const usvector& text_as_usvector() const { return text ; }; 103 101 104 // basic container support 102 105 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 YY MINOR 97 #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 12 12 13 13 #include "sysfuncs.h" … … 48 48 static u_long invf_ptr; 49 49 static u_long invf_len; 50 #line 65 "bool_parser.y" 50 51 #line 66 "bool_parser.y" 51 52 typedef union { 52 53 char *text; 53 54 bool_tree_node *node; 54 55 } 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 72 static 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 102 static const short yyprhs[] = { 0, 103 0, 2, 4, 8, 10, 12, 14, 17, 21, 24, 104 26, 30 105 }; 106 107 static 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 117 static 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 126 static const char * const yytname[] = { "$","error","$undefined.","TERM","'('", 127 "')'","'*'","'_'","'!'","'&'","'|'","query","term","not","and","or", NULL 128 }; 129 #endif 130 131 static const short yyr1[] = { 0, 132 11, 12, 12, 12, 12, 13, 13, 14, 14, 14, 133 15, 15 134 }; 135 136 static const short yyr2[] = { 0, 137 1, 1, 3, 1, 1, 1, 2, 3, 2, 1, 138 3, 1 139 }; 140 141 static 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 146 static const short yydefgoto[] = { 18, 147 6, 7, 8, 9 148 }; 149 150 static 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 155 static const short yypgoto[] = {-32768, 156 -32768, -5, -12, 18 157 }; 158 159 160 #define YYLAST 24 161 162 163 static 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 169 static 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) \ 272 do \ 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; } \ 281 while (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 310 int yychar; /* the lookahead symbol */ 311 YYSTYPE yylval; /* the semantic value of the */ 312 /* lookahead symbol */ 313 314 #ifdef YYLSP_NEEDED 315 YYLTYPE yylloc; /* location data for the lookahead */ 316 /* symbol */ 317 #endif 318 319 int yynerrs; /* number of parse errors so far */ 320 #endif /* not YYPURE */ 321 322 #if YYDEBUG != 0 323 int 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 168 338 #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. */ 358 static 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. */ 376 static 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 415 int yyparse (void *); 170 416 #else 171 #ifdef YYMAXDEPTH 172 #define YYSTACKSIZE YYMAXDEPTH 417 int yyparse (void); 418 #endif 419 #endif 420 421 int 422 yyparse(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--) 173 444 #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. */ 490 yynewstate: 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. */ 689 yydefault: 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. */ 696 yyreduce: 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 719 case 1: 720 #line 76 "bool_parser.y" 721 { tree_base = yyvsp[0].node;; 722 break;} 723 case 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;} 727 case 3: 728 #line 81 "bool_parser.y" 729 { yyval.node = yyvsp[-1].node; ; 730 break;} 731 case 4: 732 #line 82 "bool_parser.y" 733 { yyval.node = CreateBoolTreeNode(N_all, NULL, NULL); ; 734 break;} 735 case 5: 736 #line 83 "bool_parser.y" 737 { yyval.node = CreateBoolTreeNode(N_none, NULL, NULL); ; 738 break;} 739 case 7: 740 #line 87 "bool_parser.y" 741 { yyval.node = CreateBoolTreeNode(N_not, yyvsp[0].node, NULL); ; 742 break;} 743 case 8: 744 #line 90 "bool_parser.y" 745 { yyval.node = CreateBoolTreeNode(N_and, yyvsp[-2].node, yyvsp[0].node); ; 746 break;} 747 case 9: 748 #line 91 "bool_parser.y" 749 { yyval.node = CreateBoolTreeNode(N_and, yyvsp[-1].node, yyvsp[0].node); ; 750 break;} 751 case 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 811 yyerrlab: /* 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; 863 yyerrlab1: /* 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 888 yyerrdefault: /* 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 897 yyerrpop: /* 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 917 yyerrhandle: 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 } 189 978 #line 99 "bool_parser.y" 979 190 980 191 981 /* Bison on one mips machine defined "const" to be nothing but … … 381 1171 bool_tree_node * 382 1172 ParseBool(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, 385 1174 stemmed_dict * the_sd, int is_indexed, /* [RPAP - Jan 97: Stem Index Change] */ 386 1175 QueryTermList **the_query_term_list) /* [RPAP - Feb 97: Term Frequency] */ … … 407 1196 408 1197 409 #line 407 "y.tab.c"410 #define YYABORT goto yyabort411 #define YYREJECT goto yyabort412 #define YYACCEPT goto yyaccept413 #define YYERROR goto yyerrlab414 int415 yyparse()416 {417 register int yym, yyn, yystate;418 #if YYDEBUG419 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 #endif429 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 YYDEBUG444 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 #endif453 }454 if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&455 yyn <= YYTABLESIZE && yycheck[yyn] == yychar)456 {457 #if YYDEBUG458 if (yydebug)459 printf("%sdebug: state %d, shifting to state %d\n",460 YYPREFIX, yystate, yytable[yyn]);461 #endif462 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 lint480 goto yynewerror;481 #endif482 yynewerror:483 yyerror("syntax error");484 #ifdef lint485 goto yyerrlab;486 #endif487 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 YYDEBUG499 if (yydebug)500 printf("%sdebug: state %d, error recovery shifting\501 to state %d\n", YYPREFIX, *yyssp, yytable[yyn]);502 #endif503 if (yyssp >= yyss + yystacksize - 1)504 {505 goto yyoverflow;506 }507 *++yyssp = yystate = yytable[yyn];508 *++yyvsp = yylval;509 goto yyloop;510 }511 else512 {513 #if YYDEBUG514 if (yydebug)515 printf("%sdebug: error recovery discarding state %d\n",516 YYPREFIX, *yyssp);517 #endif518 if (yyssp <= yyss) goto yyabort;519 --yyssp;520 --yyvsp;521 }522 }523 }524 else525 {526 if (yychar == 0) goto yyabort;527 #if YYDEBUG528 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 #endif537 yychar = (-1);538 goto yyloop;539 }540 yyreduce:541 #if YYDEBUG542 if (yydebug)543 printf("%sdebug: state %d, reducing by rule %d (%s)\n",544 YYPREFIX, yystate, yyn, yyrule[yyn]);545 #endif546 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 YYDEBUG595 if (yydebug)596 printf("%sdebug: after reduction, shifting from state 0 to\597 state %d\n", YYPREFIX, YYFINAL);598 #endif599 yystate = YYFINAL;600 *++yyssp = YYFINAL;601 *++yyvsp = yyval;602 if (yychar < 0)603 {604 if ((yychar = yylex()) < 0) yychar = 0;605 #if YYDEBUG606 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 #endif615 }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 else623 yystate = yydgoto[yym];624 #if YYDEBUG625 if (yydebug)626 printf("%sdebug: after reduction, shifting from state %d \627 to state %d\n", YYPREFIX, *yyssp, yystate);628 #endif629 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 28 28 AR = ar 29 29 CC = @CC@ 30 CPP = @CXX@ 30 31 CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual 32 MCFLAGS = @CFLAGS@ -Wall -Wunused 33 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER @DEFS@ 31 34 32 35 USE_FASTCGI = @USE_FASTCGI@ 33 36 ifneq ($(USE_FASTCGI), 1) 34 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER @DEFS@ 35 36 INCLUDES = -I../.. -I../../lib -I../recpt -I../../packages/mg \ 37 INCLUDES = -I. -I../.. -I../../lib -I../recpt -I../../packages/mg \ 37 38 -I../../packages/mg/lib -I../../packages/mg/src/text 38 39 else 39 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER -DUSE_FASTCGI @DEFS@ 40 41 INCLUDES = -I../.. -I../../lib -I../recpt -I../../packages/mg \ 40 INCLUDES = -I. -I../../lib -I../recpt -I../../packages/mg \ 42 41 -I../../packages/mg/lib -I../../packages/mg/src/text \ 43 42 -I../../packages/fcgi/include 44 43 endif 45 44 45 USE_CORBA = @USE_CORBA@ 46 46 47 RANLIB = @RANLIB@ 47 48 LDFLAGS = @LDFLAGS@ 48 #LIBS = -lgdbm -lstdc++ -lm 49 LIBS = @LIBS@ 49 LIBS = -lgdbm -lstdc++ -lm 50 50 51 51 GSDLOS = @gsdlos@ … … 53 53 54 54 COMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES) 55 LINK = $(CC) $(LDFLAGS) -o $@ 55 LINK = $(CPP) $(LDFLAGS) -o $@ 56 57 CPPCOMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES) 58 CPPLINK = $(CPP) $(LDFLAGS) -o $@ 59 60 MCOMPILE = mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(INCLUDES) -c 61 MLINK = mico-ld $(LDFLAGS) -lmico2.2.7 -o $@ 56 62 57 63 .SUFFIXES: … … 62 68 .SUFFIXES: .cpp .o 63 69 .cpp.o: 64 $(COMPILE) $< 70 $(CPPCOMPILE) $< 71 72 .SUFFIXES: .mpp .o 73 .mpp.o: 74 $(MCOMPILE) $< 75 76 ifneq ($(USE_CORBA), 0) 77 CORBAHEADERS = \ 78 corbaServer.h 79 CORBASOURCES = \ 80 corbaServer.mpp 81 CORBAOBJECTS = \ 82 corbaServer.o 83 else 84 CORBAHEADERS = 85 CORBASOURCES = 86 CORBAOBJECTS = 87 endif 65 88 66 89 HEADERS = mgq.h mgsearch.h querycache.h queryinfo.h collectserver.h \ 67 90 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) 69 93 70 94 SOURCES = mgq.c mgsearch.cpp querycache.cpp queryinfo.cpp collectserver.cpp \ 71 95 colservrconfig.cpp maptools.cpp filter.cpp source.cpp \ 72 96 browsefilter.cpp queryfilter.cpp mggdbmsource.cpp phrasesearch.cpp \ 73 phrasequeryfilter.cpp 97 phrasequeryfilter.cpp collectset.cpp $(CORBASOURCES) 74 98 75 99 OBJECTS = mgq.o mgsearch.o querycache.o queryinfo.o collectserver.o \ 76 100 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) 78 103 79 104 all : $(OBJECTS) 80 81 distclean:82 rm -f $(OBJECTS) Makefile83 105 84 106 clean: … … 89 111 depend: 90 112 makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES) 113 114 -
branches/corba/gsdl/src/colservr/collectserver.h
r804 r1067 30 30 #define COLLECTSERVER_H 31 31 32 // Library header files 32 33 #include "gsdlconf.h" 33 34 #include "text_t.h" … … 36 37 #include "source.h" 37 38 #include "cfgread.h" 39 #include "cnfgable.h" 38 40 39 41 #if defined(GSDL_USE_OBJECTSPACE) … … 62 64 63 65 64 class collectserver {66 class collectserver : public configurable { 65 67 protected: 66 68 colservrconf configinfo; -
branches/corba/gsdl/src/colservr/colservrconfig.cpp
r534 r1067 28 28 /* 29 29 $Log$ 30 Revision 1.2.2.1 2000/04/04 15:02:31 cs025 31 Corba first commit 32 30 33 Revision 1.2 1999/09/07 04:57:20 sjboddie 31 34 added gpl notice … … 67 70 } 68 71 72 return cserver.read_configfile(filename); 73 /* 69 74 // read in the collection configuration file 70 75 text_t key; … … 88 93 } 89 94 return false; 95 */ 90 96 } 91 97 … … 105 111 } 106 112 113 return cserver.read_configfile(filename); 114 115 /* 107 116 // read in the build configuration file 108 117 text_t key; … … 126 135 } 127 136 return false; 137 */ 128 138 } 129 139 -
branches/corba/gsdl/src/colservr/mgsearch.cpp
r633 r1067 28 28 /* 29 29 $Log$ 30 Revision 1.22.2.1 2000/04/04 15:02:32 cs025 31 Corba first commit 32 30 33 Revision 1.22 1999/09/24 02:41:21 rjmcnab 31 34 change to use has_unicode_letdig in text_t … … 391 394 } 392 395 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 */ 394 401 bool mgsearchclass::search(const queryparamclass &queryparams, 395 402 queryresultsclass &queryresults) { 396 403 assert (cache != NULL); 397 404 405 // clear any previous results 398 406 queryresults.clear(); 399 407 … … 406 414 if (makeindexcurrent (queryparams.index, queryparams.subcollection, 407 415 queryparams.language, queryparams.collection)) { 416 // initialise the form of results 408 417 setsearchmode (queryparams); 418 419 // execute the query 409 420 submitquery (queryparams); 421 422 // retrieve the results 410 423 getresults (queryparams, queryresults); 424 411 425 return true; 412 426 } … … 453 467 } 454 468 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 */ 456 474 void mgsearchclass::submitquery (const queryparamclass &queryparams) 457 475 { 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 459 478 text_t ttquerystring = queryparams.querystring; 460 479 filterquery (ttquerystring); … … 464 483 mgq_ask(querystring); 465 484 485 // destroy the temporary character array 466 486 delete querystring; 467 487 } 468 488 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 */ 470 498 void mgsearchclass::getresults (const queryparamclass &queryparams, 471 499 queryresultsclass &queryresults) { 472 500 // get the configuration for the maximum number of documents to 501 // retrieve 473 502 int howmany = queryparams.maxdocs; 474 503 if (howmany == -1) howmany = MAXNUMDOCS; … … 504 533 } 505 534 535 /** 536 * Tidies the given querystring, removing special characters 537 */ 506 538 void mgsearchclass::filterquery (text_t &ttquerystring) { 507 539 text_t::iterator ithere = ttquerystring.begin (); -
branches/corba/gsdl/src/db2txt/Makefile.in
r1004 r1067 30 30 AR = ar 31 31 CC = @CC@ 32 CPP = @CXX@ 32 33 CCFLAGS = -Wall @CFLAGS@ 33 34 DEFS = @DEFS@ … … 42 43 43 44 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CCFLAGS) 45 CPPCOMPILE = $(CPP) -c $(DEFS) $(INCLUDES) $(CCFLAGS) 44 46 LINK = $(CC) $(LDFLAGS) -o $@ 47 CPPLINK = $(CPP) $(LDFLAGS) -o $@ 45 48 46 49 .SUFFIXES: … … 51 54 .SUFFIXES: .cpp .o 52 55 .cpp.o: 53 $(C OMPILE) $<56 $(CPPCOMPILE) $< 54 57 55 58 -
branches/corba/gsdl/src/recpt/Makefile.in
r1004 r1067 27 27 AR = ar 28 28 CC = @CC@ 29 CPP = @CXX@ 29 30 CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual 30 31 USE_FASTCGI = @USE_FASTCGI@32 ifneq ($(USE_FASTCGI), 1)33 31 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER \ 34 32 -DGSDLUSAGELOG @DEFS@ 35 33 34 USE_FASTCGI = @USE_FASTCGI@ 35 ifneq ($(USE_FASTCGI), 1) 36 36 INCLUDES = -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 38 38 else 39 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER \40 -DGSDLUSAGELOG -DUSE_FASTCGI @DEFS@41 42 39 INCLUDES = -I../../lib -I. -I../colservr -I../../packages/mg \ 43 40 -I../../packages/mg/lib -I../../packages/mg/src/text \ 44 41 -I../../packages/fcgi/include 45 42 endif 43 MINCLUDES = -I. -I../../lib -I../colservr 44 45 USE_CORBA = @USE_CORBA@ 46 46 47 47 RANLIB = @RANLIB@ 48 48 LDFLAGS = @LDFLAGS@ 49 #LIBS = -lgdbm -lstdc++ -lm #-lcrypt 50 LIBS = @LIBS@ 49 LIBS = -lgdbm -lstdc++ -lm -lcrypt 51 50 52 51 GSDLOS = @gsdlos@ … … 55 54 COMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES) 56 55 LINK = $(CC) $(LDFLAGS) -o $@ 56 57 CPPCOMPILE = $(CPP) -c $(CCFLAGS) $(DEFS) $(INCLUDES) 58 CPPLINK = $(CPP) $(LDFLAGS) -o $@ 59 60 MCOMPILE = mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c 61 MLINK = mico-ld -static $(LDFLAGS) -o $@ 62 MLIBS = $(LIBS) -lmico2.2.7 57 63 58 64 .SUFFIXES: … … 63 69 .SUFFIXES: .cpp .o 64 70 .cpp.o: 65 $(COMPILE) $< 71 $(CPPCOMPILE) $< 72 73 .SUFFIXES: .mpp .o 74 .mpp.o: 75 $(MCOMPILE) $< 66 76 67 77 COMMONHEADERS = receptionist.h cgiwrapper.h cgiargs.h action.h browserclass.h \ … … 77 87 RECEPTHEADERS = 78 88 89 ifeq ($(USE_CORBA), 1) 90 LIBRARYHEADERS = nullproto.h corbaproto.h 91 else 79 92 LIBRARYHEADERS = nullproto.h 93 endif 80 94 81 95 HEADERS = $(COMMONHEADERS) $(RECPTHEADERS) $(LIBRARYHEADERS) … … 95 109 RECPTSOURCES = recptmain.cpp 96 110 111 ####LIBRARYSOURCES = nullproto.cpp corbaproto.mpp librarymain.cpp 97 112 LIBRARYSOURCES = nullproto.cpp librarymain.cpp 98 113 … … 113 128 RECPTOBJECTS = recptmain.o 114 129 130 ####LIBRARYOBJECTS = nullproto.o corbaproto.o librarymain.o 115 131 LIBRARYOBJECTS = nullproto.o librarymain.o 116 132 … … 131 147 ../colservr/mggdbmsource.o \ 132 148 ../colservr/phrasesearch.o \ 133 ../colservr/phrasequeryfilter.o 134 135 149 ../colservr/phrasequeryfilter.o \ 150 ../colservr/collectset.o 151 152 ifeq ($(USE_CORBA), 1) 153 EXEC = recpt library corbaserver corbarecptldd 154 else 136 155 EXEC = recpt library 156 endif 137 157 138 158 all: $(EXEC) 139 140 distclean:141 rm -f $(OBJECTS) $(EXEC) Makefile142 159 143 160 clean: … … 145 162 146 163 install: 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 148 167 149 168 depend: … … 166 185 167 186 recpt: $(RECPT_OBJS) 168 $( LINK) $(RECPT_OBJS) $(LIBS)187 $(CPPLINK) $(RECPT_OBJS) $(LIBS) 169 188 170 189 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # … … 184 203 185 204 library: $(LIBRARY_OBJS) 186 $(LINK) $(LIBRARY_OBJS) $(LIBS) 205 $(CPPLINK) $(LIBRARY_OBJS) $(LIBS) 206 207 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 208 209 RECPTLIB_OBJECTS = nullproto.o corbaproto.o \ 210 ../../lib/corbatext_t.o ../../lib/corbaconv_text_t.o 211 ifneq ($(USE_FASTCGI), 1) 212 RLIBRARY_OBJS = $(COMMONOBJECTS) $(RECPTLIB_OBJECTS) $(COLSERVROBJECTS) \ 213 ../../lib/gsdllib.a \ 214 ../../packages/mg/src/text/libtextin.a \ 215 ../../packages/mg/lib/libmg.a 216 else 217 RLIBRARY_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 222 endif 223 RECPTLIB_OBJS = $(RLIBRARY_OBJS) ../colservr/corbaServer.o 224 225 corbaserver: $(RECPTLIB_OBJS) 226 $(MLINK) $(RECPTLIB_OBJS) $(MLIBS) 227 228 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 229 230 CORBARECPT_OBJECTS = nullproto.o corbaproto.o corbaclient.o 231 ifneq ($(USE_FASTCGI), 1) 232 CORBARECPT_OBJS = $(COMMONOBJECTS) $(CORBARECPT_OBJECTS) $(COLSERVROBJECTS) \ 233 ../../lib/gsdllib.a \ 234 ../../packages/mg/src/text/libtextin.a \ 235 ../../packages/mg/lib/libmg.a 236 else 237 CORBARECPT_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 242 endif 243 244 corbarecptldd: $(CORBARECPT_OBJS) 245 $(MLINK) $(CORBARECPT_OBJS) $(MLIBS) 246 247 test: -
branches/corba/gsdl/src/recpt/browserclass.h
r765 r1067 76 76 void set_filter_options (FilterRequest_t &request, cgiargsclass &args); 77 77 78 // returns the number of tabs to add before displaying the78 // output_section_group returns the number of tabs to add before displaying the 79 79 // 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 80 85 virtual int output_section_group (ResultDocInfo_t §ion, cgiargsclass &args, 81 86 const text_t &collection, int colnumber, -
branches/corba/gsdl/src/recpt/browsetools.cpp
r1059 r1067 29 29 /* 30 30 $Log$ 31 Revision 1.41.2.1 2000/04/04 15:02:34 cs025 32 Corba first commit 33 31 34 Revision 1.41 2000/04/03 07:25:02 sjboddie 32 35 replaced old DocumentIcon and DocumentContents format options … … 472 475 text_t OID = args["d"]; 473 476 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 474 480 if (OID.empty()) { 475 481 OID = args["cl"]; 476 482 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) 478 487 get_top (args["cl"], classification); 479 488 … … 559 568 } 560 569 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 */ 561 574 void output_toc (cgiargsclass &args, browsermapclass *browsermap, 562 575 text_tmap &formatstrings, recptproto *collectproto, -
branches/corba/gsdl/src/recpt/cgiwrapper.cpp
r963 r1067 28 28 /* 29 29 $Log$ 30 Revision 1.22.2.1 2000/04/04 15:02:34 cs025 31 Corba first commit 32 30 33 Revision 1.22 2000/02/21 21:56:46 sjboddie 31 34 gsdlhome now comes from gsdlsite.cfg … … 126 129 #include <stdlib.h> 127 130 #include <assert.h> 131 #include <iostream.h> 128 132 129 133 #if defined(GSDL_USE_OBJECTSPACE) … … 386 390 recpt.configure ("httpimg", "/gsdl/images"); 387 391 char *script_name = getenv("SCRIPT_NAME"); 392 393 // configure receptionist 388 394 if (script_name != NULL) recpt.configure("gwcgi", script_name); 389 395 else recpt.configure("gwcgi", "/cgi-bin/gw"); 390 396 391 // read in the configuration files. 397 // read in the configuration files; check for empty collection sets 398 // enroute 392 399 text_t gsdlhome; 393 400 if (!site_cfg_read (recpt, gsdlhome, maxrequests)) { … … 525 532 526 533 534 // if there has been no error so far, perform the production of the 535 // output page 527 536 if (errorpage.empty()) { 528 537 text_t error_file = filename_cat (gsdlhome, "etc", "errout.txt"); … … 537 546 errout.close (); 538 547 page_errorparseargs(gsdlhome, errorpage); 539 } else { 548 } 549 else { 550 // produce the output page 540 551 if (!recpt.produce_cgi_page (args, pageout, errout, fastcgienv)) { 541 552 errout.close (); 542 553 page_errorcgipage(gsdlhome, errorpage); 543 } else { 554 } 555 else { 544 556 errout.close (); 545 557 } -
branches/corba/gsdl/src/recpt/cgiwrapper.h
r533 r1067 32 32 33 33 #include "receptionist.h" 34 #include "collectset.h" 34 35 35 36 // cgiwrapper does everything necessary to output a page … … 37 38 // collection then "collection" should be set, otherwise it 38 39 // 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! 39 44 void cgiwrapper (receptionist &recpt, text_t collection); 40 45 -
branches/corba/gsdl/src/recpt/documentaction.cpp
r1059 r1067 28 28 /* 29 29 $Log$ 30 Revision 1.36.2.1 2000/04/04 15:02:35 cs025 31 Corba first commit 32 30 33 Revision 1.36 2000/04/03 07:26:28 sjboddie 31 34 replaced old DocumentIcon and DocumentContents format options … … 1131 1134 ResultDocInfo_tarray::iterator sechere = inforesponse.docInfo.begin(); 1132 1135 ResultDocInfo_tarray::iterator secend = inforesponse.docInfo.end(); 1133 1136 1134 1137 if (arg_gt == 1) { 1135 1138 // check if there are more than 10 sections containing text to be expanded - -
branches/corba/gsdl/src/recpt/librarymain.cpp
r994 r1067 28 28 /* 29 29 $Log$ 30 Revision 1.24.2.1 2000/04/04 15:02:36 cs025 31 Corba first commit 32 30 33 Revision 1.24 2000/02/29 20:59:02 sjboddie 31 34 added error message when unable to read from collect directory - should … … 122 125 #include "mggdbmsource.h" 123 126 #include "fileutil.h" 127 // #include "collectset.h" 124 128 #include <assert.h> 125 129 … … 149 153 int main () { 150 154 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 /* 152 164 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); 164 166 165 167 text_tarray::const_iterator thiscol = collections.begin(); 166 168 text_tarray::const_iterator endcol = collections.end(); 167 169 168 170 while (thiscol != endcol) { 169 171 170 172 // ignore the modelcol 171 if (*thiscol == "modelcol") {thiscol ++; continue;} 172 173 if (*thiscol == "modelcol") { 174 thiscol ++; 175 continue; 176 } 177 173 178 // this memory is created but never destroyed 174 179 // we're also not doing any error checking to make sure we didn't … … 181 186 filterclass *filter = new filterclass (); 182 187 cserver->add_filter (filter); 183 188 184 189 // add a browse filter 185 190 browsefilterclass *browsefilter = new browsefilterclass(); … … 192 197 queryfilter->set_mgsearchptr (mgsearch); 193 198 cserver->add_filter (queryfilter); 194 199 195 200 // add a mg and gdbm source 196 201 mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass (); … … 206 211 thiscol ++; 207 212 } 213 */ 208 214 209 215 // add the protocol to the receptionist 210 216 recpt.add_protocol (&nproto); 211 217 212 218 // add other converters 213 219 utf8inconvertclass utf8inconvert; … … 282 288 } 283 289 284 285 286 287 -
branches/corba/gsdl/src/recpt/nullproto.cpp
r801 r1067 28 28 /* 29 29 $Log$ 30 Revision 1.12.2.1 2000/04/04 15:02:36 cs025 31 Corba first commit 32 30 33 Revision 1.12 1999/12/05 21:23:39 sjboddie 31 34 support for multiple gsdlhomes and gdbmhomes … … 77 80 78 81 #include "nullproto.h" 79 #include "colservrconfig.h"80 82 #include <assert.h> 81 83 … … 86 88 // it should be done just after the collection server has been 87 89 // created 88 if (key == "collection" || key == "collectdir") return;89 90 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); 107 95 } 108 96 } … … 110 98 // this init will configure and init each of the collection servers 111 99 bool 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); 155 101 } 156 102 … … 162 108 void nullproto::get_collection_list (text_tarray &collist, comerror_t &err, 163 109 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 176 113 } 177 114 178 115 void nullproto::has_collection (const text_t &collection, bool &hascollection, 179 116 comerror_t &err, ostream &/*logout*/) { 180 hascollection = (cse rvers.getcollectserver(collection) != NULL);117 hascollection = (cset->getCollectServer(collection) != NULL); 181 118 err = noError; 182 119 } … … 184 121 void nullproto::ping (const text_t &collection, bool &wassuccess, 185 122 comerror_t &err, ostream &/*logout*/) { 186 wassuccess = (cse rvers.getcollectserver(collection) != NULL);123 wassuccess = (cset->getCollectServer(collection) != NULL); 187 124 err = noError; 188 125 } … … 191 128 ColInfoResponse_t &collectinfo, 192 129 comerror_t &err, ostream &logout) { 193 collectserver *cserver = cse rvers.getcollectserver (collection);130 collectserver *cserver = cset->getCollectServer (collection); 194 131 if (cserver != NULL) cserver->get_collectinfo (collectinfo, err, logout); 195 132 else err = protocolError; … … 200 137 InfoFiltersResponse_t &response, 201 138 comerror_t &err, ostream &logout) { 202 collectserver *cserver = cse rvers.getcollectserver (collection);139 collectserver *cserver = cset->getCollectServer (collection); 203 140 if (cserver != NULL) cserver->get_filterinfo (response, err, logout); 204 141 else err = protocolError; … … 209 146 InfoFilterOptionsResponse_t &response, 210 147 comerror_t &err, ostream &logout) { 211 collectserver *cserver = cse rvers.getcollectserver (collection);148 collectserver *cserver = cset->getCollectServer (collection); 212 149 if (cserver != NULL) cserver->get_filteroptions (request, response, err, logout); 213 150 else err = protocolError; … … 218 155 FilterResponse_t &response, 219 156 comerror_t &err, ostream &logout) { 220 collectserver *cserver = cse rvers.getcollectserver (collection);157 collectserver *cserver = cset->getCollectServer (collection); 221 158 if (cserver != NULL) cserver->filter (request, response, err, logout); 222 159 else err = protocolError; … … 227 164 DocumentResponse_t &response, 228 165 comerror_t &err, ostream &logout) { 229 collectserver *cserver = cse rvers.getcollectserver (collection);166 collectserver *cserver = cset->getCollectServer (collection); 230 167 if (cserver != NULL) cserver->get_document (request, response, err, logout); 231 168 else err = protocolError; -
branches/corba/gsdl/src/recpt/nullproto.h
r533 r1067 32 32 #include "gsdlconf.h" 33 33 #include "collectserver.h" 34 #include "collectset.h" 34 35 #include "recptproto.h" 35 36 … … 37 38 class nullproto : public recptproto { 38 39 protected: 39 collectse rvermapclass cservers;40 collectset *cset; 40 41 public: 41 42 virtual ~nullproto() {} … … 43 44 // add_collectserver should be called for each collection server 44 45 // 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 } 47 49 48 50 // this configure will configure each of the collection servers -
branches/corba/gsdl/src/recpt/receptionist.h
r864 r1067 39 39 #include "converter.h" 40 40 #include "cfgread.h" 41 #include "cnfgable.h" 41 42 42 43 // the MACROPRECEDENCE macro is used as a default. override … … 73 74 74 75 75 class receptionist {76 class receptionist : public configurable { 76 77 protected: 77 78 recptconf configinfo; … … 141 142 // it contains. The configuration should take place after everything 142 143 // has been added but before the initialisation. 143 v irtual void configure (const text_t &key, const text_tarray &cfgline);144 void configure (const text_t &key, const text_tarray &cfgline); 144 145 virtual void configure (const text_t &key, const text_t &value); 145 146 const recptconf &get_configinfo () {return configinfo;} -
branches/corba/gsdl/src/recpt/recptconfig.cpp
r963 r1067 28 28 /* 29 29 $Log$ 30 Revision 1.6.2.1 2000/04/04 15:02:38 cs025 31 Corba first commit 32 30 33 Revision 1.6 2000/02/21 21:55:33 sjboddie 31 34 gsdlhome now comes from gsdlsite.cfg … … 55 58 #include "fileutil.h" 56 59 #include "cfgread.h" 60 #include "cnfgator.h" 57 61 58 62 … … 68 72 #endif 69 73 74 class __site_configuration : public configurable { 75 private: 76 text_t *gsdlhome; 77 int *maxrequests; 78 public: 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 70 104 71 105 // reads site configuration file returning true on success … … 73 107 // gsdlsite.cfg should be in same directory as library executable 74 108 bool 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 76 116 gsdlhome.clear(); 77 117 118 /* 78 119 // Look for gsdlsite.cfg in same directory that executable is in. 79 120 text_tarray cfgline; … … 86 127 key = cfgline[0]; 87 128 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); 97 131 // configure the receptionist 98 132 recpt.configure (key, cfgline); … … 100 134 } 101 135 confin.close (); 136 137 cout << "GRB: " << maxrequests << endl; 138 139 return true; 140 } 141 */ 142 143 if (gsdlconfigurator.configure("gsdlsite.cfg")) { 102 144 return true; 103 145 } … … 107 149 // this version just grabs gsdlhome, returns false if it can't find it 108 150 bool site_cfg_read (text_t &gsdlhome) { 151 // get gsdlhome etc 152 __site_configuration sitecfg(&gsdlhome); 153 configurator gsdlconfigurator(&sitecfg); 109 154 110 155 gsdlhome.clear(); 111 156 157 if (gsdlconfigurator.configure("gsdlsite.cfg") && 158 !gsdlhome.empty()) { 159 return true; 160 } 161 /* 112 162 // Look for gsdlsite.cfg in same directory that executable is in. 113 163 text_tarray cfgline; … … 126 176 confin.close (); 127 177 } 178 */ 128 179 return false; 129 180 } … … 137 188 // read in the main configuration file 138 189 bool rv = false; 190 139 191 text_t key, filename; 140 192 text_tarray cfgline; … … 142 194 filename = filename_cat (filename, "main.cfg"); 143 195 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); 161 197 } 162 198 … … 175 211 176 212 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); 194 214 } 195 215 } -
branches/corba/gsdl/src/recpt/recptconfig.h
r963 r1067 34 34 #include "text_t.h" 35 35 #include "receptionist.h" 36 #include "collectset.h" 36 37 37 38 -
branches/corba/gsdl/src/recpt/recptmain.cpp
r533 r1067 28 28 /* 29 29 $Log$ 30 Revision 1.3.2.1 2000/04/04 15:02:38 cs025 31 Corba first commit 32 30 33 Revision 1.3 1999/09/07 04:56:59 sjboddie 31 34 added GPL notice … … 52 55 } 53 56 57 -
branches/corba/gsdl/src/txt2db/Makefile.in
r1004 r1067 29 29 AR = ar 30 30 CC = @CC@ 31 CPP = @CXX@ 31 32 CCFLAGS = -Wall @CFLAGS@ 32 33 DEFS = @DEFS@ … … 35 36 LDFLAGS = @LDFLAGS@ 36 37 DPLIBS = ../../lib/gsdllib.a ../../packages/mg/lib/unitool.o 37 #LIBS = ../../lib/gsdllib.a ../../packages/mg/lib/unitool.o -lstdc++ -lgdbm38 38 LIBS = ../../lib/gsdllib.a ../../packages/mg/lib/unitool.o @LIBS@ 39 39 GSDLOS = @gsdlos@ … … 41 41 42 42 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CCFLAGS) 43 CPPCOMPILE = $(CPP) -c $(DEFS) $(INCLUDES) $(CCFLAGS) 44 MCOMPILE = mico-c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c 43 45 LINK = $(CC) $(LDFLAGS) -o $@ 46 MLINK = mico-ld $(LDFLAGS) -lmico2.2.7 -o $@ 47 CPPLINK = $(CPP) $(LDFLAGS) -o $@ 44 48 45 49 .SUFFIXES: … … 50 54 .SUFFIXES: .cpp .o 51 55 .cpp.o: 52 $(C OMPILE) $<56 $(CPPCOMPILE) $< 53 57 58 .SUFFIXES: .mpp .o 59 .mpp.o: 60 $(MCOMPILE) $< 54 61 55 62 HEADERS = … … 82 89 83 90 txt2db: $(TXT2DB_OBJS) $(DPLIBS) 84 $( LINK) $(TXT2DB_OBJS) $(LIBS)91 $(MLINK) $(TXT2DB_OBJS) $(LIBS) 85 92 86 93
Note:
See TracChangeset
for help on using the changeset viewer.