Changeset 25147 for main/trunk/greenstone2/common-src/indexers/mgpp
- Timestamp:
- 2012-02-28T13:59:00+13:00 (12 years ago)
- Location:
- main/trunk/greenstone2/common-src/indexers/mgpp
- Files:
-
- 89 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/common-src/indexers/mgpp/Makefile.in
r16583 r25147 29 29 CC = @CC@ 30 30 CXX = @CXX@ 31 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-ansi31 CFLAGS = @CFLAGS@ -ansi 32 32 INSTALL = @INSTALL@ 33 33 INSTALL_DATA = @INSTALL_DATA@ 34 34 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 35 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@35 LDFLAGS = @LDFLAGS@ 36 36 LIBS = @LIBS@ 37 37 TOUCH = echo timestamp > -
main/trunk/greenstone2/common-src/indexers/mgpp/configure
r23356 r25147 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.6 7.3 # Generated by GNU Autoconf 2.65. 4 4 # 5 5 # 6 6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 , 2010 Free Software8 # Foundation,Inc.7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 8 # Inc. 9 9 # 10 10 # … … 317 317 done 318 318 test -z "$as_dirs" || eval "mkdir $as_dirs" 319 } || test -d "$as_dir" || as_fn_error $?"cannot create directory $as_dir"319 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 320 320 321 321 … … 357 357 358 358 359 # as_fn_error STATUSERROR [LINENO LOG_FD]360 # --------------------------------- -------359 # as_fn_error ERROR [LINENO LOG_FD] 360 # --------------------------------- 361 361 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 362 362 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 363 # script with STATUS, using 1 if that was 0.363 # script with status $?, using 1 if that was 0. 364 364 as_fn_error () 365 365 { 366 as_status=$ 1; test $as_status -eq 0 && as_status=1367 if test "$ 4"; then368 as_lineno=${as_lineno-"$ 3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack369 $as_echo "$as_me:${as_lineno-$LINENO}: error: $ 2" >&$4366 as_status=$?; test $as_status -eq 0 && as_status=1 367 if test "$3"; then 368 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 369 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 370 370 fi 371 $as_echo "$as_me: error: $ 2" >&2371 $as_echo "$as_me: error: $1" >&2 372 372 as_fn_exit $as_status 373 373 } # as_fn_error … … 531 531 532 532 # Name of the host. 533 # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,533 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, 534 534 # so uname gets run too. 535 535 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` … … 628 628 CXX 629 629 ENABLE_ACCENTFOLD 630 COMPAT32BITFLAGS631 630 ENABLE_JAVA 632 631 VERSION … … 769 768 770 769 case $ac_option in 771 *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 772 *=) ac_optarg= ;; 773 *) ac_optarg=yes ;; 770 *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 771 *) ac_optarg=yes ;; 774 772 esac 775 773 … … 816 814 # Reject names that are not valid shell variable names. 817 815 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 818 as_fn_error $?"invalid feature name: $ac_useropt"816 as_fn_error "invalid feature name: $ac_useropt" 819 817 ac_useropt_orig=$ac_useropt 820 818 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 842 840 # Reject names that are not valid shell variable names. 843 841 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 844 as_fn_error $?"invalid feature name: $ac_useropt"842 as_fn_error "invalid feature name: $ac_useropt" 845 843 ac_useropt_orig=$ac_useropt 846 844 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1046 1044 # Reject names that are not valid shell variable names. 1047 1045 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1048 as_fn_error $?"invalid package name: $ac_useropt"1046 as_fn_error "invalid package name: $ac_useropt" 1049 1047 ac_useropt_orig=$ac_useropt 1050 1048 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1062 1060 # Reject names that are not valid shell variable names. 1063 1061 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1064 as_fn_error $?"invalid package name: $ac_useropt"1062 as_fn_error "invalid package name: $ac_useropt" 1065 1063 ac_useropt_orig=$ac_useropt 1066 1064 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1092 1090 x_libraries=$ac_optarg ;; 1093 1091 1094 -*) as_fn_error $?"unrecognized option: \`$ac_option'1095 Try \`$0 --help' for more information "1092 -*) as_fn_error "unrecognized option: \`$ac_option' 1093 Try \`$0 --help' for more information." 1096 1094 ;; 1097 1095 … … 1101 1099 case $ac_envvar in #( 1102 1100 '' | [0-9]* | *[!_$as_cr_alnum]* ) 1103 as_fn_error $?"invalid variable name: \`$ac_envvar'" ;;1101 as_fn_error "invalid variable name: \`$ac_envvar'" ;; 1104 1102 esac 1105 1103 eval $ac_envvar=\$ac_optarg … … 1119 1117 if test -n "$ac_prev"; then 1120 1118 ac_option=--`echo $ac_prev | sed 's/_/-/g'` 1121 as_fn_error $?"missing argument to $ac_option"1119 as_fn_error "missing argument to $ac_option" 1122 1120 fi 1123 1121 … … 1125 1123 case $enable_option_checking in 1126 1124 no) ;; 1127 fatal) as_fn_error $?"unrecognized options: $ac_unrecognized_opts" ;;1125 fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; 1128 1126 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; 1129 1127 esac … … 1148 1146 NONE | '' ) case $ac_var in *prefix ) continue;; esac;; 1149 1147 esac 1150 as_fn_error $?"expected an absolute directory name for --$ac_var: $ac_val"1148 as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" 1151 1149 done 1152 1150 … … 1162 1160 if test "x$build_alias" = x; then 1163 1161 cross_compiling=maybe 1164 $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.1165 If a cross compiler is detected then cross compile mode will be used " >&21162 $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. 1163 If a cross compiler is detected then cross compile mode will be used." >&2 1166 1164 elif test "x$build_alias" != "x$host_alias"; then 1167 1165 cross_compiling=yes … … 1178 1176 ac_ls_di=`ls -di .` && 1179 1177 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || 1180 as_fn_error $?"working directory cannot be determined"1178 as_fn_error "working directory cannot be determined" 1181 1179 test "X$ac_ls_di" = "X$ac_pwd_ls_di" || 1182 as_fn_error $?"pwd does not report name of working directory"1180 as_fn_error "pwd does not report name of working directory" 1183 1181 1184 1182 … … 1219 1217 if test ! -r "$srcdir/$ac_unique_file"; then 1220 1218 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." 1221 as_fn_error $?"cannot find sources ($ac_unique_file) in $srcdir"1219 as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" 1222 1220 fi 1223 1221 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" 1224 1222 ac_abs_confdir=`( 1225 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $?"$ac_msg"1223 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" 1226 1224 pwd)` 1227 1225 # When building in place, set srcdir=. … … 1263 1261 --help=recursive display the short help of all the included packages 1264 1262 -V, --version display version information and exit 1265 -q, --quiet, --silent do not print \`checking 1263 -q, --quiet, --silent do not print \`checking...' messages 1266 1264 --cache-file=FILE cache test results in FILE [disabled] 1267 1265 -C, --config-cache alias for \`--cache-file=config.cache' … … 1424 1422 cat <<\_ACEOF 1425 1423 configure 1426 generated by GNU Autoconf 2.6 71427 1428 Copyright (C) 20 10Free Software Foundation, Inc.1424 generated by GNU Autoconf 2.65 1425 1426 Copyright (C) 2009 Free Software Foundation, Inc. 1429 1427 This configure script is free software; the Free Software Foundation 1430 1428 gives unlimited permission to copy, distribute and modify it. … … 1534 1532 fi 1535 1533 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 1536 test $ac_status = 0; } > conftest.i&& {1534 test $ac_status = 0; } >/dev/null && { 1537 1535 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 1538 1536 test ! -s conftest.err … … 1558 1556 { 1559 1557 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1560 if eval "test \"\${$3+set}\"" = set; then :1558 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1561 1559 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1562 1560 $as_echo_n "checking for $2... " >&6; } 1563 if eval "test \"\${$3+set}\"" = set; then :1561 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1564 1562 $as_echo_n "(cached) " >&6 1565 1563 fi … … 1597 1595 ac_header_preproc=no 1598 1596 fi 1599 rm -f conftest.err conftest. i conftest.$ac_ext1597 rm -f conftest.err conftest.$ac_ext 1600 1598 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 1601 1599 $as_echo "$ac_header_preproc" >&6; } … … 1624 1622 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1625 1623 $as_echo_n "checking for $2... " >&6; } 1626 if eval "test \"\${$3+set}\"" = set; then :1624 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1627 1625 $as_echo_n "(cached) " >&6 1628 1626 else … … 1688 1686 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1689 1687 $as_echo_n "checking for $2... " >&6; } 1690 if eval "test \"\${$3+set}\"" = set; then :1688 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1691 1689 $as_echo_n "(cached) " >&6 1692 1690 else … … 1765 1763 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1766 1764 $as_echo_n "checking for $2... " >&6; } 1767 if eval "test \"\${$3+set}\"" = set; then :1765 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1768 1766 $as_echo_n "(cached) " >&6 1769 1767 else … … 1818 1816 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1819 1817 $as_echo_n "checking for $2... " >&6; } 1820 if eval "test \"\${$3+set}\"" = set; then :1818 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1821 1819 $as_echo_n "(cached) " >&6 1822 1820 else … … 2059 2057 2060 2058 It was created by $as_me, which was 2061 generated by GNU Autoconf 2.6 7. Invocation command line was2059 generated by GNU Autoconf 2.65. Invocation command line was 2062 2060 2063 2061 $ $0 $@ … … 2169 2167 echo 2170 2168 2171 $as_echo "## ---------------- ## 2169 cat <<\_ASBOX 2170 ## ---------------- ## 2172 2171 ## Cache variables. ## 2173 ## ---------------- ##" 2172 ## ---------------- ## 2173 _ASBOX 2174 2174 echo 2175 2175 # The following way of writing the cache mishandles newlines in values, … … 2205 2205 echo 2206 2206 2207 $as_echo "## ----------------- ## 2207 cat <<\_ASBOX 2208 ## ----------------- ## 2208 2209 ## Output variables. ## 2209 ## ----------------- ##" 2210 ## ----------------- ## 2211 _ASBOX 2210 2212 echo 2211 2213 for ac_var in $ac_subst_vars … … 2220 2222 2221 2223 if test -n "$ac_subst_files"; then 2222 $as_echo "## ------------------- ## 2224 cat <<\_ASBOX 2225 ## ------------------- ## 2223 2226 ## File substitutions. ## 2224 ## ------------------- ##" 2227 ## ------------------- ## 2228 _ASBOX 2225 2229 echo 2226 2230 for ac_var in $ac_subst_files … … 2236 2240 2237 2241 if test -s confdefs.h; then 2238 $as_echo "## ----------- ## 2242 cat <<\_ASBOX 2243 ## ----------- ## 2239 2244 ## confdefs.h. ## 2240 ## ----------- ##" 2245 ## ----------- ## 2246 _ASBOX 2241 2247 echo 2242 2248 cat confdefs.h … … 2293 2299 ac_site_file2=NONE 2294 2300 if test -n "$CONFIG_SITE"; then 2295 # We do not want a PATH search for config.site. 2296 case $CONFIG_SITE in #(( 2297 -*) ac_site_file1=./$CONFIG_SITE;; 2298 */*) ac_site_file1=$CONFIG_SITE;; 2299 *) ac_site_file1=./$CONFIG_SITE;; 2300 esac 2301 ac_site_file1=$CONFIG_SITE 2301 2302 elif test "x$prefix" != xNONE; then 2302 2303 ac_site_file1=$prefix/share/config.site … … 2313 2314 $as_echo "$as_me: loading site script $ac_site_file" >&6;} 2314 2315 sed 's/^/| /' "$ac_site_file" >&5 2315 . "$ac_site_file" \ 2316 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2317 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2318 as_fn_error $? "failed to load site script $ac_site_file 2319 See \`config.log' for more details" "$LINENO" 5 ; } 2316 . "$ac_site_file" 2320 2317 fi 2321 2318 done … … 2393 2390 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 2394 2391 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} 2395 as_fn_error $?"run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 52392 as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 2396 2393 fi 2397 2394 ## -------------------- ## … … 2411 2408 ac_aux_dir= 2412 2409 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do 2413 if test -f "$ac_dir/install-sh"; then 2414 ac_aux_dir=$ac_dir 2415 ac_install_sh="$ac_aux_dir/install-sh -c" 2416 break 2417 elif test -f "$ac_dir/install.sh"; then 2418 ac_aux_dir=$ac_dir 2419 ac_install_sh="$ac_aux_dir/install.sh -c" 2420 break 2421 elif test -f "$ac_dir/shtool"; then 2422 ac_aux_dir=$ac_dir 2423 ac_install_sh="$ac_aux_dir/shtool install -c" 2424 break 2425 fi 2410 for ac_t in install-sh install.sh shtool; do 2411 if test -f "$ac_dir/$ac_t"; then 2412 ac_aux_dir=$ac_dir 2413 ac_install_sh="$ac_aux_dir/$ac_t -c" 2414 break 2 2415 fi 2416 done 2426 2417 done 2427 2418 if test -z "$ac_aux_dir"; then 2428 as_fn_error $?"cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 52419 as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 2429 2420 fi 2430 2421 … … 2440 2431 # Make sure we can run config.sub. 2441 2432 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || 2442 as_fn_error $?"cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 52433 as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 2443 2434 2444 2435 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 … … 2451 2442 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` 2452 2443 test "x$ac_build_alias" = x && 2453 as_fn_error $?"cannot guess build type; you must specify one" "$LINENO" 52444 as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 2454 2445 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || 2455 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 52446 as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 2456 2447 2457 2448 fi … … 2460 2451 case $ac_cv_build in 2461 2452 *-*-*) ;; 2462 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;2453 *) as_fn_error "invalid value of canonical build" "$LINENO" 5;; 2463 2454 esac 2464 2455 build=$ac_cv_build … … 2485 2476 else 2486 2477 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || 2487 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 52478 as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 2488 2479 fi 2489 2480 … … 2493 2484 case $ac_cv_host in 2494 2485 *-*-*) ;; 2495 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;2486 *) as_fn_error "invalid value of canonical host" "$LINENO" 5;; 2496 2487 esac 2497 2488 host=$ac_cv_host … … 2518 2509 else 2519 2510 ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || 2520 as_fn_error $?"$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 52511 as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 2521 2512 fi 2522 2513 … … 2526 2517 case $ac_cv_target in 2527 2518 *-*-*) ;; 2528 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;2519 *) as_fn_error "invalid value of canonical target" "$LINENO" 5;; 2529 2520 esac 2530 2521 target=$ac_cv_target … … 2593 2584 fi 2594 2585 2595 2596 { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if architecture is 64-bit" >&52597 $as_echo_n "checking to see if architecture is 64-bit... " >&6; }2598 arch_64bit=no2599 case "$host_cpu" in2600 x86_64) arch_64bit=yes ;;2601 esac2602 2603 if test "$arch_64bit" = yes; then2604 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&52605 $as_echo "yes" >&6; }2606 if test -z "$COMPAT32BITFLAGS" ; then2607 COMPAT32BITFLAGS="-m32"2608 fi2609 else2610 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&52611 $as_echo "no" >&6; }2612 if test -z "$COMPAT32BITFLAGS" ; then2613 COMPAT32BITFLAGS=2614 fi2615 fi2616 2586 2617 2587 … … 2856 2826 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2857 2827 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2858 as_fn_error 77 "C++ compiler cannot create executables 2859 See \`config.log' for more details" "$LINENO" 5 ; } 2828 { as_fn_set_status 77 2829 as_fn_error "C++ compiler cannot create executables 2830 See \`config.log' for more details." "$LINENO" 5; }; } 2860 2831 else 2861 2832 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 … … 2899 2870 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2900 2871 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2901 as_fn_error $?"cannot compute suffix of executables: cannot compile and link2902 See \`config.log' for more details " "$LINENO" 5; }2872 as_fn_error "cannot compute suffix of executables: cannot compile and link 2873 See \`config.log' for more details." "$LINENO" 5; } 2903 2874 fi 2904 2875 rm -f conftest conftest$ac_cv_exeext … … 2957 2928 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2958 2929 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2959 as_fn_error $?"cannot run C++ compiled programs.2930 as_fn_error "cannot run C++ compiled programs. 2960 2931 If you meant to cross compile, use \`--host'. 2961 See \`config.log' for more details " "$LINENO" 5; }2932 See \`config.log' for more details." "$LINENO" 5; } 2962 2933 fi 2963 2934 fi … … 3010 2981 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3011 2982 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3012 as_fn_error $?"cannot compute suffix of object files: cannot compile3013 See \`config.log' for more details " "$LINENO" 5; }2983 as_fn_error "cannot compute suffix of object files: cannot compile 2984 See \`config.log' for more details." "$LINENO" 5; } 3014 2985 fi 3015 2986 rm -f conftest.$ac_cv_objext conftest.$ac_ext … … 3525 3496 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3526 3497 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3527 as_fn_error $?"no acceptable C compiler found in \$PATH3528 See \`config.log' for more details " "$LINENO" 5; }3498 as_fn_error "no acceptable C compiler found in \$PATH 3499 See \`config.log' for more details." "$LINENO" 5; } 3529 3500 3530 3501 # Provide some information about the compiler. … … 3873 3844 set x ${MAKE-make} 3874 3845 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 3875 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :3846 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : 3876 3847 $as_echo_n "(cached) " >&6 3877 3848 else … … 3881 3852 @echo '@@@%%%=$(MAKE)=@@@%%%' 3882 3853 _ACEOF 3883 # GNU make sometimes prints "make[1]: Entering 3854 # GNU make sometimes prints "make[1]: Entering...", which would confuse us. 3884 3855 case `${MAKE-make} -f conftest.make 2>/dev/null` in 3885 3856 *@@@%%%=?*=@@@%%%*) … … 4084 4055 4085 4056 fi 4086 test x$JAVA = x && as_fn_error $?"no acceptable Java virtual machine found in \$PATH" "$LINENO" 54057 test x$JAVA = x && as_fn_error "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5 4087 4058 fi 4088 4059 … … 4146 4117 ac_cv_prog_uudecode_base64=yes 4147 4118 else 4148 echo "configure: 41 48: uudecode had trouble decoding base 64 file 'Test.uue'" >&54119 echo "configure: 4119: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 4149 4120 echo "configure: failed file was:" >&5 4150 4121 cat Test.uue >&5 … … 4161 4132 $as_echo "$as_me: WARNING: I have to compile Test.class from scratch" >&2;} 4162 4133 if test x$ac_cv_prog_javac_works = xno; then 4163 as_fn_error $?"Cannot compile java source. $JAVAC does not work properly" "$LINENO" 54134 as_fn_error "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5 4164 4135 fi 4165 4136 if test x$ac_cv_prog_javac_works = x; then … … 4254 4225 4255 4226 fi 4256 test "x$JAVAC" = x && as_fn_error $?"no acceptable Java compiler found in \$PATH" "$LINENO" 54227 test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5 4257 4228 else 4258 4229 echo "Checking for javac... $JAVAC" … … 4269 4240 CLASS_TEST=Test.class 4270 4241 cat << \EOF > $JAVA_TEST 4271 /* #line 42 71"configure" */4242 /* #line 4242 "configure" */ 4272 4243 public class Test { 4273 4244 } … … 4281 4252 ac_cv_prog_javac_works=yes 4282 4253 else 4283 as_fn_error $?"The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 54254 as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 4284 4255 echo "configure: failed program was:" >&5 4285 4256 cat $JAVA_TEST >&5 … … 4308 4279 TEST=Test 4309 4280 cat << \EOF > $JAVA_TEST 4310 /* [#]line 4 310"configure" */4281 /* [#]line 4281 "configure" */ 4311 4282 public class Test { 4312 4283 public static void main (String args[]) { … … 4325 4296 echo "configure: failed program was:" >&5 4326 4297 cat $JAVA_TEST >&5 4327 as_fn_error $?"The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 54298 as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 4328 4299 fi 4329 4300 fi … … 4338 4309 echo "configure: failed program was:" >&5 4339 4310 cat $JAVA_TEST >&5 4340 as_fn_error $?"The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 54311 as_fn_error "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 4341 4312 fi 4342 4313 rm -fr $JAVA_TEST $CLASS_TEST Test.uue … … 4438 4409 4439 4410 fi 4440 test "x$JAVAC" = x && as_fn_error $?"no acceptable Java compiler found in \$PATH" "$LINENO" 54411 test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5 4441 4412 else 4442 4413 echo "Checking for javac... $JAVAC" … … 4453 4424 CLASS_TEST=Test.class 4454 4425 cat << \EOF > $JAVA_TEST 4455 /* #line 44 55"configure" */4426 /* #line 4426 "configure" */ 4456 4427 public class Test { 4457 4428 } … … 4465 4436 ac_cv_prog_javac_works=yes 4466 4437 else 4467 as_fn_error $?"The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 54438 as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5 4468 4439 echo "configure: failed program was:" >&5 4469 4440 cat $JAVA_TEST >&5 … … 4525 4496 continue 4526 4497 fi 4527 rm -f conftest.err conftest. i conftest.$ac_ext4498 rm -f conftest.err conftest.$ac_ext 4528 4499 4529 4500 # OK, works on sane cases. Now check whether nonexistent headers … … 4541 4512 break 4542 4513 fi 4543 rm -f conftest.err conftest. i conftest.$ac_ext4514 rm -f conftest.err conftest.$ac_ext 4544 4515 4545 4516 done 4546 4517 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4547 rm -f conftest. i conftest.err conftest.$ac_ext4518 rm -f conftest.err conftest.$ac_ext 4548 4519 if $ac_preproc_ok; then : 4549 4520 break … … 4584 4555 continue 4585 4556 fi 4586 rm -f conftest.err conftest. i conftest.$ac_ext4557 rm -f conftest.err conftest.$ac_ext 4587 4558 4588 4559 # OK, works on sane cases. Now check whether nonexistent headers … … 4600 4571 break 4601 4572 fi 4602 rm -f conftest.err conftest. i conftest.$ac_ext4573 rm -f conftest.err conftest.$ac_ext 4603 4574 4604 4575 done 4605 4576 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4606 rm -f conftest. i conftest.err conftest.$ac_ext4577 rm -f conftest.err conftest.$ac_ext 4607 4578 if $ac_preproc_ok; then : 4608 4579 … … 4610 4581 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4611 4582 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4612 as_fn_error $?"C preprocessor \"$CPP\" fails sanity check4613 See \`config.log' for more details " "$LINENO" 5; }4583 as_fn_error "C preprocessor \"$CPP\" fails sanity check 4584 See \`config.log' for more details." "$LINENO" 5; } 4614 4585 fi 4615 4586 … … 4672 4643 IFS=$as_save_IFS 4673 4644 if test -z "$ac_cv_path_GREP"; then 4674 as_fn_error $?"no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 54645 as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4675 4646 fi 4676 4647 else … … 4738 4709 IFS=$as_save_IFS 4739 4710 if test -z "$ac_cv_path_EGREP"; then 4740 as_fn_error $?"no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 54711 as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4741 4712 fi 4742 4713 else … … 4870 4841 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 4871 4842 " 4872 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 4843 eval as_val=\$$as_ac_Header 4844 if test "x$as_val" = x""yes; then : 4873 4845 cat >>confdefs.h <<_ACEOF 4874 4846 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 … … 5442 5414 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 5443 5415 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } 5444 if eval "test \"\${$as_ac_Header+set}\"" = set; then :5416 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : 5445 5417 $as_echo_n "(cached) " >&6 5446 5418 else … … 5469 5441 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 5470 5442 $as_echo "$ac_res" >&6; } 5471 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 5443 eval as_val=\$$as_ac_Header 5444 if test "x$as_val" = x""yes; then : 5472 5445 cat >>confdefs.h <<_ACEOF 5473 5446 #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 … … 5711 5684 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 5712 5685 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 5713 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 5686 eval as_val=\$$as_ac_Header 5687 if test "x$as_val" = x""yes; then : 5714 5688 cat >>confdefs.h <<_ACEOF 5715 5689 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 … … 5884 5858 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 5885 5859 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 5886 if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 5860 eval as_val=\$$as_ac_var 5861 if test "x$as_val" = x""yes; then : 5887 5862 5888 5863 cat >>confdefs.h <<_ACEOF … … 6044 6019 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 6045 6020 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 6046 if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 6021 eval as_val=\$$as_ac_var 6022 if test "x$as_val" = x""yes; then : 6047 6023 cat >>confdefs.h <<_ACEOF 6048 6024 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 … … 6052 6028 done 6053 6029 6054 ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate" 6055 if test "x$ac_cv_func_ftruncate" = x""yes; then : 6056 $as_echo "#define HAVE_FTRUNCATE 1" >>confdefs.h 6030 for ac_func in ftruncate strstr strcasecmp 6031 do : 6032 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 6033 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 6034 eval as_val=\$$as_ac_var 6035 if test "x$as_val" = x""yes; then : 6036 cat >>confdefs.h <<_ACEOF 6037 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 6038 _ACEOF 6057 6039 6058 6040 else 6059 6041 case " $LIBOBJS " in 6060 *" ftruncate.$ac_objext "* ) ;;6061 *) LIBOBJS="$LIBOBJS ftruncate.$ac_objext"6042 *" $ac_func.$ac_objext "* ) ;; 6043 *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" 6062 6044 ;; 6063 6045 esac 6064 6046 6065 6047 fi 6066 6067 ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr" 6068 if test "x$ac_cv_func_strstr" = x""yes; then : 6069 $as_echo "#define HAVE_STRSTR 1" >>confdefs.h 6070 6071 else 6072 case " $LIBOBJS " in 6073 *" strstr.$ac_objext "* ) ;; 6074 *) LIBOBJS="$LIBOBJS strstr.$ac_objext" 6075 ;; 6076 esac 6077 6078 fi 6079 6080 ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" 6081 if test "x$ac_cv_func_strcasecmp" = x""yes; then : 6082 $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h 6083 6084 else 6085 case " $LIBOBJS " in 6086 *" strcasecmp.$ac_objext "* ) ;; 6087 *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext" 6088 ;; 6089 esac 6090 6091 fi 6048 done 6092 6049 6093 6050 … … 6228 6185 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 6229 6186 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 6230 as_fn_error 77 "cannot compute sizeof (unsigned char *) 6231 See \`config.log' for more details" "$LINENO" 5 ; } 6187 { as_fn_set_status 77 6188 as_fn_error "cannot compute sizeof (unsigned char *) 6189 See \`config.log' for more details." "$LINENO" 5; }; } 6232 6190 else 6233 6191 ac_cv_sizeof_unsigned_char_p=0 … … 6615 6573 ;; #( 6616 6574 *) 6617 as_fn_error $?"unknown endianness6618 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 6575 as_fn_error "unknown endianness 6576 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; 6619 6577 esac 6620 6578 … … 6736 6694 ac_libobjs= 6737 6695 ac_ltlibobjs= 6738 U=6739 6696 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 6740 6697 # 1. Remove the extension, and $U if already installed. … … 6899 6856 6900 6857 6901 # as_fn_error STATUSERROR [LINENO LOG_FD]6902 # --------------------------------- -------6858 # as_fn_error ERROR [LINENO LOG_FD] 6859 # --------------------------------- 6903 6860 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 6904 6861 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 6905 # script with STATUS, using 1 if that was 0.6862 # script with status $?, using 1 if that was 0. 6906 6863 as_fn_error () 6907 6864 { 6908 as_status=$ 1; test $as_status -eq 0 && as_status=16909 if test "$ 4"; then6910 as_lineno=${as_lineno-"$ 3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack6911 $as_echo "$as_me:${as_lineno-$LINENO}: error: $ 2" >&$46865 as_status=$?; test $as_status -eq 0 && as_status=1 6866 if test "$3"; then 6867 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 6868 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 6912 6869 fi 6913 $as_echo "$as_me: error: $ 2" >&26870 $as_echo "$as_me: error: $1" >&2 6914 6871 as_fn_exit $as_status 6915 6872 } # as_fn_error … … 7107 7064 done 7108 7065 test -z "$as_dirs" || eval "mkdir $as_dirs" 7109 } || test -d "$as_dir" || as_fn_error $?"cannot create directory $as_dir"7066 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 7110 7067 7111 7068 … … 7161 7118 ac_log=" 7162 7119 This file was extended by $as_me, which was 7163 generated by GNU Autoconf 2.6 7. Invocation command line was7120 generated by GNU Autoconf 2.65. Invocation command line was 7164 7121 7165 7122 CONFIG_FILES = $CONFIG_FILES … … 7227 7184 ac_cs_version="\\ 7228 7185 config.status 7229 configured by $0, generated by GNU Autoconf 2.6 7,7186 configured by $0, generated by GNU Autoconf 2.65, 7230 7187 with options \\"\$ac_cs_config\\" 7231 7188 7232 Copyright (C) 20 10Free Software Foundation, Inc.7189 Copyright (C) 2009 Free Software Foundation, Inc. 7233 7190 This config.status script is free software; the Free Software Foundation 7234 7191 gives unlimited permission to copy, distribute and modify it." … … 7247 7204 do 7248 7205 case $1 in 7249 --*= ?*)7206 --*=*) 7250 7207 ac_option=`expr "X$1" : 'X\([^=]*\)='` 7251 7208 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` 7252 ac_shift=:7253 ;;7254 --*=)7255 ac_option=`expr "X$1" : 'X\([^=]*\)='`7256 ac_optarg=7257 7209 ac_shift=: 7258 7210 ;; … … 7278 7230 case $ac_optarg in 7279 7231 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 7280 '') as_fn_error $? "missing file argument" ;;7281 7232 esac 7282 7233 as_fn_append CONFIG_FILES " '$ac_optarg'" … … 7291 7242 --he | --h) 7292 7243 # Conflict between --help and --header 7293 as_fn_error $?"ambiguous option: \`$1'7244 as_fn_error "ambiguous option: \`$1' 7294 7245 Try \`$0 --help' for more information.";; 7295 7246 --help | --hel | -h ) … … 7300 7251 7301 7252 # This is an error. 7302 -*) as_fn_error $?"unrecognized option: \`$1'7253 -*) as_fn_error "unrecognized option: \`$1' 7303 7254 Try \`$0 --help' for more information." ;; 7304 7255 … … 7357 7308 "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; 7358 7309 7359 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;7310 *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 7360 7311 esac 7361 7312 done … … 7395 7346 tmp=./conf$$-$RANDOM 7396 7347 (umask 077 && mkdir "$tmp") 7397 } || as_fn_error $?"cannot create a temporary directory in ." "$LINENO" 57348 } || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 7398 7349 7399 7350 # Set up the scripts for CONFIG_FILES section. … … 7412 7363 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` 7413 7364 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then 7414 ac_cs_awk_cr='\ \r'7365 ac_cs_awk_cr='\r' 7415 7366 else 7416 7367 ac_cs_awk_cr=$ac_cr … … 7426 7377 echo "_ACEOF" 7427 7378 } >conf$$subs.sh || 7428 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 57429 ac_delim_num=`echo "$ac_subst_vars" | grep -c ' ^'`7379 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 7380 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` 7430 7381 ac_delim='%!_!# ' 7431 7382 for ac_last_try in false false false false false :; do 7432 7383 . ./conf$$subs.sh || 7433 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 57384 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 7434 7385 7435 7386 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` … … 7437 7388 break 7438 7389 elif $ac_last_try; then 7439 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 57390 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 7440 7391 else 7441 7392 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " … … 7526 7477 cat 7527 7478 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 7528 || as_fn_error $?"could not setup config files machinery" "$LINENO" 57529 _ACEOF 7530 7531 # VPATH may cause trouble with some makes, so we remove sole$(srcdir),7532 # ${srcdir} and @srcdir@ entriesfrom VPATH if srcdir is ".", strip leading and7479 || as_fn_error "could not setup config files machinery" "$LINENO" 5 7480 _ACEOF 7481 7482 # VPATH may cause trouble with some makes, so we remove $(srcdir), 7483 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and 7533 7484 # trailing colons and then remove the whole line if VPATH becomes empty 7534 7485 # (actually we leave an empty line to preserve line numbers). 7535 7486 if test "x$srcdir" = x.; then 7536 ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ 7537 h 7538 s/// 7539 s/^/:/ 7540 s/[ ]*$/:/ 7541 s/:\$(srcdir):/:/g 7542 s/:\${srcdir}:/:/g 7543 s/:@srcdir@:/:/g 7544 s/^:*// 7487 ac_vpsub='/^[ ]*VPATH[ ]*=/{ 7488 s/:*\$(srcdir):*/:/ 7489 s/:*\${srcdir}:*/:/ 7490 s/:*@srcdir@:*/:/ 7491 s/^\([^=]*=[ ]*\):*/\1/ 7545 7492 s/:*$// 7546 x7547 s/\(=[ ]*\).*/\1/7548 G7549 s/\n//7550 7493 s/^[^=]*=[ ]*$// 7551 7494 }' … … 7575 7518 break 7576 7519 elif $ac_last_try; then 7577 as_fn_error $?"could not make $CONFIG_HEADERS" "$LINENO" 57520 as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 7578 7521 else 7579 7522 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " … … 7660 7603 _ACEOF 7661 7604 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 7662 as_fn_error $?"could not setup config headers machinery" "$LINENO" 57605 as_fn_error "could not setup config headers machinery" "$LINENO" 5 7663 7606 fi # test -n "$CONFIG_HEADERS" 7664 7607 … … 7673 7616 case $ac_mode$ac_tag in 7674 7617 :[FHL]*:*);; 7675 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;7618 :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; 7676 7619 :[FH]-) ac_tag=-:-;; 7677 7620 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; … … 7701 7644 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 7702 7645 esac || 7703 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;7646 as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; 7704 7647 esac 7705 7648 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac … … 7728 7671 case $ac_tag in 7729 7672 *:-:* | *:-) cat >"$tmp/stdin" \ 7730 || as_fn_error $? "could not create $ac_file" "$LINENO" 5;;7673 || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; 7731 7674 esac 7732 7675 ;; … … 7859 7802 " 7860 7803 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 7861 || as_fn_error $?"could not create $ac_file" "$LINENO" 57804 || as_fn_error "could not create $ac_file" "$LINENO" 5 7862 7805 7863 7806 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && … … 7865 7808 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 7866 7809 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 7867 which seems to be undefined. Please make sure it is defined " >&57810 which seems to be undefined. Please make sure it is defined." >&5 7868 7811 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 7869 which seems to be undefined. Please make sure it is defined " >&2;}7812 which seems to be undefined. Please make sure it is defined." >&2;} 7870 7813 7871 7814 rm -f "$tmp/stdin" … … 7874 7817 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 7875 7818 esac \ 7876 || as_fn_error $?"could not create $ac_file" "$LINENO" 57819 || as_fn_error "could not create $ac_file" "$LINENO" 5 7877 7820 ;; 7878 7821 :H) … … 7885 7828 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 7886 7829 } >"$tmp/config.h" \ 7887 || as_fn_error $?"could not create $ac_file" "$LINENO" 57830 || as_fn_error "could not create $ac_file" "$LINENO" 5 7888 7831 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 7889 7832 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 … … 7892 7835 rm -f "$ac_file" 7893 7836 mv "$tmp/config.h" "$ac_file" \ 7894 || as_fn_error $?"could not create $ac_file" "$LINENO" 57837 || as_fn_error "could not create $ac_file" "$LINENO" 5 7895 7838 fi 7896 7839 else 7897 7840 $as_echo "/* $configure_input */" \ 7898 7841 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 7899 || as_fn_error $?"could not create -" "$LINENO" 57842 || as_fn_error "could not create -" "$LINENO" 5 7900 7843 fi 7901 7844 ;; … … 7919 7862 7920 7863 test $ac_write_fail = 0 || 7921 as_fn_error $?"write failure creating $CONFIG_STATUS" "$LINENO" 57864 as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 7922 7865 7923 7866 … … 7940 7883 # Use ||, not &&, to avoid exiting from the if with $? = 1, which 7941 7884 # would make configure fail if this is the last instruction. 7942 $ac_cs_success || as_fn_exit 17885 $ac_cs_success || as_fn_exit $? 7943 7886 fi 7944 7887 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -
main/trunk/greenstone2/common-src/indexers/mgpp/configure.in
r23356 r25147 34 34 AC_SUBST(ENABLE_JAVA) 35 35 36 AC_MSG_CHECKING(to see if architecture is 64-bit) 37 arch_64bit=no 38 case "$host_cpu" in 39 x86_64) arch_64bit=yes ;; 40 esac 41 42 if test "$arch_64bit" = yes; then 43 AC_MSG_RESULT(yes) 44 if test -z "$COMPAT32BITFLAGS" ; then 45 COMPAT32BITFLAGS="-m32" 46 fi 47 else 48 AC_MSG_RESULT(no) 49 if test -z "$COMPAT32BITFLAGS" ; then 50 COMPAT32BITFLAGS= 51 fi 52 fi 53 AC_SUBST(COMPAT32BITFLAGS) 36 dnl AC_MSG_CHECKING(to see if architecture is 64-bit) 37 dnl arch_64bit=no 38 dnl case "$host_cpu" in 39 dnl x86_64) arch_64bit=yes ;; 40 dnl esac 54 41 55 42 dnl -
main/trunk/greenstone2/common-src/indexers/mgpp/java/org/greenstone/mgpp/Makefile.in
r23356 r25147 17 17 JAVAH = javah 18 18 JAR = jar 19 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-ansi -DSILENT -DSHORT_SUFFIX20 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@-DSILENT -DSHORT_SUFFIX19 CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX 20 CXXFLAGS = @CXXFLAGS@ -DSILENT -DSHORT_SUFFIX 21 21 JAVACFLAGS = @JAVACFLAGS@ 22 22 DEFS = @DEFS@ … … 25 25 INSTALL_DATA = @INSTALL_DATA@ 26 26 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 27 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@27 LDFLAGS = @LDFLAGS@ 28 28 LIBS = -lstdc++ @LIBS@ 29 29 TOUCH = echo timestamp > -
main/trunk/greenstone2/common-src/indexers/mgpp/jni/MGPPRetrieveWrapperImpl.cpp
r16583 r25147 56 56 57 57 // does this work alright? j_docnum is a long (64 bit) 58 unsignedlong docnum = j_docnum;58 mg_u_long docnum = j_docnum; 59 59 TextData td; 60 60 -
main/trunk/greenstone2/common-src/indexers/mgpp/jni/Makefile.in
r22070 r25147 26 26 CC = @CC@ 27 27 CXX = @CXX@ 28 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-fPIC -ansi -DSILENT -DSHORT_SUFFIX29 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@-fPIC -DSILENT -DSHORT_SUFFIX28 CFLAGS = @CFLAGS@ -fPIC -ansi -DSILENT -DSHORT_SUFFIX 29 CXXFLAGS = @CXXFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX 30 30 DEFS = @DEFS@ 31 31 RANLIB = @RANLIB@ … … 33 33 INSTALL_DATA = @INSTALL_DATA@ 34 34 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 35 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@35 LDFLAGS = @LDFLAGS@ 36 36 #NOTE: libmgpptext.a needs to come before libmgpplib.a !!! 37 37 QUERY_LIBS = ../text/libmgpptext.a ../lib/libmgpplib.a $(AFLIBS) -lstdc++ ../../../packages/iconv/lib/libiconv.a @LIBS@ -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/Makefile.in
r22070 r25147 36 36 CXX = @CXX@ 37 37 ifneq ($(NZDL), 1) 38 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-ansi -fPIC38 CFLAGS = @CFLAGS@ -ansi -fPIC 39 39 else 40 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-ansi -fPIC -DSILENT40 CFLAGS = @CFLAGS@ -ansi -fPIC -DSILENT 41 41 endif 42 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@-fPIC42 CXXFLAGS = @CXXFLAGS@ -fPIC 43 43 DEFS = @DEFS@ 44 44 RANLIB = @RANLIB@ -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/alloca.c
r16583 r25147 59 59 60 60 #if defined (CRAY) && defined (CRAY_STACKSEG_END) 61 long i00afunc ();61 mg_s_long i00afunc (); 62 62 #define ADDRESS_FUNCTION(arg) (char *) i00afunc (&(arg)) 63 63 #else … … 237 237 struct stack_control_header 238 238 { 239 long shgrow:32; /* Number of times stack has grown. */240 long shaseg:32; /* Size of increments to stack. */241 long shhwm:32; /* High water mark of stack. */242 long shsize:32; /* Current size of stack (all segments). */239 mg_s_long shgrow:32; /* Number of times stack has grown. */ 240 mg_s_long shaseg:32; /* Size of increments to stack. */ 241 mg_s_long shhwm:32; /* High water mark of stack. */ 242 mg_s_long shsize:32; /* Current size of stack (all segments). */ 243 243 }; 244 244 … … 252 252 struct stack_segment_linkage 253 253 { 254 long ss[0200]; /* 0200 overflow words. */255 long sssize:32; /* Number of words in this segment. */256 long ssbase:32; /* Offset to stack base. */257 long:32;258 long sspseg:32; /* Offset to linkage control of previous254 mg_s_long ss[0200]; /* 0200 overflow words. */ 255 mg_s_long sssize:32; /* Number of words in this segment. */ 256 mg_s_long ssbase:32; /* Offset to stack base. */ 257 mg_s_long:32; 258 mg_s_long sspseg:32; /* Offset to linkage control of previous 259 259 segment of stack. */ 260 long:32;261 long sstcpt:32; /* Pointer to task common address block. */262 long sscsnm; /* Private control structure number for260 mg_s_long:32; 261 mg_s_long sstcpt:32; /* Pointer to task common address block. */ 262 mg_s_long sscsnm; /* Private control structure number for 263 263 microtasking. */ 264 long ssusr1; /* Reserved for user. */265 long ssusr2; /* Reserved for user. */266 long sstpid; /* Process ID for pid based multi-tasking. */267 long ssgvup; /* Pointer to multitasking thread giveup. */268 long sscray[7]; /* Reserved for Cray Research. */269 long ssa0;270 long ssa1;271 long ssa2;272 long ssa3;273 long ssa4;274 long ssa5;275 long ssa6;276 long ssa7;277 long sss0;278 long sss1;279 long sss2;280 long sss3;281 long sss4;282 long sss5;283 long sss6;284 long sss7;264 mg_s_long ssusr1; /* Reserved for user. */ 265 mg_s_long ssusr2; /* Reserved for user. */ 266 mg_s_long sstpid; /* Process ID for pid based multi-tasking. */ 267 mg_s_long ssgvup; /* Pointer to multitasking thread giveup. */ 268 mg_s_long sscray[7]; /* Reserved for Cray Research. */ 269 mg_s_long ssa0; 270 mg_s_long ssa1; 271 mg_s_long ssa2; 272 mg_s_long ssa3; 273 mg_s_long ssa4; 274 mg_s_long ssa5; 275 mg_s_long ssa6; 276 mg_s_long ssa7; 277 mg_s_long sss0; 278 mg_s_long sss1; 279 mg_s_long sss2; 280 mg_s_long sss3; 281 mg_s_long sss4; 282 mg_s_long sss5; 283 mg_s_long sss6; 284 mg_s_long sss7; 285 285 }; 286 286 … … 290 290 struct stk_stat 291 291 { 292 long now; /* Current total stack size. */293 long maxc; /* Amount of contiguous space which would292 mg_s_long now; /* Current total stack size. */ 293 mg_s_long maxc; /* Amount of contiguous space which would 294 294 be required to satisfy the maximum 295 295 stack demand to date. */ 296 long high_water; /* Stack high-water mark. */297 long overflows; /* Number of stack overflow ($STKOFEN) calls. */298 long hits; /* Number of internal buffer hits. */299 long extends; /* Number of block extensions. */300 long stko_mallocs; /* Block allocations by $STKOFEN. */301 long underflows; /* Number of stack underflow calls ($STKRETN). */302 long stko_free; /* Number of deallocations by $STKRETN. */303 long stkm_free; /* Number of deallocations by $STKMRET. */304 long segments; /* Current number of stack segments. */305 long maxs; /* Maximum number of stack segments so far. */306 long pad_size; /* Stack pad size. */307 long current_address; /* Current stack segment address. */308 long current_size; /* Current stack segment size. This296 mg_s_long high_water; /* Stack high-water mark. */ 297 mg_s_long overflows; /* Number of stack overflow ($STKOFEN) calls. */ 298 mg_s_long hits; /* Number of internal buffer hits. */ 299 mg_s_long extends; /* Number of block extensions. */ 300 mg_s_long stko_mallocs; /* Block allocations by $STKOFEN. */ 301 mg_s_long underflows; /* Number of stack underflow calls ($STKRETN). */ 302 mg_s_long stko_free; /* Number of deallocations by $STKRETN. */ 303 mg_s_long stkm_free; /* Number of deallocations by $STKMRET. */ 304 mg_s_long segments; /* Current number of stack segments. */ 305 mg_s_long maxs; /* Maximum number of stack segments so far. */ 306 mg_s_long pad_size; /* Stack pad size. */ 307 mg_s_long current_address; /* Current stack segment address. */ 308 mg_s_long current_size; /* Current stack segment size. This 309 309 number is actually corrupted by STKSTAT to 310 310 include the fifteen word trailer area. */ 311 long initial_address; /* Address of initial segment. */312 long initial_size; /* Size of initial segment. */311 mg_s_long initial_address; /* Address of initial segment. */ 312 mg_s_long initial_size; /* Size of initial segment. */ 313 313 }; 314 314 … … 319 319 struct stk_trailer 320 320 { 321 long this_address; /* Address of this block. */322 long this_size; /* Size of this block (does not include321 mg_s_long this_address; /* Address of this block. */ 322 mg_s_long this_size; /* Size of this block (does not include 323 323 this trailer). */ 324 long unknown2;325 long unknown3;326 long link; /* Address of trailer block of previous324 mg_s_long unknown2; 325 mg_s_long unknown3; 326 mg_s_long link; /* Address of trailer block of previous 327 327 segment. */ 328 long unknown5;329 long unknown6;330 long unknown7;331 long unknown8;332 long unknown9;333 long unknown10;334 long unknown11;335 long unknown12;336 long unknown13;337 long unknown14;328 mg_s_long unknown5; 329 mg_s_long unknown6; 330 mg_s_long unknown7; 331 mg_s_long unknown8; 332 mg_s_long unknown9; 333 mg_s_long unknown10; 334 mg_s_long unknown11; 335 mg_s_long unknown12; 336 mg_s_long unknown13; 337 mg_s_long unknown14; 338 338 }; 339 339 … … 345 345 I doubt that "lint" will like this much. */ 346 346 347 static long348 i00afunc ( long *address)347 static mg_s_long 348 i00afunc (mg_s_long *address) 349 349 { 350 350 struct stk_stat status; 351 351 struct stk_trailer *trailer; 352 long *block, size;353 long result = 0;352 mg_s_long *block, size; 353 mg_s_long result = 0; 354 354 355 355 /* We want to iterate through all of the segments. The first … … 376 376 while (trailer != 0) 377 377 { 378 block = ( long *) trailer->this_address;378 block = (mg_s_long *) trailer->this_address; 379 379 size = trailer->this_size; 380 380 if (block == 0 || size == 0) … … 419 419 for alloca. */ 420 420 421 static long422 i00afunc ( long address)421 static mg_s_long 422 i00afunc (mg_s_long address) 423 423 { 424 long stkl = 0;425 426 long size, pseg, this_segment, stack;427 long result = 0;424 mg_s_long stkl = 0; 425 426 mg_s_long size, pseg, this_segment, stack; 427 mg_s_long result = 0; 428 428 429 429 struct stack_segment_linkage *ssptr; -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_gen.cpp
r16583 r25147 25 25 int fprintf (FILE *, const char *,...); 26 26 27 unsignedlong28 BIO_Unary_Length ( unsignedlong val)27 mg_u_long 28 BIO_Unary_Length (mg_u_long val) 29 29 { 30 register unsignedlong num;30 register mg_u_long num; 31 31 num = bitio_buffer::unary_length(val); 32 32 // UNARY_LENGTH (val, num); … … 35 35 36 36 37 unsignedlong38 BIO_Binary_Length ( unsigned long val, unsignedlong b)37 mg_u_long 38 BIO_Binary_Length (mg_u_long val, mg_u_long b) 39 39 { 40 register unsignedlong num;40 register mg_u_long num; 41 41 num = bitio_buffer::binary_length (val, b); 42 42 return (num); … … 44 44 45 45 46 unsigned long BIO_Gamma_Length (unsignedlong val) {47 register unsignedlong num;46 mg_u_long BIO_Gamma_Length (mg_u_long val) { 47 register mg_u_long num; 48 48 num = bitio_buffer::gamma_length(val); 49 49 return (num); … … 51 51 52 52 53 unsignedlong54 BIO_Delta_Length ( unsignedlong val)53 mg_u_long 54 BIO_Delta_Length (mg_u_long val) 55 55 { 56 register unsignedlong num;56 register mg_u_long num; 57 57 num = bitio_buffer::delta_length(val); 58 58 return (num); … … 60 60 61 61 62 unsignedlong63 BIO_Elias_Length ( unsigned long val, unsignedlong b, double s)62 mg_u_long 63 BIO_Elias_Length (mg_u_long val, mg_u_long b, double s) 64 64 { 65 register unsignedlong num;65 register mg_u_long num; 66 66 num = bitio_buffer::elias_length(val, b, s); 67 67 return (num); 68 68 } 69 69 70 unsignedlong71 BIO_Bblock_Length ( unsigned long val, unsignedlong b)70 mg_u_long 71 BIO_Bblock_Length (mg_u_long val, mg_u_long b) 72 72 { 73 register unsignedlong num;73 register mg_u_long num; 74 74 num = bitio_buffer::bblock_length (val, b); 75 75 return (num); -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_gen.h
r16583 r25147 33 33 #define H_BITIO_GEN 34 34 35 unsigned long BIO_Unary_Length (unsignedlong val);35 mg_u_long BIO_Unary_Length (mg_u_long val); 36 36 37 unsigned long BIO_Binary_Length (unsigned long val, unsignedlong b);37 mg_u_long BIO_Binary_Length (mg_u_long val, mg_u_long b); 38 38 39 unsigned long BIO_Gamma_Length (unsignedlong val);39 mg_u_long BIO_Gamma_Length (mg_u_long val); 40 40 41 unsigned long BIO_Delta_Length (unsignedlong val);41 mg_u_long BIO_Delta_Length (mg_u_long val); 42 42 43 unsigned long BIO_Elias_Length (unsigned long val, unsignedlong b, double s);43 mg_u_long BIO_Elias_Length (mg_u_long val, mg_u_long b, double s); 44 44 45 unsigned long BIO_Bblock_Length (unsigned long val, unsignedlong b);45 mg_u_long BIO_Bblock_Length (mg_u_long val, mg_u_long b); 46 46 47 47 int BIO_Bblock_Init (int N, int p); -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_m_abstract.h
r18716 r25147 1 1 #ifndef H_BITIO_ABSTRACT 2 2 #define H_BITIO_ABSTRACT 3 #include "mglong.h" 3 4 #include <cstdlib> 4 5 class bitio_buffer { … … 6 7 virtual int bit() = 0; 7 8 virtual void encodeBit(int bit) = 0; 8 virtual void seek(unsigned long topos) = 0; 9 10 static inline void check_positive(char *type, unsigned long x) { 9 virtual void seek(mg_u_long topos) = 0; 10 11 virtual ~bitio_buffer() {} 12 13 static inline void check_positive(char *type, mg_u_long x) { 11 14 if (x <= 0) { 12 fprintf(stderr, "Error: Cannot %s encode % lu\n", type, x);15 fprintf(stderr, "Error: Cannot %s encode %u\n", type, x); 13 16 exit(1); 14 17 } 15 18 } 16 19 17 static inline int floor_log2( unsignedlong x) {18 unsignedlong _B_x = x;20 static inline int floor_log2(mg_u_long x) { 21 mg_u_long _B_x = x; 19 22 int reply; 20 23 … … 27 30 } 28 31 29 static inline int ceil_log2( unsignedlong x) {32 static inline int ceil_log2(mg_u_long x) { 30 33 register int _B_x; 31 unsignedlong reply;34 mg_u_long reply; 32 35 33 36 _B_x = x - 1; … … 40 43 } 41 44 42 inline unsigned long unary_decode(unsignedlong *count) {43 unsignedlong x;45 inline mg_u_long unary_decode(mg_u_long *count) { 46 mg_u_long x; 44 47 45 48 x = 1; … … 51 54 } 52 55 53 inline void unary_encode( unsigned long x, unsignedlong *count) {54 register unsignedlong _B_x = x;55 check_positive( "unary", _B_x);56 inline void unary_encode(mg_u_long x, mg_u_long *count) { 57 register mg_u_long _B_x = x; 58 check_positive((char*)"unary", _B_x); 56 59 if (count != NULL) { 57 60 *count += _B_x; … … 63 66 64 67 65 inline unsigned long binary_decode(unsigned long b, unsignedlong *count) {66 register unsignedlong _B_x = 0;67 register unsignedlong _B_b = b;68 inline mg_u_long binary_decode(mg_u_long b, mg_u_long *count) { 69 register mg_u_long _B_x = 0; 70 register mg_u_long _B_b = b; 68 71 register int _B_i, _B_logofb, _B_thresh; 69 register unsignedlong reply;72 register mg_u_long reply; 70 73 71 74 if (_B_b != 1) { … … 96 99 } 97 100 98 inline void binary_encode( unsigned long x, unsigned long b, unsignedlong *count) {99 register unsignedlong _B_x = (x);100 register unsignedlong _B_b = (b);101 inline void binary_encode(mg_u_long x, mg_u_long b, mg_u_long *count) { 102 register mg_u_long _B_x = (x); 103 register mg_u_long _B_b = (b); 101 104 register int _B_nbits, _B_logofb, _B_thresh; 102 105 103 check_positive( "binary", _B_x);106 check_positive((char*)"binary", _B_x); 104 107 _B_logofb = ceil_log2(_B_b); 105 108 … … 117 120 } 118 121 119 inline unsigned long bblock_decode(unsigned long b, unsignedlong *count) {120 register unsignedlong _B_x1, _B_xx = 0;121 register unsignedlong _B_bb = (b);122 inline mg_u_long bblock_decode(mg_u_long b, mg_u_long *count) { 123 register mg_u_long _B_x1, _B_xx = 0; 124 register mg_u_long _B_bb = (b); 122 125 register int _B_xdivb; 123 126 … … 131 134 } 132 135 133 inline void bblock_encode( unsigned long x, unsigned long b, unsignedlong *count) {134 register unsignedlong _B_xx = (x);135 register unsignedlong _B_bb = (b);136 inline void bblock_encode(mg_u_long x, mg_u_long b, mg_u_long *count) { 137 register mg_u_long _B_xx = (x); 138 register mg_u_long _B_bb = (b); 136 139 register int _B_xdivb = 0; 137 check_positive( "bblock", _B_xx);140 check_positive((char*)"bblock", _B_xx); 138 141 --_B_xx; 139 142 while (_B_xx >= _B_bb) { … … 145 148 } 146 149 147 inline unsigned long elias_decode(unsigned long b, double s, unsignedlong *count) {148 register unsignedlong _B_xx;149 register unsignedlong _B_b = b;150 inline mg_u_long elias_decode(mg_u_long b, double s, mg_u_long *count) { 151 register mg_u_long _B_xx; 152 register mg_u_long _B_b = b; 150 153 register double _B_s = s; 151 154 register int _B_lower=1, _B_upper=1; … … 162 165 _B_xx = this->binary_decode(_B_upper-_B_lower+1, count); 163 166 --_B_xx; 164 check_positive( "gamma", _B_xx+_B_lower);167 check_positive((char*)"gamma", _B_xx+_B_lower); 165 168 return _B_xx+_B_lower; 166 169 } 167 170 168 inline void elias_encode( unsigned long x, unsigned long b, double s, unsignedlong *count) {169 register unsignedlong _B_xx = x;170 register unsignedlong _B_b = b;171 inline void elias_encode(mg_u_long x, mg_u_long b, double s, mg_u_long *count) { 172 register mg_u_long _B_xx = x; 173 register mg_u_long _B_b = b; 171 174 register double _B_s = s; 172 175 register int _B_lower=1, _B_upper=1; … … 174 177 register double _B_pow=1.0; 175 178 176 check_positive( "elias", _B_xx);179 check_positive((char*)"elias", _B_xx); 177 180 178 181 while ((int)_B_xx>_B_upper) { … … 186 189 } 187 190 188 inline unsigned long gamma_decode(unsignedlong *count) {189 register unsignedlong _B_xx = 1;191 inline mg_u_long gamma_decode(mg_u_long *count) { 192 register mg_u_long _B_xx = 1; 190 193 register int _B_nbits = 0; 191 194 … … 199 202 } 200 203 201 inline void gamma_encode( unsigned long x, unsignedlong *count) {202 register unsignedlong _B_xx = x;204 inline void gamma_encode(mg_u_long x, mg_u_long *count) { 205 register mg_u_long _B_xx = x; 203 206 register int _B_logofb; 204 207 register int _B_nbits; 205 208 206 check_positive( "gamma", _B_xx);209 check_positive((char*)"gamma", _B_xx); 207 210 _B_logofb = floor_log2(_B_xx); 208 211 _B_nbits = _B_logofb+1; … … 215 218 } 216 219 217 inline unsigned long delta_decode(unsignedlong *count) {218 register unsignedlong _B_xxx;220 inline mg_u_long delta_decode(mg_u_long *count) { 221 register mg_u_long _B_xxx; 219 222 register int _B_logx; 220 223 _B_logx = gamma_decode(count); … … 225 228 } 226 229 227 inline void delta_encode( unsigned long x, unsignedlong *count) {228 register unsignedlong _B_xxx = x;230 inline void delta_encode(mg_u_long x, mg_u_long *count) { 231 register mg_u_long _B_xxx = x; 229 232 register int _B_logx; 230 233 _B_logx = floor_log2(_B_xxx); … … 233 236 } 234 237 235 inline unsigned long huff_decode(unsigned long *mcodes, unsignedlong **values,236 unsignedlong *count = NULL) {237 register unsignedlong *__min_code = mcodes;238 register unsignedlong *__mclen = mcodes;239 register unsignedlong **__values = values;240 register unsignedlong __code = 0;238 inline mg_u_long huff_decode(mg_u_long *mcodes, mg_u_long **values, 239 mg_u_long *count = NULL) { 240 register mg_u_long *__min_code = mcodes; 241 register mg_u_long *__mclen = mcodes; 242 register mg_u_long **__values = values; 243 register mg_u_long __code = 0; 241 244 do { 242 245 __code += __code + bit(); … … 247 250 } 248 251 249 inline void huff_encode( unsigned long x, unsignedlong *codes, char *lens,250 unsignedlong *count = NULL) {252 inline void huff_encode(mg_u_long x, mg_u_long *codes, char *lens, 253 mg_u_long *count = NULL) { 251 254 register int __i; 252 255 register int __clen = lens[x]; 253 register unsignedlong __code = codes[x];256 register mg_u_long __code = codes[x]; 254 257 for (__i=__clen-1; __i>=0; --__i) { 255 258 encodeBit((__code >> __i) & 1); … … 260 263 } 261 264 262 static inline unsigned long unary_length(unsignedlong x) {263 check_positive( "unary", x);265 static inline mg_u_long unary_length(mg_u_long x) { 266 check_positive((char*)"unary", x); 264 267 return x; 265 268 } 266 269 267 static inline int binary_length( unsigned long x, unsignedlong b) {268 register unsignedlong _B_x = (x);269 register unsignedlong _B_b = (b);270 static inline int binary_length(mg_u_long x, mg_u_long b) { 271 register mg_u_long _B_x = (x); 272 register mg_u_long _B_b = (b); 270 273 register int _B_nbits, _B_logofb, _B_thresh; 271 274 272 check_positive( "binary", _B_x);275 check_positive((char*)"binary", _B_x); 273 276 _B_logofb = ceil_log2(_B_b); 274 277 _B_thresh = (1<<_B_logofb) - _B_b; … … 278 281 } 279 282 280 static inline unsigned long bblock_length(unsigned long x, unsignedlong b) {281 register unsignedlong _B_bcount, count, _B_xx = (x);282 register unsignedlong _B_bb = (b);283 static inline mg_u_long bblock_length(mg_u_long x, mg_u_long b) { 284 register mg_u_long _B_bcount, count, _B_xx = (x); 285 register mg_u_long _B_bb = (b); 283 286 register int _B_xdivb = 0; 284 287 285 check_positive( "bblock", _B_xx);288 check_positive((char*)"bblock", _B_xx); 286 289 --_B_xx; 287 290 while (_B_xx >= _B_bb) { … … 295 298 } 296 299 297 static inline unsigned long elias_length(unsigned long x, unsignedlong b,300 static inline mg_u_long elias_length(mg_u_long x, mg_u_long b, 298 301 double s) { 299 register unsignedlong _B_xx = x;300 register unsignedlong _B_b = b;302 register mg_u_long _B_xx = x; 303 register mg_u_long _B_b = b; 301 304 register double _B_s = s; 302 305 register int _B_lower=1, _B_upper=1; 303 306 register int _B_k=0, _B_ecount; 304 307 register double _B_pow=1.0; 305 register unsignedlong count;306 check_positive( "gamma", _B_xx);308 register mg_u_long count; 309 check_positive((char*)"gamma", _B_xx); 307 310 308 311 while ((int)(_B_xx)>_B_upper) { … … 318 321 } 319 322 320 static inline unsigned long gamma_length(unsignedlong x) {321 register unsignedlong _B_xx = x;323 static inline mg_u_long gamma_length(mg_u_long x) { 324 register mg_u_long _B_xx = x; 322 325 register int _B_logofb; 323 check_positive( "gamma", _B_xx);326 check_positive((char*)"gamma", _B_xx); 324 327 _B_logofb = floor_log2(_B_xx); 325 328 return _B_logofb*2+1; 326 329 } 327 330 328 static inline unsigned long delta_length(unsignedlong x) {329 register unsignedlong _B_xxx = x;331 static inline mg_u_long delta_length(mg_u_long x) { 332 register mg_u_long _B_xxx = x; 330 333 register int _B_logx, _B_dcount; 331 register unsignedlong count;334 register mg_u_long count; 332 335 _B_logx = floor_log2 (_B_xxx); 333 336 count = gamma_length(_B_logx+1); -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_m_mem.cpp
r16583 r25147 27 27 28 28 29 void mem_bitio_buffer::seek( unsignedlong toPos) {30 register long _newPos;29 void mem_bitio_buffer::seek(mg_u_long toPos) { 30 register mg_s_long _newPos; 31 31 do { 32 32 _newPos = toPos; … … 38 38 } 39 39 40 long mem_bitio_buffer::addff(long b) {40 mg_s_long mem_bitio_buffer::addff(mg_s_long b) { 41 41 do { 42 42 if (btg == 0) { … … 55 55 } 56 56 57 long mem_bitio_buffer::add00(long b) {57 mg_s_long mem_bitio_buffer::add00(mg_s_long b) { 58 58 do { 59 59 if (btg == 0) { -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_m_mem.h
r16583 r25147 35 35 36 36 #include "bitio_m_abstract.h" 37 #include "mglong.h" 37 38 38 39 … … 48 49 mem_bitio_buffer (); 49 50 mem_bitio_buffer (unsigned char *buffer, int size); 50 void seek ( unsignedlong topos);51 void seek (mg_u_long topos); 51 52 void error (); 52 long add00 (long b);53 long addff (long b);53 mg_s_long add00 (mg_s_long b); 54 mg_s_long addff (mg_s_long b); 54 55 int bit (); 55 56 void done (); -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_m_mems.cpp
r16583 r25147 12 12 } 13 13 14 mems_bitio_buffer::mems_bitio_buffer(unsigned char *readbuffer, long _pos)14 mems_bitio_buffer::mems_bitio_buffer(unsigned char *readbuffer, mg_s_long _pos) 15 15 { 16 16 base = readbuffer; … … 31 31 32 32 33 void mems_bitio_buffer::seek( unsignedlong toPos)33 void mems_bitio_buffer::seek(mg_u_long toPos) 34 34 { 35 35 pos = toPos; 36 36 } 37 37 38 unsignedlong mems_bitio_buffer::position()38 mg_u_long mems_bitio_buffer::position() 39 39 { 40 40 return pos; 41 41 } 42 42 43 long mems_bitio_buffer::addff(long b)43 mg_s_long mems_bitio_buffer::addff(mg_s_long b) 44 44 { 45 45 do … … 53 53 } 54 54 55 long mems_bitio_buffer::add00(long b)55 mg_s_long mems_bitio_buffer::add00(mg_s_long b) 56 56 { 57 57 return addff(b); -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_m_mems.h
r16583 r25147 34 34 35 35 #include "bitio_m_abstract.h" 36 36 #include "mglong.h" 37 37 38 38 class mems_bitio_buffer : public bitio_buffer { 39 39 protected: 40 40 unsigned char *base; 41 unsignedlong pos;41 mg_u_long pos; 42 42 43 43 public: 44 44 mems_bitio_buffer(); 45 mems_bitio_buffer(unsigned char *readbuffer, long _pos);46 void seek( unsignedlong topos);45 mems_bitio_buffer(unsigned char *readbuffer, mg_s_long _pos); 46 void seek(mg_u_long topos); 47 47 void error(); 48 long add00(long b);49 long addff(long b);48 mg_s_long add00(mg_s_long b); 49 mg_s_long addff(mg_s_long b); 50 50 int bit(); 51 51 // int bitOffset(); 52 52 void done(); 53 53 54 unsignedlong position();54 mg_u_long position(); 55 55 56 56 void encodeStart(); -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_m_random.cpp
r16583 r25147 9 9 #include "bitio_m_random.h" 10 10 11 random_bitio_buffer::random_bitio_buffer(FILE *f, unsignedlong length)11 random_bitio_buffer::random_bitio_buffer(FILE *f, mg_u_long length) 12 12 { 13 13 buffer = NULL; … … 19 19 } 20 20 21 void random_bitio_buffer::attachFile (FILE *f, unsignedlong length) {21 void random_bitio_buffer::attachFile (FILE *f, mg_u_long length) { 22 22 // delete the old buffer 23 23 if (buffer != NULL) { … … 47 47 if (file != NULL) { 48 48 fseek(file, 0, 0); 49 fread(buffer, 1, len, file); 49 size_t numbytes = fread(buffer, 1, len, file); 50 51 if (len != numbytes){ 52 #ifdef DEBUG 53 fprintf(stderr, "[mgpp/lib/bitio_m_random.cpp L52] number of bytes read by fread does not match the requested amount\n"); 54 #endif 55 } 50 56 } 51 57 } … … 88 94 base += len; 89 95 fseek(file, base, 0); 90 fread(buffer, 1, len, file); 96 size_t numbytes = fread(buffer, 1, len, file); 97 if (numbytes != len) 98 { 99 #ifdef DEBUG 100 fprintf(stderr, "[mgpp/lib/bitio_m_random.cpp L97] number of bytes read by fread does not match the requested amount\n"); 101 #endif 102 } 91 103 pos = 0; 92 104 used = 0; … … 136 148 } 137 149 138 unsignedlong random_bitio_buffer::tell()150 mg_u_long random_bitio_buffer::tell() 139 151 { 140 152 return ((base << 3) + pos); 141 153 } 142 154 143 void random_bitio_buffer::seek( unsignedlong toPos)155 void random_bitio_buffer::seek(mg_u_long toPos) 144 156 { 145 157 if (((toPos >> 3) >= base) && (((toPos+7) >> 3) < (base + len))) … … 153 165 base = (toPos >> (shift + 3)) << shift; 154 166 fseek(file, base, 0); 155 fread(buffer, 1, len, file); 167 size_t numbytes = fread(buffer, 1, len, file); 168 if (numbytes != len) 169 { 170 #ifdef DEBUG 171 fprintf(stderr, "[mgpp/lib/bitio_m_random.cpp L166] number of bytes read by fread does not match the requested amount\n"); 172 #endif 173 } 156 174 pos = toPos & 0x07; 157 175 pos = toPos & ((8 << shift) - 1); … … 171 189 } 172 190 173 long random_bitio_buffer::addff(long b)191 mg_s_long random_bitio_buffer::addff(mg_s_long b) 174 192 { 175 193 return b + b + bit(); 176 194 } 177 195 178 long random_bitio_buffer::add00(long b)196 mg_s_long random_bitio_buffer::add00(mg_s_long b) 179 197 { 180 198 return addff(b); … … 198 216 (((toPos + 7) >> 3) < (mg_ullong) (base + len))) 199 217 { 200 pos = ( long) (toPos - (mg_ullong) (base << 3));218 pos = (mg_s_long) (toPos - (mg_ullong) (base << 3)); 201 219 } 202 220 else 203 221 { 204 222 flush(); 205 base = (long) ((toPos >> (shift + 3)) << shift); 206 207 fseek(file, base, 0); 208 fread(buffer, 1, len, file); 209 pos = (long) (toPos & ((8 << shift) - 1)); 223 base = (mg_s_long) ((toPos >> (shift + 3)) << shift); 224 225 fseek(file, base, 0); 226 size_t numbytes = fread(buffer, 1, len, file); 227 if (numbytes != len) 228 { 229 #ifdef DEBUG 230 fprintf(stderr, "[mgpp/lib/bitio_m_random.cpp L223] number of bytes read by fread does not match the requested amount\n"); 231 #endif 232 } 233 pos = (mg_s_long) (toPos & ((8 << shift) - 1)); 210 234 } 211 235 } -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_m_random.h
r16583 r25147 42 42 FILE *file; 43 43 unsigned char *buffer; 44 unsignedlong base;45 unsignedlong used;46 unsignedlong pos;47 unsignedlong len;48 unsignedlong shift;44 mg_u_long base; 45 mg_u_long used; 46 mg_u_long pos; 47 mg_u_long len; 48 mg_u_long shift; 49 49 void writeRead(); 50 50 51 51 random_bitio_buffer(FILE *f = 0, 52 unsignedlong length = 8*1024);52 mg_u_long length = 8*1024); 53 53 virtual ~random_bitio_buffer(); 54 54 55 void attachFile (FILE *f, unsignedlong length);55 void attachFile (FILE *f, mg_u_long length); 56 56 57 57 random_bitio_buffer &operator= (const random_bitio_buffer &_rbb); … … 60 60 void encodeBit(int b); 61 61 void flush(); 62 unsignedlong tell();62 mg_u_long tell(); 63 63 64 void seek( unsignedlong topos);64 void seek(mg_u_long topos); 65 65 void error(); 66 long add00(long b);67 long addff(long b);66 mg_s_long add00(mg_s_long b); 67 mg_s_long addff(mg_s_long b); 68 68 int bit(); 69 69 int bitOffset(); -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_m_stdio.cpp
r16583 r25147 24 24 } 25 25 26 void stdio_bitio_buffer::seek ( unsignedlong byte, unsigned char bit) {26 void stdio_bitio_buffer::seek (mg_u_long byte, unsigned char bit) { 27 27 if (fseek (file, byte, SEEK_SET) != 0) return; 28 28 buffer = getc(file); … … 31 31 } 32 32 33 void stdio_bitio_buffer::seek( unsignedlong topos) {33 void stdio_bitio_buffer::seek(mg_u_long topos) { 34 34 if (fseek(file, topos >> 3, SEEK_SET) != 0) return; 35 35 buffer = getc(file); … … 38 38 } 39 39 40 long stdio_bitio_buffer::addff(long b)40 mg_s_long stdio_bitio_buffer::addff(mg_s_long b) 41 41 { 42 42 if (!btg) … … 59 59 } 60 60 61 long stdio_bitio_buffer::add00(long b)61 mg_s_long stdio_bitio_buffer::add00(mg_s_long b) 62 62 { 63 63 if (!btg) -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_m_stdio.h
r16583 r25147 33 33 34 34 #include "bitio_m_abstract.h" 35 35 #include "mglong.h" 36 36 37 37 class stdio_bitio_buffer : public bitio_buffer { … … 40 40 unsigned char buffer; 41 41 unsigned char btg; 42 unsignedlong bytesWritten;42 mg_u_long bytesWritten; 43 43 44 44 public: … … 48 48 49 49 unsigned char GetBtg () { return btg; } 50 unsignedlong GetBytesWritten () { return bytesWritten; }50 mg_u_long GetBytesWritten () { return bytesWritten; } 51 51 52 void seek ( unsignedlong byte, unsigned char bit);53 void seek ( unsignedlong topos);52 void seek (mg_u_long byte, unsigned char bit); 53 void seek (mg_u_long topos); 54 54 void error(); 55 long add00(long b);56 long addff(long b);55 mg_s_long add00(mg_s_long b); 56 mg_s_long addff(mg_s_long b); 57 57 int bit(); 58 58 int bitOffset() { return btg; } -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/gmalloc.c
r16583 r25147 401 401 { 402 402 __ptr_t result; 403 unsigned long intadj;403 mg_u_long adj; 404 404 405 405 result = (*__morecore) (size); 406 adj = ( unsigned long int) ((unsigned long int) ((char *) result -406 adj = (mg_u_long) ((mg_u_long) ((char *) result - 407 407 (char *) NULL)) % BLOCKSIZE; 408 408 if (adj != 0) … … 549 549 block = BLOCK (result); 550 550 if (--_heapinfo[block].busy.info.frag.nfree != 0) 551 _heapinfo[block].busy.info.frag.first = ( unsigned long int)552 (( unsigned long int) ((char *) next->next - (char *) NULL)551 _heapinfo[block].busy.info.frag.first = (mg_u_long) 552 ((mg_u_long) ((char *) next->next - (char *) NULL) 553 553 % BLOCKSIZE) >> log; 554 554 … … 872 872 prev = (struct list *) ptr; 873 873 _heapinfo[block].busy.info.frag.nfree = 1; 874 _heapinfo[block].busy.info.frag.first = ( unsigned long int)875 (( unsigned long int) ((char *) ptr - (char *) NULL)874 _heapinfo[block].busy.info.frag.first = (mg_u_long) 875 ((mg_u_long) ((char *) ptr - (char *) NULL) 876 876 % BLOCKSIZE >> type); 877 877 prev->next = _fraghead[type].next; … … 1284 1284 { 1285 1285 __ptr_t result; 1286 unsigned long intadj;1286 mg_u_long adj; 1287 1287 1288 1288 size = ((size + alignment - 1) / alignment) * alignment; … … 1291 1291 if (result == NULL) 1292 1292 return NULL; 1293 adj = ( unsigned long int) ((unsigned long int) ((char *) result -1293 adj = (mg_u_long) ((mg_u_long) ((char *) result - 1294 1294 (char *) NULL)) % alignment; 1295 1295 if (adj != 0) -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/huffman.cpp
r16583 r25147 30 30 */ 31 31 huff_data * 32 Generate_Huffman_Data (int num, long *freqs, huff_data * data,33 u_long * mem)32 Generate_Huffman_Data (int num, mg_s_long *freqs, huff_data * data, 33 mg_u_long * mem) 34 34 { 35 35 int HNum, i, count; 36 unsignedlong *heap;36 mg_u_long *heap; 37 37 huff_data *hd = data; 38 38 if (!hd) … … 41 41 goto error0; 42 42 } 43 if (!(heap = new unsignedlong[num * 2]))43 if (!(heap = new mg_u_long[num * 2])) 44 44 goto error1; 45 45 if (!(hd->clens = new char[num])) … … 73 73 if (heap[heap[curr - 1]] > heap[heap[child - 1]]) 74 74 { 75 register u_long temp;75 register mg_u_long temp; 76 76 temp = heap[child - 1]; 77 77 heap[child - 1] = heap[curr - 1]; … … 141 141 142 142 /* Calculate the code lens */ 143 heap[0] = -1 UL;143 heap[0] = -1; 144 144 heap[1] = 0; 145 145 for (i = 2; i < num * 2; ++i) … … 154 154 for (i = 0; i < num; ++i) 155 155 { 156 register u_long codelen = heap[i + num];156 register mg_u_long codelen = heap[i + num]; 157 157 hd->clens[i] = (char) codelen; 158 158 if (!codelen) … … 190 190 } 191 191 192 unsignedlong *193 Generate_Huffman_Codes (huff_data * data, u_long * mem)192 mg_u_long * 193 Generate_Huffman_Codes (huff_data * data, mg_u_long * mem) 194 194 { 195 195 int i; 196 unsignedlong *codes;197 unsignedlong mc[MAX_HUFFCODE_LEN + 1];196 mg_u_long *codes; 197 mg_u_long mc[MAX_HUFFCODE_LEN + 1]; 198 198 199 199 if (!data) 200 200 return (NULL); 201 if (!(codes = new unsignedlong[data->num_codes]))201 if (!(codes = new mg_u_long[data->num_codes])) 202 202 return (NULL); 203 203 if (mem) … … 212 212 213 213 214 unsignedlong **215 Generate_Huffman_Vals (huff_data * data, u_long * mem)214 mg_u_long ** 215 Generate_Huffman_Vals (huff_data * data, mg_u_long * mem) 216 216 { 217 217 int i; 218 unsignedlong *fcode[MAX_HUFFCODE_LEN + 1];219 unsignedlong **values;220 unsignedlong *vals;218 mg_u_long *fcode[MAX_HUFFCODE_LEN + 1]; 219 mg_u_long **values; 220 mg_u_long *vals; 221 221 222 222 if (!data) 223 223 return (NULL); 224 if (!(vals = new unsignedlong[data->num_codes]))224 if (!(vals = new mg_u_long[data->num_codes])) 225 225 return (NULL); 226 if (!(values = new unsignedlong *[MAX_HUFFCODE_LEN + 1]))226 if (!(values = new mg_u_long *[MAX_HUFFCODE_LEN + 1])) 227 227 { 228 228 delete []vals; … … 230 230 } 231 231 232 memset (values, '\0', (MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *));232 memset (values, '\0', (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *)); 233 233 234 234 if (mem) 235 235 *mem += data->num_codes * sizeof (*vals) + 236 (MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *);236 (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *); 237 237 238 238 fcode[0] = values[0] = &vals[0]; … … 249 249 250 250 double 251 Calculate_Huffman_Size (int num, long *freqs,long *counts)251 Calculate_Huffman_Size (int num, mg_s_long *freqs, mg_s_long *counts) 252 252 { 253 253 double size = 0; … … 318 318 319 319 320 int Read_Huffman_Data (FILE * f, huff_data * hd, u_long * mem,u_long * disk) {320 int Read_Huffman_Data (FILE * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk) { 321 321 if (fread (&hd->num_codes, sizeof (hd->num_codes), 1, f) != 1) 322 322 return -1; -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/huffman.h
r16583 r25147 35 35 int maxcodelen; 36 36 int lencount[MAX_HUFFCODE_LEN + 1]; 37 unsignedlong min_code[MAX_HUFFCODE_LEN + 1];37 mg_u_long min_code[MAX_HUFFCODE_LEN + 1]; 38 38 char *clens; 39 39 }; 40 40 41 41 42 huff_data *Generate_Huffman_Data (int num, long *freqs, huff_data * data,43 u_long * mem);42 huff_data *Generate_Huffman_Data (int num, mg_s_long *freqs, huff_data * data, 43 mg_u_long * mem); 44 44 45 unsigned long *Generate_Huffman_Codes (huff_data * data,u_long * mem);45 mg_u_long *Generate_Huffman_Codes (huff_data * data, mg_u_long * mem); 46 46 47 unsigned long **Generate_Huffman_Vals (huff_data * data,u_long * mem);47 mg_u_long **Generate_Huffman_Vals (huff_data * data, mg_u_long * mem); 48 48 49 49 int Write_Huffman_Data (FILE * f, huff_data * hd); 50 50 51 int Read_Huffman_Data (FILE * f, huff_data * hd, u_long * mem,u_long * disk);51 int Read_Huffman_Data (FILE * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk); 52 52 53 53 /* Calculate the number of bits required to code the data with the 54 54 specified frequencies. Normally freqs and counts should point to 55 55 the same array. */ 56 double Calculate_Huffman_Size (int num, long *freqs,long *counts);56 double Calculate_Huffman_Size (int num, mg_s_long *freqs, mg_s_long *counts); 57 57 58 58 -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/local_strings.cpp
r16583 r25147 52 52 char *str_ptr = str; 53 53 char ch = '\0'; 54 long scale = 1;54 mg_s_long scale = 1; 55 55 56 56 /* find any scale letter immediately after digits */ -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/local_strings.h
r16583 r25147 54 54 copy = fgetc(dict); 55 55 suff = fgetc(dict); 56 fread(data + copy + 1, sizeof(u_char), suff, dict); 56 size_t numbytes = fread(data + copy + 1, sizeof(u_char), suff, dict); 57 if(numbytes != suff) 58 { 59 #ifdef DEBUG 60 fprintf(stderr, "[mgpp/lib/local_strings.h L59] number of bytes read by fread does not match the requested amount\n"); 61 #endif 62 } 57 63 *data = copy + suff; 58 64 } -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/longlong.h
r16583 r25147 74 74 #else 75 75 76 #include <stdint.h> 76 77 /* Not using GCC, so fall back on plain "long" (32-bit) types */ 77 typedef u nsigned long int mg_ullong;78 typedef long int mg_llong;78 typedef uint32_t mg_ullong; 79 typedef int32_t mg_llong; 79 80 80 81 #define ULL_FS "lu" -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/lovinstem.cpp
r16583 r25147 497 497 static Recode_Rules Rules[] = 498 498 { 499 "uad", "uas", 2, NULL, 0,500 "vad", "vas", 2, NULL, 0,501 "cid", "cis", 2, NULL, 0,502 "lid", "lis", 2, NULL, 0,503 "erid", "eris", 3, NULL, 0,504 "pand", "pans", 3, NULL, 0,505 "end", "ens", 2, s, 0,506 "end", "ens", 2, m, 0,507 "ond", "ons", 2, NULL, 0,508 "lud", "lus", 2, NULL, 0,509 "rud", "rus", 2, NULL, 1,510 511 "ul", "l", 1, aio, 1,512 513 "istr", "ister", 3, NULL, 0,514 "metr", "meter", 3, NULL, 0,515 "her", "hes", 2, pt, 1,516 517 "urs", "ur", 2, NULL, 1,518 519 "uct", "uc", 2, NULL, 0,520 "umpt", "um", 3, NULL, 0,521 "rpt", "rb", 2, NULL, 0,522 "mit", "mis", 2, NULL, 0,523 "ert", "ers", 2, NULL, 0,524 "et", "es", 1, n, 0,525 "yt", "ys", 1, NULL, 1,526 527 "iev", "ief", 2, NULL, 0,528 "olv", "olut", 2, NULL, 1,529 530 "bex", "bic", 2, NULL, 0,531 "dex", "dic", 2, NULL, 0,532 "pex", "pic", 2, NULL, 0,533 "tex", "tic", 2, NULL, 0,534 "ax", "ac", 1, NULL, 0,535 "ex", "ec", 1, NULL, 0,536 "ix", "ic", 1, NULL, 0,537 "lux", "luc", 2, NULL, 1,538 539 "yz", "ys", 1, NULL, 1499 {(char*)"uad", (char*)"uas", 2, NULL, 0}, 500 {(char*)"vad", (char*)"vas", 2, NULL, 0}, 501 {(char*)"cid", (char*)"cis", 2, NULL, 0}, 502 {(char*)"lid", (char*)"lis", 2, NULL, 0}, 503 {(char*)"erid", (char*)"eris", 3, NULL, 0}, 504 {(char*)"pand", (char*)"pans", 3, NULL, 0}, 505 {(char*)"end", (char*)"ens", 2, s, 0}, 506 {(char*)"end", (char*)"ens", 2, m, 0}, 507 {(char*)"ond", (char*)"ons", 2, NULL, 0}, 508 {(char*)"lud", (char*)"lus", 2, NULL, 0}, 509 {(char*)"rud", (char*)"rus", 2, NULL, 1}, 510 511 {(char*)"ul", (char*)"l", 1, aio, 1}, 512 513 {(char*)"istr", (char*)"ister", 3, NULL, 0}, 514 {(char*)"metr", (char*)"meter", 3, NULL, 0}, 515 {(char*)"her", (char*)"hes", 2, pt, 1}, 516 517 {(char*)"urs", (char*)"ur", 2, NULL, 1}, 518 519 {(char*)"uct", (char*)"uc", 2, NULL, 0}, 520 {(char*)"umpt", (char*)"um", 3, NULL, 0}, 521 {(char*)"rpt", (char*)"rb", 2, NULL, 0}, 522 {(char*)"mit", (char*)"mis", 2, NULL, 0}, 523 {(char*)"ert", (char*)"ers", 2, NULL, 0}, 524 {(char*)"et", (char*)"es", 1, n, 0}, 525 {(char*)"yt", (char*)"ys", 1, NULL, 1}, 526 527 {(char*)"iev", (char*)"ief", 2, NULL, 0}, 528 {(char*)"olv", (char*)"olut", 2, NULL, 1}, 529 530 {(char*)"bex", (char*)"bic", 2, NULL, 0}, 531 {(char*)"dex", (char*)"dic", 2, NULL, 0}, 532 {(char*)"pex", (char*)"pic", 2, NULL, 0}, 533 {(char*)"tex", (char*)"tic", 2, NULL, 0}, 534 {(char*)"ax", (char*)"ac", 1, NULL, 0}, 535 {(char*)"ex", (char*)"ec", 1, NULL, 0}, 536 {(char*)"ix", (char*)"ic", 1, NULL, 0}, 537 {(char*)"lux", (char*)"luc", 2, NULL, 1}, 538 539 {(char*)"yz", (char*)"ys", 1, NULL, 1} 540 540 }; 541 541 … … 560 560 static Last_Char_Node pr[] = 561 561 { 562 'd', NULL, NULL, Rules,563 'l', pr, pr + 2, Rules + 11,564 'r', NULL, NULL, Rules + 12,565 's', pr + 1, pr + 6, Rules + 15,566 't', NULL, pr + 5, Rules + 16,567 'v', NULL, NULL, Rules + 23,568 'x', pr + 4, pr + 7, Rules + 25,569 'z', NULL, NULL, Rules + 33,562 {'d', NULL, NULL, Rules}, 563 {'l', pr, pr + 2, Rules + 11}, 564 {'r', NULL, NULL, Rules + 12}, 565 {'s', pr + 1, pr + 6, Rules + 15}, 566 {'t', NULL, pr + 5, Rules + 16}, 567 {'v', NULL, NULL, Rules + 23}, 568 {'x', pr + 4, pr + 7, Rules + 25}, 569 {'z', NULL, NULL, Rules + 33}, 570 570 }; 571 571 … … 655 655 static Ending_List List[] = 656 656 { 657 "a", NULL, 0, 0,658 659 "ae", NULL, 0, 0,660 "al", BB, -1, 2,661 "ar", X, 0, 0,662 "as", B, -1, 0,663 664 "acy", NULL, 0, 1,665 "age", B, 0, 0,666 "aic", NULL, -2, 1,667 "als", BB, 0, 0,668 "ant", B, -2, 2,669 "ars", O, 0, 0,670 "ary", F, -1, 2,671 "ata", NULL, 0, 0,672 "ate", NULL, -1, 0,673 674 "able", NULL, 0, 1,675 "ably", NULL, 0, 0,676 "ages", B, -2, 2,677 "ally", B, 0, 0,678 "ance", B, -1, 1,679 "ancy", B, 0, 0,680 "ants", B, -4, 4,681 "aric", NULL, 0, 0,682 "arly", K, -1, 1,683 "ated", I, 0, 0,684 "ates", NULL, -2, 2,685 "atic", B, 0, 0,686 "ator", NULL, -1, 0,687 688 "acies", NULL, 0, 0,689 "acity", NULL, -1, 1,690 "aging", B, 0, 0,691 "aical", NULL, -2, 2,692 "alist", NULL, 0, 0,693 "alism", B, -1, 0,694 "ality", NULL, -3, 3,695 "alize", NULL, 0, 1,696 "allic", BB, 0, 0,697 "anced", B, -2, 2,698 "ances", B, 0, 0,699 "antic", C, -1, 0,700 "arial", NULL, -6, 6,701 "aries", NULL, 0, 1,702 "arily", NULL, 0, 0,703 "arity", B, -2, 2,704 "arize", NULL, 0, 0,705 "aroid", NULL, -1, 0,706 "ately", NULL, -3, 3,707 "ating", I, 0, 1,708 "ation", B, 0, 0,709 "ative", NULL, -2, 2,710 "ators", NULL, 0, 0,711 "atory", NULL, -1, 1,712 "ature", E, 0, 0,713 714 "aceous", NULL, 0, 1,715 "acious", B, 0, 0,716 "action", G, -2, 2,717 "alness", NULL, 0, 0,718 "ancial", NULL, -1, 1,719 "ancies", NULL, 0, 0,720 "ancing", B, -4, 4,721 "ariser", NULL, 0, 0,722 "arized", NULL, -1, 1,723 "arizer", NULL, 0, 0,724 "atable", NULL, -2, 2,725 "ations", B, 0, 0,726 "atives", NULL, -1, 0,727 728 "ability", NULL, 0, 1,729 "aically", NULL, 0, 0,730 "alistic", B, -2, 2,731 "alities", NULL, 0, 0,732 "ariness", E, -1, 0,733 "aristic", NULL, -3, 3,734 "arizing", NULL, 0, 1,735 "ateness", NULL, 0, 0,736 "atingly", NULL, -2, 2,737 "ational", B, 0, 0,738 "atively", NULL, -1, 1,739 "ativism", NULL, 0, 0,740 741 "ableness", NULL, 0, 1,742 "arizable", NULL, 0, 0,743 744 "allically", C, 0, 0,745 "antaneous", NULL, -1, 1,746 "antiality", NULL, 0, 0,747 "arisation", NULL, -2, 2,748 "arization", NULL, 0, 0,749 "ationally", B, -1, 1,750 "ativeness", NULL, 0, 0,751 752 "antialness", NULL, 0, 0,753 "arisations", NULL, -1, 1,754 "arizations", NULL, 0, 0,755 756 "alistically", B, 0, 1,757 "arizability", NULL, 0, 0,758 759 "e", NULL, 0, 0,760 761 "ed", E, 0, 0,762 "en", F, -1, 1,763 "es", E, 0, 0,764 765 "eal", Y, 0, 0,766 "ear", Y, -1, 1,767 "ely", E, 0, 0,768 "ene", E, -2, 2,769 "ent", C, 0, 0,770 "ery", E, -1, 1,771 "ese", NULL, 0, 0,772 773 "ealy", Y, 0, 1,774 "edly", E, 0, 0,775 "eful", NULL, -2, 1,776 "eity", NULL, 0, 0,777 "ence", NULL, -2, 2,778 "ency", NULL, 0, 0,779 "ened", E, -1, 2,780 "enly", E, 0, 0,781 "eous", NULL, -1, 0,782 783 "early", Y, 0, 1,784 "ehood", NULL, 0, 0,785 "eless", NULL, -2, 2,786 "elity", NULL, 0, 0,787 "ement", NULL, -1, 0,788 "enced", NULL, -3, 3,789 "ences", NULL, 0, 1,790 "eness", E, 0, 0,791 "ening", E, -2, 2,792 "ental", NULL, 0, 0,793 "ented", C, -1, 1,794 "ently", NULL, 0, 0,795 796 "eature", Z, 0, 0,797 "efully", NULL, -1, 1,798 "encies", NULL, 0, 0,799 "encing", NULL, -2, 2,800 "ential", NULL, 0, 0,801 "enting", C, -1, 1,802 "entist", NULL, 0, 1,803 "eously", NULL, 0, 0,804 805 "elihood", E, 0, 1,806 "encible", NULL, 0, 0,807 "entally", NULL, -2, 2,808 "entials", NULL, 0, 0,809 "entiate", NULL, -1, 1,810 "entness", NULL, 0, 0,811 812 "entation", NULL, 0, 0,813 "entially", NULL, -1, 1,814 "eousness", NULL, 0, 0,815 816 "eableness", E, 0, 1,817 "entations", NULL, 0, 0,818 "entiality", NULL, -2, 2,819 "entialize", NULL, 0, 0,820 "entiation", NULL, -1, 0,821 822 "entialness", NULL, 0, 0,823 824 "ful", NULL, 0, 0,825 826 "fully", NULL, 0, 0,827 828 "fulness", NULL, 0, 0,829 830 "hood", NULL, 0, 0,831 832 "i", NULL, 0, 0,833 834 "ia", NULL, 0, 0,835 "ic", NULL, -1, 1,836 "is", NULL, 0, 0,837 838 "ial", NULL, 0, 0,839 "ian", NULL, -1, 1,840 "ics", NULL, 0, 1,841 "ide", L, 0, 0,842 "ied", NULL, -3, 3,843 "ier", NULL, 0, 0,844 "ies", P, -1, 0,845 "ily", NULL, -1, 1,846 "ine", M, 0, 0,847 "ing", N, -5, 5,848 "ion", Q, 0, 0,849 "ish", C, -1, 1,850 "ism", B, 0, 1,851 "ist", NULL, 0, 0,852 "ite", AA, -3, 3,853 "ity", NULL, 0, 0,854 "ium", NULL, -1, 0,855 "ive", NULL, -1, 1,856 "ize", F, 0, 0,857 858 "ials", NULL, 0, 0,859 "ians", NULL, -1, 0,860 "ible", NULL, -1, 1,861 "ibly", NULL, 0, 0,862 "ical", NULL, -2, 2,863 "ides", L, 0, 0,864 "iers", NULL, -1, 1,865 "iful", NULL, 0, 0,866 "ines", M, -4, 4,867 "ings", N, 0, 0,868 "ions", B, -1, 1,869 "ious", NULL, 0, 0,870 "isms", B, -2, 2,871 "ists", NULL, 0, 0,872 "itic", H, -1, 1,873 "ized", F, 0, 1,874 "izer", F, 0, 0,875 876 "ially", NULL, 0, 0,877 "icant", NULL, -1, 1,878 "ician", NULL, 0, 0,879 "icide", NULL, -2, 2,880 "icism", NULL, 0, 0,881 "icist", NULL, -1, 0,882 "icity", NULL, -3, 3,883 "idine", I, 0, 1,884 "iedly", NULL, 0, 0,885 "ihood", NULL, -2, 2,886 "inate", NULL, 0, 0,887 "iness", NULL, -1, 0,888 "ingly", B, -6, 6,889 "inism", J, 0, 1,890 "inity", CC, 0, 0,891 "ional", NULL, -2, 2,892 "ioned", NULL, 0, 0,893 "ished", NULL, -1, 0,894 "istic", NULL, -3, 3,895 "ities", NULL, 0, 1,896 "itous", NULL, 0, 0,897 "ively", NULL, -2, 2,898 "ivity", NULL, 0, 0,899 "izers", F, -1, 1,900 "izing", F, 0, 0,901 902 "ialist", NULL, 0, 0,903 "iality", NULL, -1, 1,904 "ialize", NULL, 0, 0,905 "ically", NULL, -2, 2,906 "icance", NULL, 0, 0,907 "icians", NULL, -1, 1,908 "icists", NULL, 0, 0,909 "ifully", NULL, -4, 4,910 "ionals", NULL, 0, 0,911 "ionate", D, -1, 1,912 "ioning", NULL, 0, 0,913 "ionist", NULL, -2, 2,914 "iously", NULL, 0, 0,915 "istics", NULL, -1, 1,916 "izable", E, 0, 0,917 918 "ibility", NULL, 0, 0,919 "icalism", NULL, -1, 1,920 "icalist", NULL, 0, 1,921 "icality", NULL, 0, 0,922 "icalize", NULL, -3, 3,923 "ication", G, 0, 0,924 "icianry", NULL, -1, 0,925 "ination", NULL, -1, 1,926 "ingness", NULL, 0, 0,927 "ionally", NULL, -5, 5,928 "isation", NULL, 0, 0,929 "ishness", NULL, -1, 1,930 "istical", NULL, 0, 1,931 "iteness", NULL, 0, 0,932 "iveness", NULL, -3, 3,933 "ivistic", NULL, 0, 0,934 "ivities", NULL, -1, 0,935 "ization", F, -1, 1,936 "izement", NULL, 0, 0,937 938 "ibleness", NULL, 0, 0,939 "icalness", NULL, -1, 1,940 "ionalism", NULL, 0, 0,941 "ionality", NULL, -2, 2,942 "ionalize", NULL, 0, 0,943 "iousness", NULL, -1, 1,944 "izations", NULL, 0, 0,945 946 "ionalness", NULL, 0, 1,947 "istically", NULL, 0, 0,948 "itousness", NULL, -2, 2,949 "izability", NULL, 0, 0,950 "izational", NULL, -1, 0,951 952 "izationally", B, 0, 0,953 954 "ly", B, 0, 0,955 956 "less", NULL, 0, 1,957 "lily", NULL, 0, 0,958 959 "lessly", NULL, 0, 0,960 961 "lessness", NULL, 0, 0,962 963 "ness", NULL, 0, 0,964 965 "nesses", NULL, 0, 0,966 967 "o", NULL, 0, 0,968 969 "on", S, 0, 1,970 "or", T, 0, 0,971 972 "oid", NULL, 0, 0,973 "one", R, -1, 1,974 "ous", NULL, 0, 0,975 976 "ogen", NULL, 0, 0,977 978 "oidal", NULL, 0, 0,979 "oides", NULL, -1, 2,980 "otide", NULL, 0, 0,981 "ously", NULL, -1, 0,982 983 "oidism", NULL, 0, 0,984 985 "oidally", NULL, 0, 1,986 "ousness", NULL, 0, 0,987 988 "s", W, 0, 0,989 990 "s'", NULL, 0, 0,991 992 "um", U, 0, 1,993 "us", V, 0, 0,994 995 "ward", NULL, 0, 1,996 "wise", NULL, 0, 0,997 998 "y", B, 0, 0,999 1000 "yl", R, 0, 0,1001 1002 "ying", B, 0, 1,1003 "yish", NULL, 0, 0,1004 1005 "'s", NULL, 0, 0,657 {(char*)"a", NULL, 0, 0}, 658 659 {(char*)"ae", NULL, 0, 0}, 660 {(char*)"al", BB, -1, 2}, 661 {(char*)"ar", X, 0, 0}, 662 {(char*)"as", B, -1, 0}, 663 664 {(char*)"acy", NULL, 0, 1}, 665 {(char*)"age", B, 0, 0}, 666 {(char*)"aic", NULL, -2, 1}, 667 {(char*)"als", BB, 0, 0}, 668 {(char*)"ant", B, -2, 2}, 669 {(char*)"ars", O, 0, 0}, 670 {(char*)"ary", F, -1, 2}, 671 {(char*)"ata", NULL, 0, 0}, 672 {(char*)"ate", NULL, -1, 0}, 673 674 {(char*)"able", NULL, 0, 1}, 675 {(char*)"ably", NULL, 0, 0}, 676 {(char*)"ages", B, -2, 2}, 677 {(char*)"ally", B, 0, 0}, 678 {(char*)"ance", B, -1, 1}, 679 {(char*)"ancy", B, 0, 0}, 680 {(char*)"ants", B, -4, 4}, 681 {(char*)"aric", NULL, 0, 0}, 682 {(char*)"arly", K, -1, 1}, 683 {(char*)"ated", I, 0, 0}, 684 {(char*)"ates", NULL, -2, 2}, 685 {(char*)"atic", B, 0, 0}, 686 {(char*)"ator", NULL, -1, 0}, 687 688 {(char*)"acies", NULL, 0, 0}, 689 {(char*)"acity", NULL, -1, 1}, 690 {(char*)"aging", B, 0, 0}, 691 {(char*)"aical", NULL, -2, 2}, 692 {(char*)"alist", NULL, 0, 0}, 693 {(char*)"alism", B, -1, 0}, 694 {(char*)"ality", NULL, -3, 3}, 695 {(char*)"alize", NULL, 0, 1}, 696 {(char*)"allic", BB, 0, 0}, 697 {(char*)"anced", B, -2, 2}, 698 {(char*)"ances", B, 0, 0}, 699 {(char*)"antic", C, -1, 0}, 700 {(char*)"arial", NULL, -6, 6}, 701 {(char*)"aries", NULL, 0, 1}, 702 {(char*)"arily", NULL, 0, 0}, 703 {(char*)"arity", B, -2, 2}, 704 {(char*)"arize", NULL, 0, 0}, 705 {(char*)"aroid", NULL, -1, 0}, 706 {(char*)"ately", NULL, -3, 3}, 707 {(char*)"ating", I, 0, 1}, 708 {(char*)"ation", B, 0, 0}, 709 {(char*)"ative", NULL, -2, 2}, 710 {(char*)"ators", NULL, 0, 0}, 711 {(char*)"atory", NULL, -1, 1}, 712 {(char*)"ature", E, 0, 0}, 713 714 {(char*)"aceous", NULL, 0, 1}, 715 {(char*)"acious", B, 0, 0}, 716 {(char*)"action", G, -2, 2}, 717 {(char*)"alness", NULL, 0, 0}, 718 {(char*)"ancial", NULL, -1, 1}, 719 {(char*)"ancies", NULL, 0, 0}, 720 {(char*)"ancing", B, -4, 4}, 721 {(char*)"ariser", NULL, 0, 0}, 722 {(char*)"arized", NULL, -1, 1}, 723 {(char*)"arizer", NULL, 0, 0}, 724 {(char*)"atable", NULL, -2, 2}, 725 {(char*)"ations", B, 0, 0}, 726 {(char*)"atives", NULL, -1, 0}, 727 728 {(char*)"ability", NULL, 0, 1}, 729 {(char*)"aically", NULL, 0, 0}, 730 {(char*)"alistic", B, -2, 2}, 731 {(char*)"alities", NULL, 0, 0}, 732 {(char*)"ariness", E, -1, 0}, 733 {(char*)"aristic", NULL, -3, 3}, 734 {(char*)"arizing", NULL, 0, 1}, 735 {(char*)"ateness", NULL, 0, 0}, 736 {(char*)"atingly", NULL, -2, 2}, 737 {(char*)"ational", B, 0, 0}, 738 {(char*)"atively", NULL, -1, 1}, 739 {(char*)"ativism", NULL, 0, 0}, 740 741 {(char*)"ableness", NULL, 0, 1}, 742 {(char*)"arizable", NULL, 0, 0}, 743 744 {(char*)"allically", C, 0, 0}, 745 {(char*)"antaneous", NULL, -1, 1}, 746 {(char*)"antiality", NULL, 0, 0}, 747 {(char*)"arisation", NULL, -2, 2}, 748 {(char*)"arization", NULL, 0, 0}, 749 {(char*)"ationally", B, -1, 1}, 750 {(char*)"ativeness", NULL, 0, 0}, 751 752 {(char*)"antialness", NULL, 0, 0}, 753 {(char*)"arisations", NULL, -1, 1}, 754 {(char*)"arizations", NULL, 0, 0}, 755 756 {(char*)"alistically", B, 0, 1}, 757 {(char*)"arizability", NULL, 0, 0}, 758 759 {(char*)"e", NULL, 0, 0}, 760 761 {(char*)"ed", E, 0, 0}, 762 {(char*)"en", F, -1, 1}, 763 {(char*)"es", E, 0, 0}, 764 765 {(char*)"eal", Y, 0, 0}, 766 {(char*)"ear", Y, -1, 1}, 767 {(char*)"ely", E, 0, 0}, 768 {(char*)"ene", E, -2, 2}, 769 {(char*)"ent", C, 0, 0}, 770 {(char*)"ery", E, -1, 1}, 771 {(char*)"ese", NULL, 0, 0}, 772 773 {(char*)"ealy", Y, 0, 1}, 774 {(char*)"edly", E, 0, 0}, 775 {(char*)"eful", NULL, -2, 1}, 776 {(char*)"eity", NULL, 0, 0}, 777 {(char*)"ence", NULL, -2, 2}, 778 {(char*)"ency", NULL, 0, 0}, 779 {(char*)"ened", E, -1, 2}, 780 {(char*)"enly", E, 0, 0}, 781 {(char*)"eous", NULL, -1, 0}, 782 783 {(char*)"early", Y, 0, 1}, 784 {(char*)"ehood", NULL, 0, 0}, 785 {(char*)"eless", NULL, -2, 2}, 786 {(char*)"elity", NULL, 0, 0}, 787 {(char*)"ement", NULL, -1, 0}, 788 {(char*)"enced", NULL, -3, 3}, 789 {(char*)"ences", NULL, 0, 1}, 790 {(char*)"eness", E, 0, 0}, 791 {(char*)"ening", E, -2, 2}, 792 {(char*)"ental", NULL, 0, 0}, 793 {(char*)"ented", C, -1, 1}, 794 {(char*)"ently", NULL, 0, 0}, 795 796 {(char*)"eature", Z, 0, 0}, 797 {(char*)"efully", NULL, -1, 1}, 798 {(char*)"encies", NULL, 0, 0}, 799 {(char*)"encing", NULL, -2, 2}, 800 {(char*)"ential", NULL, 0, 0}, 801 {(char*)"enting", C, -1, 1}, 802 {(char*)"entist", NULL, 0, 1}, 803 {(char*)"eously", NULL, 0, 0}, 804 805 {(char*)"elihood", E, 0, 1}, 806 {(char*)"encible", NULL, 0, 0}, 807 {(char*)"entally", NULL, -2, 2}, 808 {(char*)"entials", NULL, 0, 0}, 809 {(char*)"entiate", NULL, -1, 1}, 810 {(char*)"entness", NULL, 0, 0}, 811 812 {(char*)"entation", NULL, 0, 0}, 813 {(char*)"entially", NULL, -1, 1}, 814 {(char*)"eousness", NULL, 0, 0}, 815 816 {(char*)"eableness", E, 0, 1}, 817 {(char*)"entations", NULL, 0, 0}, 818 {(char*)"entiality", NULL, -2, 2}, 819 {(char*)"entialize", NULL, 0, 0}, 820 {(char*)"entiation", NULL, -1, 0}, 821 822 {(char*)"entialness", NULL, 0, 0}, 823 824 {(char*)"ful", NULL, 0, 0}, 825 826 {(char*)"fully", NULL, 0, 0}, 827 828 {(char*)"fulness", NULL, 0, 0}, 829 830 {(char*)"hood", NULL, 0, 0}, 831 832 {(char*)"i", NULL, 0, 0}, 833 834 {(char*)"ia", NULL, 0, 0}, 835 {(char*)"ic", NULL, -1, 1}, 836 {(char*)"is", NULL, 0, 0}, 837 838 {(char*)"ial", NULL, 0, 0}, 839 {(char*)"ian", NULL, -1, 1}, 840 {(char*)"ics", NULL, 0, 1}, 841 {(char*)"ide", L, 0, 0}, 842 {(char*)"ied", NULL, -3, 3}, 843 {(char*)"ier", NULL, 0, 0}, 844 {(char*)"ies", P, -1, 0}, 845 {(char*)"ily", NULL, -1, 1}, 846 {(char*)"ine", M, 0, 0}, 847 {(char*)"ing", N, -5, 5}, 848 {(char*)"ion", Q, 0, 0}, 849 {(char*)"ish", C, -1, 1}, 850 {(char*)"ism", B, 0, 1}, 851 {(char*)"ist", NULL, 0, 0}, 852 {(char*)"ite", AA, -3, 3}, 853 {(char*)"ity", NULL, 0, 0}, 854 {(char*)"ium", NULL, -1, 0}, 855 {(char*)"ive", NULL, -1, 1}, 856 {(char*)"ize", F, 0, 0}, 857 858 {(char*)"ials", NULL, 0, 0}, 859 {(char*)"ians", NULL, -1, 0}, 860 {(char*)"ible", NULL, -1, 1}, 861 {(char*)"ibly", NULL, 0, 0}, 862 {(char*)"ical", NULL, -2, 2}, 863 {(char*)"ides", L, 0, 0}, 864 {(char*)"iers", NULL, -1, 1}, 865 {(char*)"iful", NULL, 0, 0}, 866 {(char*)"ines", M, -4, 4}, 867 {(char*)"ings", N, 0, 0}, 868 {(char*)"ions", B, -1, 1}, 869 {(char*)"ious", NULL, 0, 0}, 870 {(char*)"isms", B, -2, 2}, 871 {(char*)"ists", NULL, 0, 0}, 872 {(char*)"itic", H, -1, 1}, 873 {(char*)"ized", F, 0, 1}, 874 {(char*)"izer", F, 0, 0}, 875 876 {(char*)"ially", NULL, 0, 0}, 877 {(char*)"icant", NULL, -1, 1}, 878 {(char*)"ician", NULL, 0, 0}, 879 {(char*)"icide", NULL, -2, 2}, 880 {(char*)"icism", NULL, 0, 0}, 881 {(char*)"icist", NULL, -1, 0}, 882 {(char*)"icity", NULL, -3, 3}, 883 {(char*)"idine", I, 0, 1}, 884 {(char*)"iedly", NULL, 0, 0}, 885 {(char*)"ihood", NULL, -2, 2}, 886 {(char*)"inate", NULL, 0, 0}, 887 {(char*)"iness", NULL, -1, 0}, 888 {(char*)"ingly", B, -6, 6}, 889 {(char*)"inism", J, 0, 1}, 890 {(char*)"inity", CC, 0, 0}, 891 {(char*)"ional", NULL, -2, 2}, 892 {(char*)"ioned", NULL, 0, 0}, 893 {(char*)"ished", NULL, -1, 0}, 894 {(char*)"istic", NULL, -3, 3}, 895 {(char*)"ities", NULL, 0, 1}, 896 {(char*)"itous", NULL, 0, 0}, 897 {(char*)"ively", NULL, -2, 2}, 898 {(char*)"ivity", NULL, 0, 0}, 899 {(char*)"izers", F, -1, 1}, 900 {(char*)"izing", F, 0, 0}, 901 902 {(char*)"ialist", NULL, 0, 0}, 903 {(char*)"iality", NULL, -1, 1}, 904 {(char*)"ialize", NULL, 0, 0}, 905 {(char*)"ically", NULL, -2, 2}, 906 {(char*)"icance", NULL, 0, 0}, 907 {(char*)"icians", NULL, -1, 1}, 908 {(char*)"icists", NULL, 0, 0}, 909 {(char*)"ifully", NULL, -4, 4}, 910 {(char*)"ionals", NULL, 0, 0}, 911 {(char*)"ionate", D, -1, 1}, 912 {(char*)"ioning", NULL, 0, 0}, 913 {(char*)"ionist", NULL, -2, 2}, 914 {(char*)"iously", NULL, 0, 0}, 915 {(char*)"istics", NULL, -1, 1}, 916 {(char*)"izable", E, 0, 0}, 917 918 {(char*)"ibility", NULL, 0, 0}, 919 {(char*)"icalism", NULL, -1, 1}, 920 {(char*)"icalist", NULL, 0, 1}, 921 {(char*)"icality", NULL, 0, 0}, 922 {(char*)"icalize", NULL, -3, 3}, 923 {(char*)"ication", G, 0, 0}, 924 {(char*)"icianry", NULL, -1, 0}, 925 {(char*)"ination", NULL, -1, 1}, 926 {(char*)"ingness", NULL, 0, 0}, 927 {(char*)"ionally", NULL, -5, 5}, 928 {(char*)"isation", NULL, 0, 0}, 929 {(char*)"ishness", NULL, -1, 1}, 930 {(char*)"istical", NULL, 0, 1}, 931 {(char*)"iteness", NULL, 0, 0}, 932 {(char*)"iveness", NULL, -3, 3}, 933 {(char*)"ivistic", NULL, 0, 0}, 934 {(char*)"ivities", NULL, -1, 0}, 935 {(char*)"ization", F, -1, 1}, 936 {(char*)"izement", NULL, 0, 0}, 937 938 {(char*)"ibleness", NULL, 0, 0}, 939 {(char*)"icalness", NULL, -1, 1}, 940 {(char*)"ionalism", NULL, 0, 0}, 941 {(char*)"ionality", NULL, -2, 2}, 942 {(char*)"ionalize", NULL, 0, 0}, 943 {(char*)"iousness", NULL, -1, 1}, 944 {(char*)"izations", NULL, 0, 0}, 945 946 {(char*)"ionalness", NULL, 0, 1}, 947 {(char*)"istically", NULL, 0, 0}, 948 {(char*)"itousness", NULL, -2, 2}, 949 {(char*)"izability", NULL, 0, 0}, 950 {(char*)"izational", NULL, -1, 0}, 951 952 {(char*)"izationally", B, 0, 0}, 953 954 {(char*)"ly", B, 0, 0}, 955 956 {(char*)"less", NULL, 0, 1}, 957 {(char*)"lily", NULL, 0, 0}, 958 959 {(char*)"lessly", NULL, 0, 0}, 960 961 {(char*)"lessness", NULL, 0, 0}, 962 963 {(char*)"ness", NULL, 0, 0}, 964 965 {(char*)"nesses", NULL, 0, 0}, 966 967 {(char*)"o", NULL, 0, 0}, 968 969 {(char*)"on", S, 0, 1}, 970 {(char*)"or", T, 0, 0}, 971 972 {(char*)"oid", NULL, 0, 0}, 973 {(char*)"one", R, -1, 1}, 974 {(char*)"ous", NULL, 0, 0}, 975 976 {(char*)"ogen", NULL, 0, 0}, 977 978 {(char*)"oidal", NULL, 0, 0}, 979 {(char*)"oides", NULL, -1, 2}, 980 {(char*)"otide", NULL, 0, 0}, 981 {(char*)"ously", NULL, -1, 0}, 982 983 {(char*)"oidism", NULL, 0, 0}, 984 985 {(char*)"oidally", NULL, 0, 1}, 986 {(char*)"ousness", NULL, 0, 0}, 987 988 {(char*)"s", W, 0, 0}, 989 990 {(char*)"s'", NULL, 0, 0}, 991 992 {(char*)"um", U, 0, 1}, 993 {(char*)"us", V, 0, 0}, 994 995 {(char*)"ward", NULL, 0, 1}, 996 {(char*)"wise", NULL, 0, 0}, 997 998 {(char*)"y", B, 0, 0}, 999 1000 {(char*)"yl", R, 0, 0}, 1001 1002 {(char*)"ying", B, 0, 1}, 1003 {(char*)"yish", NULL, 0, 0}, 1004 1005 {(char*)"'s", NULL, 0, 0}, 1006 1006 }; 1007 1007 … … 1017 1017 static First_Char_Node First[] = 1018 1018 { 1019 '\'', NULL, NULL,1019 {'\'', NULL, NULL, 1020 1020 {NULL, 1021 1021 List + 293, NULL, NULL, NULL, NULL, 1022 NULL, NULL, NULL, NULL, NULL} ,1023 1024 'a', First, NULL,1022 NULL, NULL, NULL, NULL, NULL}}, 1023 1024 {'a', First, NULL, 1025 1025 {List, 1026 1026 List + 2, List + 9, List + 20, List + 39, List + 58, 1027 List + 70, List + 77, List + 82, List + 87, List + 89} ,1028 1029 'e', First + 1, First + 4,1027 List + 70, List + 77, List + 82, List + 87, List + 89}}, 1028 1029 {'e', First + 1, First + 4, 1030 1030 {List + 91, 1031 1031 List + 93, List + 98, List + 106, List + 116, List + 126, 1032 List + 133, List + 138, List + 142, List + 145, NULL} ,1033 1034 'f', NULL, NULL,1032 List + 133, List + 138, List + 142, List + 145, NULL}}, 1033 1034 {'f', NULL, NULL, 1035 1035 {NULL, 1036 1036 NULL, List + 146, NULL, List + 147, NULL, 1037 List + 148, NULL, NULL, NULL, NULL} ,1038 1039 'h', First + 3, First + 5,1037 List + 148, NULL, NULL, NULL, NULL}}, 1038 1039 {'h', First + 3, First + 5, 1040 1040 {NULL, 1041 1041 NULL, NULL, List + 149, NULL, NULL, 1042 NULL, NULL, NULL, NULL, NULL} ,1043 1044 'i', NULL, NULL,1042 NULL, NULL, NULL, NULL, NULL}}, 1043 1044 {'i', NULL, NULL, 1045 1045 {List + 150, 1046 1046 List + 152, List + 163, List + 181, List + 202, List + 222, 1047 List + 239, List + 252, List + 258, NULL, List + 261} ,1048 1049 'l', First + 2, First + 10,1047 List + 239, List + 252, List + 258, NULL, List + 261}}, 1048 1049 {'l', First + 2, First + 10, 1050 1050 {NULL, 1051 1051 List + 262, NULL, List + 263, NULL, List + 265, 1052 NULL, List + 266, NULL, NULL, NULL} ,1053 1054 'n', NULL, NULL,1052 NULL, List + 266, NULL, NULL, NULL}}, 1053 1054 {'n', NULL, NULL, 1055 1055 {NULL, 1056 1056 NULL, NULL, List + 267, NULL, List + 268, 1057 NULL, NULL, NULL, NULL, NULL} ,1058 1059 'o', First + 7, First + 9,1057 NULL, NULL, NULL, NULL, NULL}}, 1058 1059 {'o', First + 7, First + 9, 1060 1060 {List + 269, 1061 1061 List + 270, List + 273, List + 275, List + 277, List + 280, 1062 List + 281, NULL, NULL, NULL, NULL} ,1063 1064 's', NULL, NULL,1062 List + 281, NULL, NULL, NULL, NULL}}, 1063 1064 {'s', NULL, NULL, 1065 1065 {List + 283, 1066 1066 List + 284, NULL, NULL, NULL, NULL, 1067 NULL, NULL, NULL, NULL, NULL} ,1068 1069 'u', First + 8, First + 12,1067 NULL, NULL, NULL, NULL, NULL}}, 1068 1069 {'u', First + 8, First + 12, 1070 1070 {NULL, 1071 1071 List + 285, NULL, NULL, NULL, NULL, 1072 NULL, NULL, NULL, NULL, NULL} ,1073 1074 'w', NULL, NULL,1072 NULL, NULL, NULL, NULL, NULL}}, 1073 1074 {'w', NULL, NULL, 1075 1075 {NULL, 1076 1076 NULL, NULL, List + 287, NULL, NULL, 1077 NULL, NULL, NULL, NULL, NULL} ,1078 1079 'y', First + 11, NULL,1077 NULL, NULL, NULL, NULL, NULL}}, 1078 1079 {'y', First + 11, NULL, 1080 1080 {List + 289, 1081 1081 List + 290, NULL, List + 291, NULL, NULL, 1082 NULL, NULL, NULL, NULL, NULL} ,1082 NULL, NULL, NULL, NULL, NULL}}, 1083 1083 }; 1084 1084 -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/messages.cpp
r16583 r25147 25 25 #include "messages.h" 26 26 27 char *msg_prefix = "";27 char *msg_prefix = (char*)""; 28 28 29 29 -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/netorder.h
r22257 r25147 16 16 #define HTOND(d) \ 17 17 do { \ 18 unsignedlong tmph, tmpl; \18 mg_u_long tmph, tmpl; \ 19 19 memcpy ((void *) &tmph, (const void *) &d, sizeof(double) >> 1); \ 20 memcpy ((void *) &tmpl, (const void *) ((unsigned int) &d + (sizeof(double) >> 1)), sizeof (double) >> 1); \20 memcpy ((void *) &tmpl, (const void *) ((unsigned char*) &d + (sizeof(double) >> 1)), sizeof (double) >> 1); \ 21 21 tmph = htonl (tmph); \ 22 22 tmpl = htonl (tmpl); \ 23 23 memcpy ( (void *) &d, (const void *) &tmpl, sizeof (double) >> 1); \ 24 memcpy ((void *) ((unsigned int) &d + (sizeof(double) >> 1)), (const void *) &tmph, sizeof (double) >> 1); \24 memcpy ((void *) ((unsigned char*) &d + (sizeof(double) >> 1)), (const void *) &tmph, sizeof (double) >> 1); \ 25 25 }while(0) 26 26 #define NTOHD(d) \ 27 27 do { \ 28 unsignedlong tmph, tmpl; \28 mg_u_long tmph, tmpl; \ 29 29 memcpy ((void *) &tmph, (const void *) &d, sizeof(double) >> 1); \ 30 memcpy ((void *) &tmpl, (const void *) (( int) &d + (sizeof(double) >> 1)), sizeof (double) >> 1); \30 memcpy ((void *) &tmpl, (const void *) ((unsigned char*) &d + (sizeof(double) >> 1)), sizeof (double) >> 1); \ 31 31 tmph = ntohl (tmph); \ 32 32 tmpl = ntohl (tmpl); \ 33 33 memcpy((void *) &d, (const void *) &tmpl, sizeof (double) >> 1); \ 34 memcpy ((void *) (( int) &d + (sizeof(double) >> 1)), (const void *) &tmph, sizeof (double) >> 1); \34 memcpy ((void *) ((unsigned char*) &d + (sizeof(double) >> 1)), (const void *) &tmph, sizeof (double) >> 1); \ 35 35 }while(0) 36 36 #define HTOND2(hd, nd) \ 37 37 do { \ 38 unsignedlong tmph, tmpl; \38 mg_u_long tmph, tmpl; \ 39 39 memcpy ((void *) &tmph, (const void *) &hd, sizeof(double) >> 1);\ 40 40 memcpy ((void *) &tmpl, (const void *) ((unsigned int) &hd + (sizeof(double) >> 1)), sizeof (double) >> 1); \ … … 46 46 #define NTOHD2(nd, hd) \ 47 47 do { \ 48 unsignedlong tmph, tmpl; \48 mg_u_long tmph, tmpl; \ 49 49 memcpy ((void *) &nd, (void *) &tmph, sizeof(double) >> 1); \ 50 50 memcpy ((void *) &tmpl, (const void *) &nd + (sizeof(double) >> 1), sizeof (double) >> 1); \ … … 58 58 #define HTONF(f) \ 59 59 do { \ 60 unsignedlong tmp; \60 mg_u_long tmp; \ 61 61 memcpy ((void *) &tmp, (const void *) &(f), sizeof (float)); \ 62 62 HTONUL (tmp); \ … … 65 65 #define NTOHF(f) \ 66 66 do { \ 67 unsignedlong tmp; \67 mg_u_long tmp; \ 68 68 memcpy ((void *) &tmp, (const void *) &(f), sizeof (float)); \ 69 69 NTOHUL (tmp); \ … … 72 72 #define HTONF2(hf, nf) \ 73 73 do { \ 74 unsignedlong tmp; \74 mg_u_long tmp; \ 75 75 memcpy ((void *) &tmp, (const void *) &(hf), sizeof (float)); \ 76 76 HTONUL (tmp); \ … … 79 79 #define NTOHF2(nf, hf) \ 80 80 do { \ 81 unsignedlong tmp; \81 mg_u_long tmp; \ 82 82 memcpy ((void *) &tmp, (const void *) &(nf), sizeof (float)); \ 83 83 NTOHUL (tmp); \ … … 114 114 115 115 /* pointers */ 116 #define HTONP(p) ((p) = (void *) htonl (( unsignedlong) p))117 #define NTOHP(p) ((p) = (void *) ntohl (( unsignedlong) p))118 #define HTONP2(hp, np) ((np) = (void *) htonl (( unsignedlong) hp))119 #define NTOHP2(np, hp) ((hp) = (void *) ntohl (( unsignedlong) np))116 #define HTONP(p) ((p) = (void *) htonl ((mg_u_long) p)) 117 #define NTOHP(p) ((p) = (void *) ntohl ((mg_u_long) p)) 118 #define HTONP2(hp, np) ((np) = (void *) htonl ((mg_u_long) hp)) 119 #define NTOHP2(np, hp) ((hp) = (void *) ntohl ((mg_u_long) np)) 120 120 121 121 /* unsigned long */ … … 126 126 127 127 /* signed long */ 128 #define HTONSL(l) ((l) = ( long) htonl ((unsignedlong) (l)))129 #define NTOHSL(l) ((l) = ( long) ntohl ((unsignedlong) (l)))130 #define HTONSL2(hl, nl) ((nl) = ( long) htonl ((unsignedlong) (hl)))131 #define NTOHSL2(nl, hl) ((hl) = ( long) ntohl ((unsignedlong) (nl)))128 #define HTONSL(l) ((l) = (mg_s_long) htonl ((mg_u_long) (l))) 129 #define NTOHSL(l) ((l) = (mg_s_long) ntohl ((mg_u_long) (l))) 130 #define HTONSL2(hl, nl) ((nl) = (mg_s_long) htonl ((mg_u_long) (hl))) 131 #define NTOHSL2(nl, hl) ((hl) = (mg_s_long) ntohl ((mg_u_long) (nl))) 132 132 133 133 /* unsigned int */ 134 #define HTONUI(i) ((i) = (unsigned int) htonl (( unsignedlong) (i)))135 #define NTOHUI(i) ((i) = (unsigned int) ntohl (( unsignedlong) (i)))136 #define HTONUI2(hi, ni) ((ni) = (unsigned int) htonl (( unsignedlong) (hi)))137 #define NTOHUI2(ni, hi) ((hi) = (unsigned int) ntohl (( unsignedlong) (ni)))134 #define HTONUI(i) ((i) = (unsigned int) htonl ((mg_u_long) (i))) 135 #define NTOHUI(i) ((i) = (unsigned int) ntohl ((mg_u_long) (i))) 136 #define HTONUI2(hi, ni) ((ni) = (unsigned int) htonl ((mg_u_long) (hi))) 137 #define NTOHUI2(ni, hi) ((hi) = (unsigned int) ntohl ((mg_u_long) (ni))) 138 138 139 139 /* signed int */ 140 #define HTONSI(i) ((i) = (int) htonl (( unsignedlong) (i)))141 #define NTOHSI(i) ((i) = (int) ntohl (( unsignedlong) (i)))142 #define HTONSI2(hi, ni) ((ni) = (int) htonl (( unsignedlong) (hi)))143 #define NTOHSI2(ni, hi) ((hi) = (int) ntohl (( unsignedlong) (ni)))140 #define HTONSI(i) ((i) = (int) htonl ((mg_u_long) (i))) 141 #define NTOHSI(i) ((i) = (int) ntohl ((mg_u_long) (i))) 142 #define HTONSI2(hi, ni) ((ni) = (int) htonl ((mg_u_long) (hi))) 143 #define NTOHSI2(ni, hi) ((hi) = (int) ntohl ((mg_u_long) (ni))) 144 144 145 145 /* unsigned short */ -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/non_ansi.h
r16583 r25147 3 3 4 4 #include "config.h" 5 #include "mglong.h" 5 6 # if !defined(__STDC__) 6 7 … … 11 12 12 13 int fileno(FILE *); 13 int ftruncate(int, long);14 int ftruncate(int, mg_s_long); 14 15 int pclose(FILE *); 15 16 FILE *popen(const char *command, const char *type); -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/perf_hash.cpp
r16583 r25147 44 44 /* Random Number stuff */ 45 45 46 long irandm (long is[2]); /* from random.c */47 48 static long seed[] = {0, 0};46 mg_s_long irandm (mg_s_long is[2]); /* from random.c */ 47 48 static mg_s_long seed[] = {0, 0}; 49 49 #define RANDOM() irandm(seed) 50 50 #define SEED_RANDOM(the_seed) do{ seed[0] = the_seed; }while(0) … … 107 107 108 108 #ifndef STRUCT 109 static long **tb0, **tb1, **tb2;109 static mg_s_long **tb0, **tb1, **tb2; 110 110 #else 111 111 struct tb_entry **tb; … … 700 700 { 701 701 if (tb0) 702 if (!(tb0[i] = Xmalloc (sizeof ( long) * MAX_L)))702 if (!(tb0[i] = Xmalloc (sizeof (mg_s_long) * MAX_L))) 703 703 ok = 0; 704 704 if (tb1) 705 if (!(tb1[i] = Xmalloc (sizeof ( long) * MAX_L)))705 if (!(tb1[i] = Xmalloc (sizeof (mg_s_long) * MAX_L))) 706 706 ok = 0; 707 707 if (tb2) 708 if (!(tb2[i] = Xmalloc (sizeof ( long) * MAX_L)))708 if (!(tb2[i] = Xmalloc (sizeof (mg_s_long) * MAX_L))) 709 709 ok = 0; 710 710 } … … 744 744 745 745 if (r <= 0) 746 SEED_RANDOM (( long) time ((time_t *) NULL));746 SEED_RANDOM ((mg_s_long) time ((time_t *) NULL)); 747 747 else 748 748 SEED_RANDOM (r); … … 902 902 { 903 903 if (phd->tb0) 904 if (!(phd->tb0[i] = Xmalloc (sizeof ( long) * phd->MAX_L)))904 if (!(phd->tb0[i] = Xmalloc (sizeof (mg_s_long) * phd->MAX_L))) 905 905 ok = 0; 906 906 if (phd->tb1) 907 if (!(phd->tb1[i] = Xmalloc (sizeof ( long) * phd->MAX_L)))907 if (!(phd->tb1[i] = Xmalloc (sizeof (mg_s_long) * phd->MAX_L))) 908 908 ok = 0; 909 909 if (phd->tb2) 910 if (!(phd->tb2[i] = Xmalloc (sizeof ( long) * phd->MAX_L)))910 if (!(phd->tb2[i] = Xmalloc (sizeof (mg_s_long) * phd->MAX_L))) 911 911 ok = 0; 912 912 } … … 946 946 int j; 947 947 948 tot += fread ((char *) phd->tb0[i], sizeof ( long), phd->MAX_L, f) *948 tot += fread ((char *) phd->tb0[i], sizeof (mg_s_long), phd->MAX_L, f) * 949 949 sizeof (int); 950 tot += fread ((char *) phd->tb1[i], sizeof ( long), phd->MAX_L, f) *950 tot += fread ((char *) phd->tb1[i], sizeof (mg_s_long), phd->MAX_L, f) * 951 951 sizeof (int); 952 tot += fread ((char *) phd->tb2[i], sizeof ( long), phd->MAX_L, f) *952 tot += fread ((char *) phd->tb2[i], sizeof (mg_s_long), phd->MAX_L, f) * 953 953 sizeof (int); 954 954 -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/perf_hash.h
r16583 r25147 25 25 struct tb_entry 26 26 { 27 long tb0, tb1, tb2;27 mg_s_long tb0, tb1, tb2; 28 28 }; 29 29 -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/random.cpp
r16583 r25147 33 33 * The table mt[0:127] is defined by mt[i] = 69069 ** (128-i) 34 34 */ 35 36 #define MASK ((long) 593970775) 35 #include "random.h" 36 37 #define MASK ((mg_s_long) 593970775) 37 38 /* or in hex, 23674657 */ 38 39 … … 40 41 /* i.e. 2 to power -31 */ 41 42 42 static long mt [128] = {43 static mg_s_long mt [128] = { 43 44 902906369, 44 45 2030498053, … … 172 173 173 174 double 174 random ( long is [2])175 random (mg_s_long is [2]) 175 176 { 176 long it, leh, nit;177 mg_s_long it, leh, nit; 177 178 178 179 it = is [0]; … … 187 188 is [0] = it; is [1] = leh; 188 189 if (leh < 0) leh = ~leh; 189 return (SCALE * (( long) (leh | 1)));190 return (SCALE * ((mg_s_long) (leh | 1))); 190 191 } 191 192 192 193 193 194 194 long195 irandm ( long is [2])195 mg_s_long 196 irandm (mg_s_long is [2]) 196 197 { 197 long it, leh, nit;198 mg_s_long it, leh, nit; 198 199 199 200 it = is [0]; -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/random.h
r16583 r25147 36 36 * The table mt[0:127] is defined by mt[i] = 69069 ** (128-i) 37 37 */ 38 #include "mglong.h" 38 39 39 double random ( long is [2]);40 long irandm (long is [2]);40 double random (mg_s_long is [2]); 41 mg_s_long irandm (mg_s_long is [2]); 41 42 42 43 #endif -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/sysfuncs.h
r16583 r25147 377 377 #endif 378 378 379 /* [RPAP - Feb 97: WIN32 Port] */ 380 #ifndef u_long 381 # define u_long unsigned long 382 #endif 379 #include "mglong.h" 380 383 381 #ifndef u_char 384 # define u_char unsigned char 385 #endif 386 382 # define u_char uint8_t 383 #endif 387 384 388 385 #endif /* SYSFUNCS_H */ -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/unitool.cpp
r23424 r25147 15 15 * column 16 16 */ 17 static unsignedlong *unicode_cat_data=NULL;17 static mg_u_long *unicode_cat_data=NULL; 18 18 19 19 … … 40 40 #define NUM_DECOMPOSE_INFO 1269 41 41 static const unidecompose decompose_info[NUM_DECOMPOSE_INFO] = { 42 {0xC0, 0x41,0x300,0x0}, {0xC1,0x41,0x301,0x0}, {0xC2,0x41,0x302,0x0},43 {0xC3, 0x41,0x303,0x0}, {0xC4,0x41,0x308,0x0}, {0xC5,0x41,0x30A,0x0},44 {0xC7, 0x43,0x327,0x0}, {0xC8,0x45,0x300,0x0}, {0xC9,0x45,0x301,0x0},45 {0xCA, 0x45,0x302,0x0}, {0xCB,0x45,0x308,0x0}, {0xCC,0x49,0x300,0x0},46 {0xCD, 0x49,0x301,0x0}, {0xCE,0x49,0x302,0x0}, {0xCF,0x49,0x308,0x0},47 {0xD1, 0x4E,0x303,0x0}, {0xD2,0x4F,0x300,0x0}, {0xD3,0x4F,0x301,0x0},48 {0xD4, 0x4F,0x302,0x0}, {0xD5,0x4F,0x303,0x0}, {0xD6,0x4F,0x308,0x0},49 {0xD9, 0x55,0x300,0x0}, {0xDA,0x55,0x301,0x0}, {0xDB,0x55,0x302,0x0},50 {0xDC, 0x55,0x308,0x0}, {0xDD,0x59,0x301,0x0}, {0xE0,0x61,0x300,0x0},51 {0xE1, 0x61,0x301,0x0}, {0xE2,0x61,0x302,0x0}, {0xE3,0x61,0x303,0x0},52 {0xE4, 0x61,0x308,0x0}, {0xE5,0x61,0x30A,0x0}, {0xE7,0x63,0x327,0x0},53 {0xE8, 0x65,0x300,0x0}, {0xE9,0x65,0x301,0x0}, {0xEA,0x65,0x302,0x0},54 {0xEB, 0x65,0x308,0x0}, {0xEC,0x69,0x300,0x0}, {0xED,0x69,0x301,0x0},55 {0xEE, 0x69,0x302,0x0}, {0xEF,0x69,0x308,0x0}, {0xF1,0x6E,0x303,0x0},56 {0xF2, 0x6F,0x300,0x0}, {0xF3,0x6F,0x301,0x0}, {0xF4,0x6F,0x302,0x0},57 {0xF5, 0x6F,0x303,0x0}, {0xF6,0x6F,0x308,0x0}, {0xF9,0x75,0x300,0x0},58 {0xFA, 0x75,0x301,0x0}, {0xFB,0x75,0x302,0x0}, {0xFC,0x75,0x308,0x0},59 {0xFD, 0x79,0x301,0x0}, {0xFF,0x79,0x308,0x0}, {0x100,0x41,0x304,0x0},60 {0x101, 0x61,0x304,0x0}, {0x102,0x41,0x306,0x0}, {0x103,0x61,0x306,0x0},61 {0x104, 0x41,0x328,0x0}, {0x105,0x61,0x328,0x0}, {0x106,0x43,0x301,0x0},62 {0x107, 0x63,0x301,0x0}, {0x108,0x43,0x302,0x0}, {0x109,0x63,0x302,0x0},63 {0x10A, 0x43,0x307,0x0}, {0x10B,0x63,0x307,0x0}, {0x10C,0x43,0x30C,0x0},64 {0x10D, 0x63,0x30C,0x0}, {0x10E,0x44,0x30C,0x0}, {0x10F,0x64,0x30C,0x0},65 {0x112, 0x45,0x304,0x0}, {0x113,0x65,0x304,0x0}, {0x114,0x45,0x306,0x0},66 {0x115, 0x65,0x306,0x0}, {0x116,0x45,0x307,0x0}, {0x117,0x65,0x307,0x0},67 {0x118, 0x45,0x328,0x0}, {0x119,0x65,0x328,0x0}, {0x11A,0x45,0x30C,0x0},68 {0x11B, 0x65,0x30C,0x0}, {0x11C,0x47,0x302,0x0}, {0x11D,0x67,0x302,0x0},69 {0x11E, 0x47,0x306,0x0}, {0x11F,0x67,0x306,0x0}, {0x120,0x47,0x307,0x0},70 {0x121, 0x67,0x307,0x0}, {0x122,0x47,0x327,0x0}, {0x123,0x67,0x327,0x0},71 {0x124, 0x48,0x302,0x0}, {0x125,0x68,0x302,0x0}, {0x128,0x49,0x303,0x0},72 {0x129, 0x69,0x303,0x0}, {0x12A,0x49,0x304,0x0}, {0x12B,0x69,0x304,0x0},73 {0x12C, 0x49,0x306,0x0}, {0x12D,0x69,0x306,0x0}, {0x12E,0x49,0x328,0x0},74 {0x12F, 0x69,0x328,0x0}, {0x130,0x49,0x307,0x0}, {0x134,0x4A,0x302,0x0},75 {0x135, 0x6A,0x302,0x0}, {0x136,0x4B,0x327,0x0}, {0x137,0x6B,0x327,0x0},76 {0x139, 0x4C,0x301,0x0}, {0x13A,0x6C,0x301,0x0}, {0x13B,0x4C,0x327,0x0},77 {0x13C, 0x6C,0x327,0x0}, {0x13D,0x4C,0x30C,0x0}, {0x13E,0x6C,0x30C,0x0},78 {0x143, 0x4E,0x301,0x0}, {0x144,0x6E,0x301,0x0}, {0x145,0x4E,0x327,0x0},79 {0x146, 0x6E,0x327,0x0}, {0x147,0x4E,0x30C,0x0}, {0x148,0x6E,0x30C,0x0},80 {0x14C, 0x4F,0x304,0x0}, {0x14D,0x6F,0x304,0x0}, {0x14E,0x4F,0x306,0x0},81 {0x14F, 0x6F,0x306,0x0}, {0x150,0x4F,0x30B,0x0}, {0x151,0x6F,0x30B,0x0},82 {0x154, 0x52,0x301,0x0}, {0x155,0x72,0x301,0x0}, {0x156,0x52,0x327,0x0},83 {0x157, 0x72,0x327,0x0}, {0x158,0x52,0x30C,0x0}, {0x159,0x72,0x30C,0x0},84 {0x15A, 0x53,0x301,0x0}, {0x15B,0x73,0x301,0x0}, {0x15C,0x53,0x302,0x0},85 {0x15D, 0x73,0x302,0x0}, {0x15E,0x53,0x327,0x0}, {0x15F,0x73,0x327,0x0},86 {0x160, 0x53,0x30C,0x0}, {0x161,0x73,0x30C,0x0}, {0x162,0x54,0x327,0x0},87 {0x163, 0x74,0x327,0x0}, {0x164,0x54,0x30C,0x0}, {0x165,0x74,0x30C,0x0},88 {0x168, 0x55,0x303,0x0}, {0x169,0x75,0x303,0x0}, {0x16A,0x55,0x304,0x0},89 {0x16B, 0x75,0x304,0x0}, {0x16C,0x55,0x306,0x0}, {0x16D,0x75,0x306,0x0},90 {0x16E, 0x55,0x30A,0x0}, {0x16F,0x75,0x30A,0x0}, {0x170,0x55,0x30B,0x0},91 {0x171, 0x75,0x30B,0x0}, {0x172,0x55,0x328,0x0}, {0x173,0x75,0x328,0x0},92 {0x174, 0x57,0x302,0x0}, {0x175,0x77,0x302,0x0}, {0x176,0x59,0x302,0x0},93 {0x177, 0x79,0x302,0x0}, {0x178,0x59,0x308,0x0}, {0x179,0x5A,0x301,0x0},94 {0x17A, 0x7A,0x301,0x0}, {0x17B,0x5A,0x307,0x0}, {0x17C,0x7A,0x307,0x0},95 {0x17D, 0x5A,0x30C,0x0}, {0x17E,0x7A,0x30C,0x0}, {0x1A0,0x4F,0x31B,0x0},96 {0x1A1, 0x6F,0x31B,0x0}, {0x1AF,0x55,0x31B,0x0}, {0x1B0,0x75,0x31B,0x0},97 {0x1CD, 0x41,0x30C,0x0}, {0x1CE,0x61,0x30C,0x0}, {0x1CF,0x49,0x30C,0x0},98 {0x1D0, 0x69,0x30C,0x0}, {0x1D1,0x4F,0x30C,0x0}, {0x1D2,0x6F,0x30C,0x0},99 {0x1D3, 0x55,0x30C,0x0}, {0x1D4,0x75,0x30C,0x0}, {0x1D5,0xDC,0x304,0x0},100 {0x1D6, 0xFC,0x304,0x0}, {0x1D7,0xDC,0x301,0x0}, {0x1D8,0xFC,0x301,0x0},101 {0x1D9, 0xDC,0x30C,0x0}, {0x1DA,0xFC,0x30C,0x0}, {0x1DB,0xDC,0x300,0x0},102 {0x1DC, 0xFC,0x300,0x0}, {0x1DE,0xC4,0x304,0x0}, {0x1DF,0xE4,0x304,0x0},103 {0x1E0, 0x41,0x307,0x304}, {0x1E1,0x61,0x307,0x304}, {0x1E2,0xC6,0x304,0x0},104 {0x1E3, 0xE6,0x304,0x0}, {0x1E6,0x47,0x30C,0x0}, {0x1E7,0x67,0x30C,0x0},105 {0x1E8, 0x4B,0x30C,0x0}, {0x1E9,0x6B,0x30C,0x0}, {0x1EA,0x4F,0x328,0x0},106 {0x1EB, 0x6F,0x328,0x0}, {0x1EC,0x1EA,0x304,0x0}, {0x1ED,0x1EB,0x304,0x0},107 {0x1EE, 0x1B7,0x30C,0x0}, {0x1EF,0x292,0x30C,0x0}, {0x1F0,0x6A,0x30C,0x0},108 {0x1F4, 0x47,0x301,0x0}, {0x1F5,0x67,0x301,0x0}, {0x1FA,0xC5,0x301,0x0},109 {0x1FB, 0xE5,0x301,0x0}, {0x1FC,0xC6,0x301,0x0}, {0x1FD,0xE6,0x301,0x0},110 {0x1FE, 0xD8,0x301,0x0}, {0x1FF,0xF8,0x301,0x0}, {0x200,0x41,0x30F,0x0},111 {0x201, 0x61,0x30F,0x0}, {0x202,0x41,0x311,0x0}, {0x203,0x61,0x311,0x0},112 {0x204, 0x45,0x30F,0x0}, {0x205,0x65,0x30F,0x0}, {0x206,0x45,0x311,0x0},113 {0x207, 0x65,0x311,0x0}, {0x208,0x49,0x30F,0x0}, {0x209,0x69,0x30F,0x0},114 {0x20A, 0x49,0x311,0x0}, {0x20B,0x69,0x311,0x0}, {0x20C,0x4F,0x30F,0x0},115 {0x20D, 0x6F,0x30F,0x0}, {0x20E,0x4F,0x311,0x0}, {0x20F,0x6F,0x311,0x0},116 {0x210, 0x52,0x30F,0x0}, {0x211,0x72,0x30F,0x0}, {0x212,0x52,0x311,0x0},117 {0x213, 0x72,0x311,0x0}, {0x214,0x55,0x30F,0x0}, {0x215,0x75,0x30F,0x0},118 {0x216, 0x55,0x311,0x0}, {0x217,0x75,0x311,0x0}, {0x310,0x306,0x307,0x0},119 {0x340, 0x300,0x0,0x0}, {0x341,0x301,0x0,0x0}, {0x343,0x313,0x0,0x0},120 {0x344, 0x308,0x30D,0x0}, {0x374,0x2B9,0x0,0x0}, {0x37E,0x3B,0x0,0x0},121 {0x385, 0xA8,0x30D,0x0}, {0x386,0x391,0x30D,0x0}, {0x387,0xB7,0x0,0x0},122 {0x388, 0x395,0x30D,0x0}, {0x389,0x397,0x30D,0x0}, {0x38A,0x399,0x30D,0x0},123 {0x38C, 0x39F,0x30D,0x0}, {0x38E,0x3A5,0x30D,0x0}, {0x38F,0x3A9,0x30D,0x0},124 {0x390, 0x3B9,0x344,0x0}, {0x3AA,0x399,0x308,0x0}, {0x3AB,0x3A5,0x308,0x0},125 {0x3AC, 0x3B1,0x30D,0x0}, {0x3AD,0x3B5,0x30D,0x0}, {0x3AE,0x3B7,0x30D,0x0},126 {0x3AF, 0x3B9,0x30D,0x0}, {0x3B0,0x3C5,0x344,0x0}, {0x3CA,0x3B9,0x308,0x0},127 {0x3CB, 0x3C5,0x308,0x0}, {0x3CC,0x3BF,0x30D,0x0}, {0x3CD,0x3C5,0x30D,0x0},128 {0x3CE, 0x3C9,0x30D,0x0}, {0x3D3,0x3D2,0x30D,0x0}, {0x3D4,0x3D2,0x308,0x0},129 {0x401, 0x415,0x308,0x0}, {0x403,0x413,0x301,0x0}, {0x407,0x406,0x308,0x0},130 {0x40C, 0x41A,0x301,0x0}, {0x40E,0x423,0x306,0x0}, {0x419,0x418,0x306,0x0},131 {0x439, 0x438,0x306,0x0}, {0x451,0x435,0x308,0x0}, {0x453,0x433,0x301,0x0},132 {0x457, 0x456,0x308,0x0}, {0x45C,0x43A,0x301,0x0}, {0x45E,0x443,0x306,0x0},133 {0x476, 0x474,0x30F,0x0}, {0x477,0x475,0x30F,0x0}, {0x4C1,0x416,0x306,0x0},134 {0x4C2, 0x436,0x306,0x0}, {0x4D0,0x410,0x306,0x0}, {0x4D1,0x430,0x306,0x0},135 {0x4D2, 0x410,0x308,0x0}, {0x4D3,0x430,0x308,0x0}, {0x4D6,0x415,0x306,0x0},136 {0x4D7, 0x435,0x306,0x0}, {0x4DA,0x4D8,0x308,0x0}, {0x4DB,0x4D9,0x308,0x0},137 {0x4DC, 0x416,0x308,0x0}, {0x4DD,0x436,0x308,0x0}, {0x4DE,0x417,0x308,0x0},138 {0x4DF, 0x437,0x308,0x0}, {0x4E2,0x418,0x304,0x0}, {0x4E3,0x438,0x304,0x0},139 {0x4E4, 0x418,0x308,0x0}, {0x4E5,0x438,0x308,0x0}, {0x4E6,0x41E,0x308,0x0},140 {0x4E7, 0x43E,0x308,0x0}, {0x4EA,0x4E8,0x308,0x0}, {0x4EB,0x4E9,0x308,0x0},141 {0x4EE, 0x423,0x304,0x0}, {0x4EF,0x443,0x304,0x0}, {0x4F0,0x423,0x308,0x0},142 {0x4F1, 0x443,0x308,0x0}, {0x4F2,0x423,0x30B,0x0}, {0x4F3,0x443,0x30B,0x0},143 {0x4F4, 0x427,0x308,0x0}, {0x4F5,0x447,0x308,0x0}, {0x4F8,0x42B,0x308,0x0},144 {0x4F9, 0x44B,0x308,0x0}, {0x929,0x928,0x93C,0x0}, {0x931,0x930,0x93C,0x0},145 {0x934, 0x933,0x93C,0x0}, {0x958,0x915,0x93C,0x0}, {0x959,0x916,0x93C,0x0},146 {0x95A, 0x917,0x93C,0x0}, {0x95B,0x91C,0x93C,0x0}, {0x95C,0x921,0x93C,0x0},147 {0x95D, 0x922,0x93C,0x0}, {0x95E,0x92B,0x93C,0x0}, {0x95F,0x92F,0x93C,0x0},148 {0x9B0, 0x9AC,0x9BC,0x0}, {0x9CB,0x9C7,0x9BE,0x0}, {0x9CC,0x9C7,0x9D7,0x0},149 {0x9DC, 0x9A1,0x9BC,0x0}, {0x9DD,0x9A2,0x9BC,0x0}, {0x9DF,0x9AF,0x9BC,0x0},150 {0xA59, 0xA16,0xA3C,0x0}, {0xA5A,0xA17,0xA3C,0x0}, {0xA5B,0xA1C,0xA3C,0x0},151 {0xA5C, 0xA21,0xA3C,0x0}, {0xA5E,0xA2B,0xA3C,0x0}, {0xB48,0xB47,0xB56,0x0},152 {0xB4B, 0xB47,0xB3E,0x0}, {0xB4C,0xB47,0xB57,0x0}, {0xB5C,0xB21,0xB3C,0x0},153 {0xB5D, 0xB22,0xB3C,0x0}, {0xB5F,0xB2F,0xB3C,0x0}, {0xB94,0xB92,0xBD7,0x0},154 {0xBCA, 0xBC6,0xBBE,0x0}, {0xBCB,0xBC7,0xBBE,0x0}, {0xBCC,0xBC6,0xBD7,0x0},155 {0xC48, 0xC46,0xC56,0x0}, {0xCC0,0xCBF,0xCD5,0x0}, {0xCC7,0xCC6,0xCD5,0x0},156 {0xCC8, 0xCC6,0xCD6,0x0}, {0xCCA,0xCC6,0xCC2,0x0}, {0xCCB,0xCC6,0xCC2,0xCD5},157 {0xD4A, 0xD46,0xD3E,0x0}, {0xD4B,0xD47,0xD3E,0x0}, {0xD4C,0xD46,0xD57,0x0},158 {0xE33, 0xE4D,0xE32,0x0}, {0xEB3,0xECD,0xEB2,0x0}, {0xF43,0xF42,0xFB7,0x0},159 {0xF4D, 0xF4C,0xFB7,0x0}, {0xF52,0xF51,0xFB7,0x0}, {0xF57,0xF56,0xFB7,0x0},160 {0xF5C, 0xF5B,0xFB7,0x0}, {0xF69,0xF40,0xFB5,0x0}, {0xF73,0xF72,0xF71,0x0},161 {0xF75, 0xF71,0xF74,0x0}, {0xF76,0xFB2,0xF80,0x0}, {0xF77,0xF76,0xF71,0x0},162 {0xF78, 0xFB3,0xF80,0x0}, {0xF79,0xF78,0xF71,0x0}, {0xF81,0xF80,0xF71,0x0},163 {0xF93, 0xF92,0xFB7,0x0}, {0xF9D,0xF9C,0xFB7,0x0}, {0xFA2,0xFA1,0xFB7,0x0},164 {0xFA7, 0xFA6,0xFB7,0x0}, {0xFAC,0xFAB,0xFB7,0x0}, {0xFB9,0xF90,0xFB5,0x0},165 {0x1E00, 0x41,0x325,0x0}, {0x1E01,0x61,0x325,0x0}, {0x1E02,0x42,0x307,0x0},166 {0x1E03, 0x62,0x307,0x0}, {0x1E04,0x42,0x323,0x0}, {0x1E05,0x62,0x323,0x0},167 {0x1E06, 0x42,0x331,0x0}, {0x1E07,0x62,0x331,0x0}, {0x1E08,0xC7,0x301,0x0},168 {0x1E09, 0xE7,0x301,0x0}, {0x1E0A,0x44,0x307,0x0}, {0x1E0B,0x64,0x307,0x0},169 {0x1E0C, 0x44,0x323,0x0}, {0x1E0D,0x64,0x323,0x0}, {0x1E0E,0x44,0x331,0x0},170 {0x1E0F, 0x64,0x331,0x0}, {0x1E10,0x44,0x327,0x0}, {0x1E11,0x64,0x327,0x0},171 {0x1E12, 0x44,0x32D,0x0}, {0x1E13,0x64,0x32D,0x0}, {0x1E14,0x112,0x300,0x0},172 {0x1E15, 0x113,0x300,0x0}, {0x1E16,0x112,0x301,0x0}, {0x1E17,0x113,0x301,0x0},173 {0x1E18, 0x45,0x32D,0x0}, {0x1E19,0x65,0x32D,0x0}, {0x1E1A,0x45,0x330,0x0},174 {0x1E1B, 0x65,0x330,0x0}, {0x1E1C,0x114,0x327,0x0}, {0x1E1D,0x115,0x327,0x0},175 {0x1E1E, 0x46,0x307,0x0}, {0x1E1F,0x66,0x307,0x0}, {0x1E20,0x47,0x304,0x0},176 {0x1E21, 0x67,0x304,0x0}, {0x1E22,0x48,0x307,0x0}, {0x1E23,0x68,0x307,0x0},177 {0x1E24, 0x48,0x323,0x0}, {0x1E25,0x68,0x323,0x0}, {0x1E26,0x48,0x308,0x0},178 {0x1E27, 0x68,0x308,0x0}, {0x1E28,0x48,0x327,0x0}, {0x1E29,0x68,0x327,0x0},179 {0x1E2A, 0x48,0x32E,0x0}, {0x1E2B,0x68,0x32E,0x0}, {0x1E2C,0x49,0x330,0x0},180 {0x1E2D, 0x69,0x330,0x0}, {0x1E2E,0xCF,0x301,0x0}, {0x1E2F,0xEF,0x301,0x0},181 {0x1E30, 0x4B,0x301,0x0}, {0x1E31,0x6B,0x301,0x0}, {0x1E32,0x4B,0x323,0x0},182 {0x1E33, 0x6B,0x323,0x0}, {0x1E34,0x4B,0x331,0x0}, {0x1E35,0x6B,0x331,0x0},183 {0x1E36, 0x4C,0x323,0x0}, {0x1E37,0x6C,0x323,0x0}, {0x1E38,0x1E36,0x304,0x0},184 {0x1E39, 0x1E37,0x304,0x0}, {0x1E3A,0x4C,0x331,0x0}, {0x1E3B,0x6C,0x331,0x0},185 {0x1E3C, 0x4C,0x32D,0x0}, {0x1E3D,0x6C,0x32D,0x0}, {0x1E3E,0x4D,0x301,0x0},186 {0x1E3F, 0x6D,0x301,0x0}, {0x1E40,0x4D,0x307,0x0}, {0x1E41,0x6D,0x307,0x0},187 {0x1E42, 0x4D,0x323,0x0}, {0x1E43,0x6D,0x323,0x0}, {0x1E44,0x4E,0x307,0x0},188 {0x1E45, 0x6E,0x307,0x0}, {0x1E46,0x4E,0x323,0x0}, {0x1E47,0x6E,0x323,0x0},189 {0x1E48, 0x4E,0x331,0x0}, {0x1E49,0x6E,0x331,0x0}, {0x1E4A,0x4E,0x32D,0x0},190 {0x1E4B, 0x6E,0x32D,0x0}, {0x1E4C,0xD5,0x301,0x0}, {0x1E4D,0xF5,0x301,0x0},191 {0x1E4E, 0xD5,0x308,0x0}, {0x1E4F,0xF5,0x308,0x0}, {0x1E50,0x14C,0x300,0x0},192 {0x1E51, 0x14D,0x300,0x0}, {0x1E52,0x14C,0x301,0x0}, {0x1E53,0x14D,0x301,0x0},193 {0x1E54, 0x50,0x301,0x0}, {0x1E55,0x70,0x301,0x0}, {0x1E56,0x50,0x307,0x0},194 {0x1E57, 0x70,0x307,0x0}, {0x1E58,0x52,0x307,0x0}, {0x1E59,0x72,0x307,0x0},195 {0x1E5A, 0x52,0x323,0x0}, {0x1E5B,0x72,0x323,0x0}, {0x1E5C,0x1E5A,0x304,0x0},196 {0x1E5D, 0x1E5B,0x304,0x0}, {0x1E5E,0x52,0x331,0x0}, {0x1E5F,0x72,0x331,0x0},197 {0x1E60, 0x53,0x307,0x0}, {0x1E61,0x73,0x307,0x0}, {0x1E62,0x53,0x323,0x0},198 {0x1E63, 0x73,0x323,0x0}, {0x1E64,0x15A,0x307,0x0}, {0x1E65,0x15B,0x307,0x0},199 {0x1E66, 0x160,0x307,0x0}, {0x1E67,0x161,0x307,0x0}, {0x1E68,0x1E62,0x307,0x0},200 {0x1E69, 0x1E63,0x307,0x0}, {0x1E6A,0x54,0x307,0x0}, {0x1E6B,0x74,0x307,0x0},201 {0x1E6C, 0x54,0x323,0x0}, {0x1E6D,0x74,0x323,0x0}, {0x1E6E,0x54,0x331,0x0},202 {0x1E6F, 0x74,0x331,0x0}, {0x1E70,0x54,0x32D,0x0}, {0x1E71,0x74,0x32D,0x0},203 {0x1E72, 0x55,0x324,0x0}, {0x1E73,0x75,0x324,0x0}, {0x1E74,0x55,0x330,0x0},204 {0x1E75, 0x75,0x330,0x0}, {0x1E76,0x55,0x32D,0x0}, {0x1E77,0x75,0x32D,0x0},205 {0x1E78, 0x168,0x301,0x0}, {0x1E79,0x169,0x301,0x0}, {0x1E7A,0x16A,0x308,0x0},206 {0x1E7B, 0x16B,0x308,0x0}, {0x1E7C,0x56,0x303,0x0}, {0x1E7D,0x76,0x303,0x0},207 {0x1E7E, 0x56,0x323,0x0}, {0x1E7F,0x76,0x323,0x0}, {0x1E80,0x57,0x300,0x0},208 {0x1E81, 0x77,0x300,0x0}, {0x1E82,0x57,0x301,0x0}, {0x1E83,0x77,0x301,0x0},209 {0x1E84, 0x57,0x308,0x0}, {0x1E85,0x77,0x308,0x0}, {0x1E86,0x57,0x307,0x0},210 {0x1E87, 0x77,0x307,0x0}, {0x1E88,0x57,0x323,0x0}, {0x1E89,0x77,0x323,0x0},211 {0x1E8A, 0x58,0x307,0x0}, {0x1E8B,0x78,0x307,0x0}, {0x1E8C,0x58,0x308,0x0},212 {0x1E8D, 0x78,0x308,0x0}, {0x1E8E,0x59,0x307,0x0}, {0x1E8F,0x79,0x307,0x0},213 {0x1E90, 0x5A,0x302,0x0}, {0x1E91,0x7A,0x302,0x0}, {0x1E92,0x5A,0x323,0x0},214 {0x1E93, 0x7A,0x323,0x0}, {0x1E94,0x5A,0x331,0x0}, {0x1E95,0x7A,0x331,0x0},215 {0x1E96, 0x68,0x331,0x0}, {0x1E97,0x74,0x308,0x0}, {0x1E98,0x77,0x30A,0x0},216 {0x1E99, 0x79,0x30A,0x0}, {0x1E9B,0x17F,0x307,0x0}, {0x1EA0,0x41,0x323,0x0},217 {0x1EA1, 0x61,0x323,0x0}, {0x1EA2,0x41,0x309,0x0}, {0x1EA3,0x61,0x309,0x0},218 {0x1EA4, 0xC2,0x301,0x0}, {0x1EA5,0xE2,0x301,0x0}, {0x1EA6,0xC2,0x300,0x0},219 {0x1EA7, 0xE2,0x300,0x0}, {0x1EA8,0xC2,0x309,0x0}, {0x1EA9,0xE2,0x309,0x0},220 {0x1EAA, 0xC2,0x303,0x0}, {0x1EAB,0xE2,0x303,0x0}, {0x1EAC,0xC2,0x323,0x0},221 {0x1EAD, 0xE2,0x323,0x0}, {0x1EAE,0x102,0x301,0x0}, {0x1EAF,0x103,0x301,0x0},222 {0x1EB0, 0x102,0x300,0x0}, {0x1EB1,0x103,0x300,0x0}, {0x1EB2,0x102,0x309,0x0},223 {0x1EB3, 0x103,0x309,0x0}, {0x1EB4,0x102,0x303,0x0}, {0x1EB5,0x103,0x303,0x0},224 {0x1EB6, 0x102,0x323,0x0}, {0x1EB7,0x103,0x323,0x0}, {0x1EB8,0x45,0x323,0x0},225 {0x1EB9, 0x65,0x323,0x0}, {0x1EBA,0x45,0x309,0x0}, {0x1EBB,0x65,0x309,0x0},226 {0x1EBC, 0x45,0x303,0x0}, {0x1EBD,0x65,0x303,0x0}, {0x1EBE,0xCA,0x301,0x0},227 {0x1EBF, 0xEA,0x301,0x0}, {0x1EC0,0xCA,0x300,0x0}, {0x1EC1,0xEA,0x300,0x0},228 {0x1EC2, 0xCA,0x309,0x0}, {0x1EC3,0xEA,0x309,0x0}, {0x1EC4,0xCA,0x303,0x0},229 {0x1EC5, 0xEA,0x303,0x0}, {0x1EC6,0xCA,0x323,0x0}, {0x1EC7,0xEA,0x323,0x0},230 {0x1EC8, 0x49,0x309,0x0}, {0x1EC9,0x69,0x309,0x0}, {0x1ECA,0x49,0x323,0x0},231 {0x1ECB, 0x69,0x323,0x0}, {0x1ECC,0x4F,0x323,0x0}, {0x1ECD,0x6F,0x323,0x0},232 {0x1ECE, 0x4F,0x309,0x0}, {0x1ECF,0x6F,0x309,0x0}, {0x1ED0,0xD4,0x301,0x0},233 {0x1ED1, 0xF4,0x301,0x0}, {0x1ED2,0xD4,0x300,0x0}, {0x1ED3,0xF4,0x300,0x0},234 {0x1ED4, 0xD4,0x309,0x0}, {0x1ED5,0xF4,0x309,0x0}, {0x1ED6,0xD4,0x303,0x0},235 {0x1ED7, 0xF4,0x303,0x0}, {0x1ED8,0xD4,0x323,0x0}, {0x1ED9,0xF4,0x323,0x0},236 {0x1EDA, 0x1A0,0x301,0x0}, {0x1EDB,0x1A1,0x301,0x0}, {0x1EDC,0x1A0,0x300,0x0},237 {0x1EDD, 0x1A1,0x300,0x0}, {0x1EDE,0x1A0,0x309,0x0}, {0x1EDF,0x1A1,0x309,0x0},238 {0x1EE0, 0x1A0,0x303,0x0}, {0x1EE1,0x1A1,0x303,0x0}, {0x1EE2,0x1A0,0x323,0x0},239 {0x1EE3, 0x1A1,0x323,0x0}, {0x1EE4,0x55,0x323,0x0}, {0x1EE5,0x75,0x323,0x0},240 {0x1EE6, 0x55,0x309,0x0}, {0x1EE7,0x75,0x309,0x0}, {0x1EE8,0x1AF,0x301,0x0},241 {0x1EE9, 0x1B0,0x301,0x0}, {0x1EEA,0x1AF,0x300,0x0}, {0x1EEB,0x1B0,0x300,0x0},242 {0x1EEC, 0x1AF,0x309,0x0}, {0x1EED,0x1B0,0x309,0x0}, {0x1EEE,0x1AF,0x303,0x0},243 {0x1EEF, 0x1B0,0x303,0x0}, {0x1EF0,0x1AF,0x323,0x0}, {0x1EF1,0x1B0,0x323,0x0},244 {0x1EF2, 0x59,0x300,0x0}, {0x1EF3,0x79,0x300,0x0}, {0x1EF4,0x59,0x323,0x0},245 {0x1EF5, 0x79,0x323,0x0}, {0x1EF6,0x59,0x309,0x0}, {0x1EF7,0x79,0x309,0x0},246 {0x1EF8, 0x59,0x303,0x0}, {0x1EF9,0x79,0x303,0x0}, {0x1F00,0x3B1,0x313,0x0},247 {0x1F01, 0x3B1,0x314,0x0}, {0x1F02,0x1F00,0x300,0x0}, {0x1F03,0x1F01,0x300,0x0},248 {0x1F04, 0x1F00,0x301,0x0}, {0x1F05,0x1F01,0x301,0x0}, {0x1F06,0x1F00,0x342,0x0},249 {0x1F07, 0x1F01,0x342,0x0}, {0x1F08,0x391,0x313,0x0}, {0x1F09,0x391,0x314,0x0},250 {0x1F0A, 0x1F08,0x300,0x0}, {0x1F0B,0x1F09,0x300,0x0}, {0x1F0C,0x1F08,0x301,0x0},251 {0x1F0D, 0x1F09,0x301,0x0}, {0x1F0E,0x1F08,0x342,0x0}, {0x1F0F,0x1F09,0x342,0x0},252 {0x1F10, 0x3B5,0x313,0x0}, {0x1F11,0x3B5,0x314,0x0}, {0x1F12,0x1F10,0x300,0x0},253 {0x1F13, 0x1F11,0x300,0x0}, {0x1F14,0x1F10,0x301,0x0}, {0x1F15,0x1F11,0x301,0x0},254 {0x1F18, 0x395,0x313,0x0}, {0x1F19,0x395,0x314,0x0}, {0x1F1A,0x1F18,0x300,0x0},255 {0x1F1B, 0x1F19,0x300,0x0}, {0x1F1C,0x1F18,0x301,0x0}, {0x1F1D,0x1F19,0x301,0x0},256 {0x1F20, 0x3B7,0x313,0x0}, {0x1F21,0x3B7,0x314,0x0}, {0x1F22,0x1F20,0x300,0x0},257 {0x1F23, 0x1F21,0x300,0x0}, {0x1F24,0x1F20,0x301,0x0}, {0x1F25,0x1F21,0x301,0x0},258 {0x1F26, 0x1F20,0x342,0x0}, {0x1F27,0x1F21,0x342,0x0}, {0x1F28,0x397,0x313,0x0},259 {0x1F29, 0x397,0x314,0x0}, {0x1F2A,0x1F28,0x300,0x0}, {0x1F2B,0x1F29,0x300,0x0},260 {0x1F2C, 0x1F28,0x301,0x0}, {0x1F2D,0x1F29,0x301,0x0}, {0x1F2E,0x1F28,0x342,0x0},261 {0x1F2F, 0x1F29,0x342,0x0}, {0x1F30,0x3B9,0x313,0x0}, {0x1F31,0x3B9,0x314,0x0},262 {0x1F32, 0x1F30,0x300,0x0}, {0x1F33,0x1F31,0x300,0x0}, {0x1F34,0x1F30,0x301,0x0},263 {0x1F35, 0x1F31,0x301,0x0}, {0x1F36,0x1F30,0x342,0x0}, {0x1F37,0x1F31,0x342,0x0},264 {0x1F38, 0x399,0x313,0x0}, {0x1F39,0x399,0x314,0x0}, {0x1F3A,0x1F38,0x300,0x0},265 {0x1F3B, 0x1F39,0x300,0x0}, {0x1F3C,0x1F38,0x301,0x0}, {0x1F3D,0x1F39,0x301,0x0},266 {0x1F3E, 0x1F38,0x342,0x0}, {0x1F3F,0x1F39,0x342,0x0}, {0x1F40,0x3BF,0x313,0x0},267 {0x1F41, 0x3BF,0x314,0x0}, {0x1F42,0x1F40,0x300,0x0}, {0x1F43,0x1F41,0x300,0x0},268 {0x1F44, 0x1F40,0x301,0x0}, {0x1F45,0x1F41,0x301,0x0}, {0x1F48,0x39F,0x313,0x0},269 {0x1F49, 0x39F,0x314,0x0}, {0x1F4A,0x1F48,0x300,0x0}, {0x1F4B,0x1F49,0x300,0x0},270 {0x1F4C, 0x1F48,0x301,0x0}, {0x1F4D,0x1F49,0x301,0x0}, {0x1F50,0x3C5,0x313,0x0},271 {0x1F51, 0x3C5,0x314,0x0}, {0x1F52,0x1F50,0x300,0x0}, {0x1F53,0x1F51,0x300,0x0},272 {0x1F54, 0x1F50,0x301,0x0}, {0x1F55,0x1F51,0x301,0x0}, {0x1F56,0x1F50,0x342,0x0},273 {0x1F57, 0x1F51,0x342,0x0}, {0x1F59,0x3A5,0x314,0x0}, {0x1F5B,0x1F59,0x300,0x0},274 {0x1F5D, 0x1F59,0x301,0x0}, {0x1F5F,0x1F59,0x342,0x0}, {0x1F60,0x3C9,0x313,0x0},275 {0x1F61, 0x3C9,0x314,0x0}, {0x1F62,0x1F60,0x300,0x0}, {0x1F63,0x1F61,0x300,0x0},276 {0x1F64, 0x1F60,0x301,0x0}, {0x1F65,0x1F61,0x301,0x0}, {0x1F66,0x1F60,0x342,0x0},277 {0x1F67, 0x1F61,0x342,0x0}, {0x1F68,0x3A9,0x313,0x0}, {0x1F69,0x3A9,0x314,0x0},278 {0x1F6A, 0x1F68,0x300,0x0}, {0x1F6B,0x1F69,0x300,0x0}, {0x1F6C,0x1F68,0x301,0x0},279 {0x1F6D, 0x1F69,0x301,0x0}, {0x1F6E,0x1F68,0x342,0x0}, {0x1F6F,0x1F69,0x342,0x0},280 {0x1F70, 0x3B1,0x300,0x0}, {0x1F71,0x3B1,0x301,0x0}, {0x1F72,0x3B5,0x300,0x0},281 {0x1F73, 0x3B5,0x301,0x0}, {0x1F74,0x3B7,0x300,0x0}, {0x1F75,0x3B7,0x301,0x0},282 {0x1F76, 0x3B9,0x300,0x0}, {0x1F77,0x3B9,0x301,0x0}, {0x1F78,0x3BF,0x300,0x0},283 {0x1F79, 0x3BF,0x301,0x0}, {0x1F7A,0x3C5,0x300,0x0}, {0x1F7B,0x3C5,0x301,0x0},284 {0x1F7C, 0x3C9,0x300,0x0}, {0x1F7D,0x3C9,0x301,0x0}, {0x1F80,0x1F00,0x345,0x0},285 {0x1F81, 0x1F01,0x345,0x0}, {0x1F82,0x1F02,0x345,0x0}, {0x1F83,0x1F03,0x345,0x0},286 {0x1F84, 0x1F04,0x345,0x0}, {0x1F85,0x1F05,0x345,0x0}, {0x1F86,0x1F06,0x345,0x0},287 {0x1F87, 0x1F07,0x345,0x0}, {0x1F88,0x1F08,0x345,0x0}, {0x1F89,0x1F09,0x345,0x0},288 {0x1F8A, 0x1F0A,0x345,0x0}, {0x1F8B,0x1F0B,0x345,0x0}, {0x1F8C,0x1F0C,0x345,0x0},289 {0x1F8D, 0x1F0D,0x345,0x0}, {0x1F8E,0x1F0E,0x345,0x0}, {0x1F8F,0x1F0F,0x345,0x0},290 {0x1F90, 0x1F20,0x345,0x0}, {0x1F91,0x1F21,0x345,0x0}, {0x1F92,0x1F22,0x345,0x0},291 {0x1F93, 0x1F23,0x345,0x0}, {0x1F94,0x1F24,0x345,0x0}, {0x1F95,0x1F25,0x345,0x0},292 {0x1F96, 0x1F26,0x345,0x0}, {0x1F97,0x1F27,0x345,0x0}, {0x1F98,0x1F28,0x345,0x0},293 {0x1F99, 0x1F29,0x345,0x0}, {0x1F9A,0x1F2A,0x345,0x0}, {0x1F9B,0x1F2B,0x345,0x0},294 {0x1F9C, 0x1F2C,0x345,0x0}, {0x1F9D,0x1F2D,0x345,0x0}, {0x1F9E,0x1F2E,0x345,0x0},295 {0x1F9F, 0x1F2F,0x345,0x0}, {0x1FA0,0x1F60,0x345,0x0}, {0x1FA1,0x1F61,0x345,0x0},296 {0x1FA2, 0x1F62,0x345,0x0}, {0x1FA3,0x1F63,0x345,0x0}, {0x1FA4,0x1F64,0x345,0x0},297 {0x1FA5, 0x1F65,0x345,0x0}, {0x1FA6,0x1F66,0x345,0x0}, {0x1FA7,0x1F67,0x345,0x0},298 {0x1FA8, 0x1F68,0x345,0x0}, {0x1FA9,0x1F69,0x345,0x0}, {0x1FAA,0x1F6A,0x345,0x0},299 {0x1FAB, 0x1F6B,0x345,0x0}, {0x1FAC,0x1F6C,0x345,0x0}, {0x1FAD,0x1F6D,0x345,0x0},300 {0x1FAE, 0x1F6E,0x345,0x0}, {0x1FAF,0x1F6F,0x345,0x0}, {0x1FB0,0x3B1,0x306,0x0},301 {0x1FB1, 0x3B1,0x304,0x0}, {0x1FB2,0x1F70,0x345,0x0}, {0x1FB3,0x3B1,0x345,0x0},302 {0x1FB4, 0x1F71,0x345,0x0}, {0x1FB6,0x3B1,0x342,0x0}, {0x1FB7,0x1FB6,0x345,0x0},303 {0x1FB8, 0x391,0x306,0x0}, {0x1FB9,0x391,0x304,0x0}, {0x1FBA,0x391,0x300,0x0},304 {0x1FBB, 0x391,0x301,0x0}, {0x1FBC,0x391,0x345,0x0}, {0x1FBE,0x3B9,0x0,0x0},305 {0x1FC1, 0xA8,0x342,0x0}, {0x1FC2,0x1F74,0x345,0x0}, {0x1FC3,0x3B7,0x345,0x0},306 {0x1FC4, 0x1F75,0x345,0x0}, {0x1FC6,0x3B7,0x342,0x0}, {0x1FC7,0x1FC6,0x345,0x0},307 {0x1FC8, 0x395,0x300,0x0}, {0x1FC9,0x395,0x301,0x0}, {0x1FCA,0x397,0x300,0x0},308 {0x1FCB, 0x397,0x301,0x0}, {0x1FCC,0x397,0x345,0x0}, {0x1FCD,0x1FBF,0x300,0x0},309 {0x1FCE, 0x1FBF,0x301,0x0}, {0x1FCF,0x1FBF,0x342,0x0}, {0x1FD0,0x3B9,0x306,0x0},310 {0x1FD1, 0x3B9,0x304,0x0}, {0x1FD2,0x3CA,0x300,0x0}, {0x1FD3,0x3CA,0x301,0x0},311 {0x1FD6, 0x3B9,0x342,0x0}, {0x1FD7,0x3CA,0x342,0x0}, {0x1FD8,0x399,0x306,0x0},312 {0x1FD9, 0x399,0x304,0x0}, {0x1FDA,0x399,0x300,0x0}, {0x1FDB,0x399,0x301,0x0},313 {0x1FDD, 0x1FFE,0x300,0x0}, {0x1FDE,0x1FFE,0x301,0x0}, {0x1FDF,0x1FFE,0x342,0x0},314 {0x1FE0, 0x3C5,0x306,0x0}, {0x1FE1,0x3C5,0x304,0x0}, {0x1FE2,0x3CB,0x300,0x0},315 {0x1FE3, 0x3CB,0x301,0x0}, {0x1FE4,0x3C1,0x313,0x0}, {0x1FE5,0x3C1,0x314,0x0},316 {0x1FE6, 0x3C5,0x342,0x0}, {0x1FE7,0x3CB,0x342,0x0}, {0x1FE8,0x3A5,0x306,0x0},317 {0x1FE9, 0x3A5,0x304,0x0}, {0x1FEA,0x3A5,0x300,0x0}, {0x1FEB,0x3A5,0x301,0x0},318 {0x1FEC, 0x3A1,0x314,0x0}, {0x1FED,0xA8,0x300,0x0}, {0x1FEE,0xA8,0x301,0x0},319 {0x1FEF, 0x60,0x0,0x0}, {0x1FF2,0x1F7C,0x345,0x0}, {0x1FF3,0x3C9,0x345,0x0},320 {0x1FF4, 0x1F79,0x345,0x0}, {0x1FF6,0x3C9,0x342,0x0}, {0x1FF7,0x1FF6,0x345,0x0},321 {0x1FF8, 0x39F,0x300,0x0}, {0x1FF9,0x39F,0x301,0x0}, {0x1FFA,0x3A9,0x300,0x0},322 {0x1FFB, 0x3A9,0x301,0x0}, {0x1FFC,0x3A9,0x345,0x0}, {0x1FFD,0xB4,0x0,0x0},323 {0x2000, 0x2002,0x0,0x0}, {0x2001,0x2003,0x0,0x0}, {0x2126,0x3A9,0x0,0x0},324 {0x212A, 0x4B,0x0,0x0}, {0x212B,0xC5,0x0,0x0}, {0x2204,0x2203,0x338,0x0},325 {0x2209, 0x2208,0x338,0x0}, {0x220C,0x220B,0x338,0x0}, {0x2224,0x2223,0x338,0x0},326 {0x2226, 0x2225,0x338,0x0}, {0x2241,0x7E,0x338,0x0}, {0x2244,0x2243,0x338,0x0},327 {0x2247, 0x2245,0x338,0x0}, {0x2249,0x2248,0x338,0x0}, {0x2260,0x3D,0x338,0x0},328 {0x2262, 0x2261,0x338,0x0}, {0x226D,0x224D,0x338,0x0}, {0x226E,0x3C,0x338,0x0},329 {0x226F, 0x3E,0x338,0x0}, {0x2270,0x2264,0x338,0x0}, {0x2271,0x2265,0x338,0x0},330 {0x2274, 0x2272,0x338,0x0}, {0x2275,0x2273,0x338,0x0}, {0x2278,0x2276,0x338,0x0},331 {0x2279, 0x2277,0x338,0x0}, {0x2280,0x227A,0x338,0x0}, {0x2281,0x227B,0x338,0x0},332 {0x2284, 0x2282,0x338,0x0}, {0x2285,0x2283,0x338,0x0}, {0x2288,0x2286,0x338,0x0},333 {0x2289, 0x2287,0x338,0x0}, {0x22AC,0x22A2,0x338,0x0}, {0x22AD,0x22A8,0x338,0x0},334 {0x22AE, 0x22A9,0x338,0x0}, {0x22AF,0x22AB,0x338,0x0}, {0x22E0,0x227C,0x338,0x0},335 {0x22E1, 0x227D,0x338,0x0}, {0x22E2,0x2291,0x338,0x0}, {0x22E3,0x2292,0x338,0x0},336 {0x22EA, 0x22B2,0x338,0x0}, {0x22EB,0x22B3,0x338,0x0}, {0x22EC,0x22B4,0x338,0x0},337 {0x22ED, 0x22B5,0x338,0x0}, {0x2329,0x3008,0x0,0x0}, {0x232A,0x3009,0x0,0x0},338 {0x304C, 0x304B,0x3099,0x0}, {0x304E,0x304D,0x3099,0x0}, {0x3050,0x304F,0x3099,0x0},339 {0x3052, 0x3051,0x3099,0x0}, {0x3054,0x3053,0x3099,0x0}, {0x3056,0x3055,0x3099,0x0},340 {0x3058, 0x3057,0x3099,0x0}, {0x305A,0x3059,0x3099,0x0}, {0x305C,0x305B,0x3099,0x0},341 {0x305E, 0x305D,0x3099,0x0}, {0x3060,0x305F,0x3099,0x0}, {0x3062,0x3061,0x3099,0x0},342 {0x3065, 0x3064,0x3099,0x0}, {0x3067,0x3066,0x3099,0x0}, {0x3069,0x3068,0x3099,0x0},343 {0x3070, 0x306F,0x3099,0x0}, {0x3071,0x306F,0x309A,0x0}, {0x3073,0x3072,0x3099,0x0},344 {0x3074, 0x3072,0x309A,0x0}, {0x3076,0x3075,0x3099,0x0}, {0x3077,0x3075,0x309A,0x0},345 {0x3079, 0x3078,0x3099,0x0}, {0x307A,0x3078,0x309A,0x0}, {0x307C,0x307B,0x3099,0x0},346 {0x307D, 0x307B,0x309A,0x0}, {0x3094,0x3046,0x3099,0x0}, {0x309E,0x309D,0x3099,0x0},347 {0x30AC, 0x30AB,0x3099,0x0}, {0x30AE,0x30AD,0x3099,0x0}, {0x30B0,0x30AF,0x3099,0x0},348 {0x30B2, 0x30B1,0x3099,0x0}, {0x30B4,0x30B3,0x3099,0x0}, {0x30B6,0x30B5,0x3099,0x0},349 {0x30B8, 0x30B7,0x3099,0x0}, {0x30BA,0x30B9,0x3099,0x0}, {0x30BC,0x30BB,0x3099,0x0},350 {0x30BE, 0x30BD,0x3099,0x0}, {0x30C0,0x30BF,0x3099,0x0}, {0x30C2,0x30C1,0x3099,0x0},351 {0x30C5, 0x30C4,0x3099,0x0}, {0x30C7,0x30C6,0x3099,0x0}, {0x30C9,0x30C8,0x3099,0x0},352 {0x30D0, 0x30CF,0x3099,0x0}, {0x30D1,0x30CF,0x309A,0x0}, {0x30D3,0x30D2,0x3099,0x0},353 {0x30D4, 0x30D2,0x309A,0x0}, {0x30D6,0x30D5,0x3099,0x0}, {0x30D7,0x30D5,0x309A,0x0},354 {0x30D9, 0x30D8,0x3099,0x0}, {0x30DA,0x30D8,0x309A,0x0}, {0x30DC,0x30DB,0x3099,0x0},355 {0x30DD, 0x30DB,0x309A,0x0}, {0x30F4,0x30A6,0x3099,0x0}, {0x30F7,0x30EF,0x3099,0x0},356 {0x30F8, 0x30F0,0x3099,0x0}, {0x30F9,0x30F1,0x3099,0x0}, {0x30FA,0x30F2,0x3099,0x0},357 {0x30FE, 0x30FD,0x3099,0x0}, {0xF900,0x8C48,0x0,0x0}, {0xF901,0x66F4,0x0,0x0},358 {0xF902, 0x8ECA,0x0,0x0}, {0xF903,0x8CC8,0x0,0x0}, {0xF904,0x6ED1,0x0,0x0},359 {0xF905, 0x4E32,0x0,0x0}, {0xF906,0x53E5,0x0,0x0}, {0xF907,0x9F9C,0x0,0x0},360 {0xF908, 0x9F9C,0x0,0x0}, {0xF909,0x5951,0x0,0x0}, {0xF90A,0x91D1,0x0,0x0},361 {0xF90B, 0x5587,0x0,0x0}, {0xF90C,0x5948,0x0,0x0}, {0xF90D,0x61F6,0x0,0x0},362 {0xF90E, 0x7669,0x0,0x0}, {0xF90F,0x7F85,0x0,0x0}, {0xF910,0x863F,0x0,0x0},363 {0xF911, 0x87BA,0x0,0x0}, {0xF912,0x88F8,0x0,0x0}, {0xF913,0x908F,0x0,0x0},364 {0xF914, 0x6A02,0x0,0x0}, {0xF915,0x6D1B,0x0,0x0}, {0xF916,0x70D9,0x0,0x0},365 {0xF917, 0x73DE,0x0,0x0}, {0xF918,0x843D,0x0,0x0}, {0xF919,0x916A,0x0,0x0},366 {0xF91A, 0x99F1,0x0,0x0}, {0xF91B,0x4E82,0x0,0x0}, {0xF91C,0x5375,0x0,0x0},367 {0xF91D, 0x6B04,0x0,0x0}, {0xF91E,0x721B,0x0,0x0}, {0xF91F,0x862D,0x0,0x0},368 {0xF920, 0x9E1E,0x0,0x0}, {0xF921,0x5D50,0x0,0x0}, {0xF922,0x6FEB,0x0,0x0},369 {0xF923, 0x85CD,0x0,0x0}, {0xF924,0x8964,0x0,0x0}, {0xF925,0x62C9,0x0,0x0},370 {0xF926, 0x81D8,0x0,0x0}, {0xF927,0x881F,0x0,0x0}, {0xF928,0x5ECA,0x0,0x0},371 {0xF929, 0x6717,0x0,0x0}, {0xF92A,0x6D6A,0x0,0x0}, {0xF92B,0x72FC,0x0,0x0},372 {0xF92C, 0x90CE,0x0,0x0}, {0xF92D,0x4F86,0x0,0x0}, {0xF92E,0x51B7,0x0,0x0},373 {0xF92F, 0x52DE,0x0,0x0}, {0xF930,0x64C4,0x0,0x0}, {0xF931,0x6AD3,0x0,0x0},374 {0xF932, 0x7210,0x0,0x0}, {0xF933,0x76E7,0x0,0x0}, {0xF934,0x8001,0x0,0x0},375 {0xF935, 0x8606,0x0,0x0}, {0xF936,0x865C,0x0,0x0}, {0xF937,0x8DEF,0x0,0x0},376 {0xF938, 0x9732,0x0,0x0}, {0xF939,0x9B6F,0x0,0x0}, {0xF93A,0x9DFA,0x0,0x0},377 {0xF93B, 0x788C,0x0,0x0}, {0xF93C,0x797F,0x0,0x0}, {0xF93D,0x7DA0,0x0,0x0},378 {0xF93E, 0x83C9,0x0,0x0}, {0xF93F,0x9304,0x0,0x0}, {0xF940,0x9E7F,0x0,0x0},379 {0xF941, 0x8AD6,0x0,0x0}, {0xF942,0x58DF,0x0,0x0}, {0xF943,0x5F04,0x0,0x0},380 {0xF944, 0x7C60,0x0,0x0}, {0xF945,0x807E,0x0,0x0}, {0xF946,0x7262,0x0,0x0},381 {0xF947, 0x78CA,0x0,0x0}, {0xF948,0x8CC2,0x0,0x0}, {0xF949,0x96F7,0x0,0x0},382 {0xF94A, 0x58D8,0x0,0x0}, {0xF94B,0x5C62,0x0,0x0}, {0xF94C,0x6A13,0x0,0x0},383 {0xF94D, 0x6DDA,0x0,0x0}, {0xF94E,0x6F0F,0x0,0x0}, {0xF94F,0x7D2F,0x0,0x0},384 {0xF950, 0x7E37,0x0,0x0}, {0xF951,0x96FB,0x0,0x0}, {0xF952,0x52D2,0x0,0x0},385 {0xF953, 0x808B,0x0,0x0}, {0xF954,0x51DC,0x0,0x0}, {0xF955,0x51CC,0x0,0x0},386 {0xF956, 0x7A1C,0x0,0x0}, {0xF957,0x7DBE,0x0,0x0}, {0xF958,0x83F1,0x0,0x0},387 {0xF959, 0x9675,0x0,0x0}, {0xF95A,0x8B80,0x0,0x0}, {0xF95B,0x62CF,0x0,0x0},388 {0xF95C, 0x6A02,0x0,0x0}, {0xF95D,0x8AFE,0x0,0x0}, {0xF95E,0x4E39,0x0,0x0},389 {0xF95F, 0x5BE7,0x0,0x0}, {0xF960,0x6012,0x0,0x0}, {0xF961,0x7387,0x0,0x0},390 {0xF962, 0x7570,0x0,0x0}, {0xF963,0x5317,0x0,0x0}, {0xF964,0x78FB,0x0,0x0},391 {0xF965, 0x4FBF,0x0,0x0}, {0xF966,0x5FA9,0x0,0x0}, {0xF967,0x4E0D,0x0,0x0},392 {0xF968, 0x6CCC,0x0,0x0}, {0xF969,0x6578,0x0,0x0}, {0xF96A,0x7D22,0x0,0x0},393 {0xF96B, 0x53C3,0x0,0x0}, {0xF96C,0x585E,0x0,0x0}, {0xF96D,0x7701,0x0,0x0},394 {0xF96E, 0x8449,0x0,0x0}, {0xF96F,0x8AAA,0x0,0x0}, {0xF970,0x6BBA,0x0,0x0},395 {0xF971, 0x8FB0,0x0,0x0}, {0xF972,0x6C88,0x0,0x0}, {0xF973,0x62FE,0x0,0x0},396 {0xF974, 0x82E5,0x0,0x0}, {0xF975,0x63A0,0x0,0x0}, {0xF976,0x7565,0x0,0x0},397 {0xF977, 0x4EAE,0x0,0x0}, {0xF978,0x5169,0x0,0x0}, {0xF979,0x51C9,0x0,0x0},398 {0xF97A, 0x6881,0x0,0x0}, {0xF97B,0x7CE7,0x0,0x0}, {0xF97C,0x826F,0x0,0x0},399 {0xF97D, 0x8AD2,0x0,0x0}, {0xF97E,0x91CF,0x0,0x0}, {0xF97F,0x52F5,0x0,0x0},400 {0xF980, 0x5442,0x0,0x0}, {0xF981,0x5973,0x0,0x0}, {0xF982,0x5EEC,0x0,0x0},401 {0xF983, 0x65C5,0x0,0x0}, {0xF984,0x6FFE,0x0,0x0}, {0xF985,0x792A,0x0,0x0},402 {0xF986, 0x95AD,0x0,0x0}, {0xF987,0x9A6A,0x0,0x0}, {0xF988,0x9E97,0x0,0x0},403 {0xF989, 0x9ECE,0x0,0x0}, {0xF98A,0x529B,0x0,0x0}, {0xF98B,0x66C6,0x0,0x0},404 {0xF98C, 0x6B77,0x0,0x0}, {0xF98D,0x8F62,0x0,0x0}, {0xF98E,0x5E74,0x0,0x0},405 {0xF98F, 0x6190,0x0,0x0}, {0xF990,0x6200,0x0,0x0}, {0xF991,0x649A,0x0,0x0},406 {0xF992, 0x6F23,0x0,0x0}, {0xF993,0x7149,0x0,0x0}, {0xF994,0x7489,0x0,0x0},407 {0xF995, 0x79CA,0x0,0x0}, {0xF996,0x7DF4,0x0,0x0}, {0xF997,0x806F,0x0,0x0},408 {0xF998, 0x8F26,0x0,0x0}, {0xF999,0x84EE,0x0,0x0}, {0xF99A,0x9023,0x0,0x0},409 {0xF99B, 0x934A,0x0,0x0}, {0xF99C,0x5217,0x0,0x0}, {0xF99D,0x52A3,0x0,0x0},410 {0xF99E, 0x54BD,0x0,0x0}, {0xF99F,0x70C8,0x0,0x0}, {0xF9A0,0x88C2,0x0,0x0},411 {0xF9A1, 0x8AAA,0x0,0x0}, {0xF9A2,0x5EC9,0x0,0x0}, {0xF9A3,0x5FF5,0x0,0x0},412 {0xF9A4, 0x637B,0x0,0x0}, {0xF9A5,0x6BAE,0x0,0x0}, {0xF9A6,0x7C3E,0x0,0x0},413 {0xF9A7, 0x7375,0x0,0x0}, {0xF9A8,0x4EE4,0x0,0x0}, {0xF9A9,0x56F9,0x0,0x0},414 {0xF9AA, 0x5BE7,0x0,0x0}, {0xF9AB,0x5DBA,0x0,0x0}, {0xF9AC,0x601C,0x0,0x0},415 {0xF9AD, 0x73B2,0x0,0x0}, {0xF9AE,0x7469,0x0,0x0}, {0xF9AF,0x7F9A,0x0,0x0},416 {0xF9B0, 0x8046,0x0,0x0}, {0xF9B1,0x9234,0x0,0x0}, {0xF9B2,0x96F6,0x0,0x0},417 {0xF9B3, 0x9748,0x0,0x0}, {0xF9B4,0x9818,0x0,0x0}, {0xF9B5,0x4F8B,0x0,0x0},418 {0xF9B6, 0x79AE,0x0,0x0}, {0xF9B7,0x91B4,0x0,0x0}, {0xF9B8,0x96B8,0x0,0x0},419 {0xF9B9, 0x60E1,0x0,0x0}, {0xF9BA,0x4E86,0x0,0x0}, {0xF9BB,0x50DA,0x0,0x0},420 {0xF9BC, 0x5BEE,0x0,0x0}, {0xF9BD,0x5C3F,0x0,0x0}, {0xF9BE,0x6599,0x0,0x0},421 {0xF9BF, 0x6A02,0x0,0x0}, {0xF9C0,0x71CE,0x0,0x0}, {0xF9C1,0x7642,0x0,0x0},422 {0xF9C2, 0x84FC,0x0,0x0}, {0xF9C3,0x907C,0x0,0x0}, {0xF9C4,0x9F8D,0x0,0x0},423 {0xF9C5, 0x6688,0x0,0x0}, {0xF9C6,0x962E,0x0,0x0}, {0xF9C7,0x5289,0x0,0x0},424 {0xF9C8, 0x677B,0x0,0x0}, {0xF9C9,0x67F3,0x0,0x0}, {0xF9CA,0x6D41,0x0,0x0},425 {0xF9CB, 0x6E9C,0x0,0x0}, {0xF9CC,0x7409,0x0,0x0}, {0xF9CD,0x7559,0x0,0x0},426 {0xF9CE, 0x786B,0x0,0x0}, {0xF9CF,0x7D10,0x0,0x0}, {0xF9D0,0x985E,0x0,0x0},427 {0xF9D1, 0x516D,0x0,0x0}, {0xF9D2,0x622E,0x0,0x0}, {0xF9D3,0x9678,0x0,0x0},428 {0xF9D4, 0x502B,0x0,0x0}, {0xF9D5,0x5D19,0x0,0x0}, {0xF9D6,0x6DEA,0x0,0x0},429 {0xF9D7, 0x8F2A,0x0,0x0}, {0xF9D8,0x5F8B,0x0,0x0}, {0xF9D9,0x6144,0x0,0x0},430 {0xF9DA, 0x6817,0x0,0x0}, {0xF9DB,0x7387,0x0,0x0}, {0xF9DC,0x9686,0x0,0x0},431 {0xF9DD, 0x5229,0x0,0x0}, {0xF9DE,0x540F,0x0,0x0}, {0xF9DF,0x5C65,0x0,0x0},432 {0xF9E0, 0x6613,0x0,0x0}, {0xF9E1,0x674E,0x0,0x0}, {0xF9E2,0x68A8,0x0,0x0},433 {0xF9E3, 0x6CE5,0x0,0x0}, {0xF9E4,0x7406,0x0,0x0}, {0xF9E5,0x75E2,0x0,0x0},434 {0xF9E6, 0x7F79,0x0,0x0}, {0xF9E7,0x88CF,0x0,0x0}, {0xF9E8,0x88E1,0x0,0x0},435 {0xF9E9, 0x91CC,0x0,0x0}, {0xF9EA,0x96E2,0x0,0x0}, {0xF9EB,0x533F,0x0,0x0},436 {0xF9EC, 0x6EBA,0x0,0x0}, {0xF9ED,0x541D,0x0,0x0}, {0xF9EE,0x71D0,0x0,0x0},437 {0xF9EF, 0x7498,0x0,0x0}, {0xF9F0,0x85FA,0x0,0x0}, {0xF9F1,0x96A3,0x0,0x0},438 {0xF9F2, 0x9C57,0x0,0x0}, {0xF9F3,0x9E9F,0x0,0x0}, {0xF9F4,0x6797,0x0,0x0},439 {0xF9F5, 0x6DCB,0x0,0x0}, {0xF9F6,0x81E8,0x0,0x0}, {0xF9F7,0x7ACB,0x0,0x0},440 {0xF9F8, 0x7B20,0x0,0x0}, {0xF9F9,0x7C92,0x0,0x0}, {0xF9FA,0x72C0,0x0,0x0},441 {0xF9FB, 0x7099,0x0,0x0}, {0xF9FC,0x8B58,0x0,0x0}, {0xF9FD,0x4EC0,0x0,0x0},442 {0xF9FE, 0x8336,0x0,0x0}, {0xF9FF,0x523A,0x0,0x0}, {0xFA00,0x5207,0x0,0x0},443 {0xFA01, 0x5EA6,0x0,0x0}, {0xFA02,0x62D3,0x0,0x0}, {0xFA03,0x7CD6,0x0,0x0},444 {0xFA04, 0x5B85,0x0,0x0}, {0xFA05,0x6D1E,0x0,0x0}, {0xFA06,0x66B4,0x0,0x0},445 {0xFA07, 0x8F3B,0x0,0x0}, {0xFA08,0x884C,0x0,0x0}, {0xFA09,0x964D,0x0,0x0},446 {0xFA0A, 0x898B,0x0,0x0}, {0xFA0B,0x5ED3,0x0,0x0}, {0xFA0C,0x5140,0x0,0x0},447 {0xFA0D, 0x55C0,0x0,0x0}, {0xFA10,0x585A,0x0,0x0}, {0xFA12,0x6674,0x0,0x0},448 {0xFA15, 0x51DE,0x0,0x0}, {0xFA16,0x732A,0x0,0x0}, {0xFA17,0x76CA,0x0,0x0},449 {0xFA18, 0x793C,0x0,0x0}, {0xFA19,0x795E,0x0,0x0}, {0xFA1A,0x7965,0x0,0x0},450 {0xFA1B, 0x798F,0x0,0x0}, {0xFA1C,0x9756,0x0,0x0}, {0xFA1D,0x7CBE,0x0,0x0},451 {0xFA1E, 0x7FBD,0x0,0x0}, {0xFA20,0x8612,0x0,0x0}, {0xFA22,0x8AF8,0x0,0x0},452 {0xFA25, 0x9038,0x0,0x0}, {0xFA26,0x90FD,0x0,0x0}, {0xFA2A,0x98EF,0x0,0x0},453 {0xFA2B, 0x98FC,0x0,0x0}, {0xFA2C,0x9928,0x0,0x0}, {0xFA2D,0x9DB4,0x0,0x0},454 {0xFB1F, 0x5F2,0x5B7,0x0}, {0xFB2A,0x5E9,0x5C1,0x0}, {0xFB2B,0x5E9,0x5C2,0x0},455 {0xFB2C, 0x5E9,0x5BC,0x5C1}, {0xFB2D,0x5E9,0x5BC,0x5C2}, {0xFB2E,0x5D0,0x5B7,0x0},456 {0xFB2F, 0x5D0,0x5B8,0x0}, {0xFB30,0x5D0,0x5BC,0x0}, {0xFB31,0x5D1,0x5BC,0x0},457 {0xFB32, 0x5D2,0x5BC,0x0}, {0xFB33,0x5D3,0x5BC,0x0}, {0xFB34,0x5D4,0x5BC,0x0},458 {0xFB35, 0x5D5,0x5BC,0x0}, {0xFB36,0x5D6,0x5BC,0x0}, {0xFB38,0x5D8,0x5BC,0x0},459 {0xFB39, 0x5D9,0x5BC,0x0}, {0xFB3A,0x5DA,0x5BC,0x0}, {0xFB3B,0x5DB,0x5BC,0x0},460 {0xFB3C, 0x5DC,0x5BC,0x0}, {0xFB3E,0x5DE,0x5BC,0x0}, {0xFB40,0x5E0,0x5BC,0x0},461 {0xFB41, 0x5E1,0x5BC,0x0}, {0xFB43,0x5E3,0x5BC,0x0}, {0xFB44,0x5E4,0x5BC,0x0},462 {0xFB46, 0x5E6,0x5BC,0x0}, {0xFB47,0x5E7,0x5BC,0x0}, {0xFB48,0x5E8,0x5BC,0x0},463 {0xFB49, 0x5E9,0x5BC,0x0}, {0xFB4A,0x5EA,0x5BC,0x0}, {0xFB4B,0x5D5,0x5B9,0x0},464 {0xFB4C, 0x5D1,0x5BF,0x0}, {0xFB4D,0x5DB,0x5BF,0x0}, {0xFB4E,0x5E4,0x5BF,0x0}42 {0xC0,{0x41,0x300,0x0}}, {0xC1,{0x41,0x301,0x0}}, {0xC2,{0x41,0x302,0x0}}, 43 {0xC3,{0x41,0x303,0x0}}, {0xC4,{0x41,0x308,0x0}}, {0xC5,{0x41,0x30A,0x0}}, 44 {0xC7,{0x43,0x327,0x0}}, {0xC8,{0x45,0x300,0x0}}, {0xC9,{0x45,0x301,0x0}}, 45 {0xCA,{0x45,0x302,0x0}}, {0xCB,{0x45,0x308,0x0}}, {0xCC,{0x49,0x300,0x0}}, 46 {0xCD,{0x49,0x301,0x0}}, {0xCE,{0x49,0x302,0x0}}, {0xCF,{0x49,0x308,0x0}}, 47 {0xD1,{0x4E,0x303,0x0}}, {0xD2,{0x4F,0x300,0x0}}, {0xD3,{0x4F,0x301,0x0}}, 48 {0xD4,{0x4F,0x302,0x0}}, {0xD5,{0x4F,0x303,0x0}}, {0xD6,{0x4F,0x308,0x0}}, 49 {0xD9,{0x55,0x300,0x0}}, {0xDA,{0x55,0x301,0x0}}, {0xDB,{0x55,0x302,0x0}}, 50 {0xDC,{0x55,0x308,0x0}}, {0xDD,{0x59,0x301,0x0}}, {0xE0,{0x61,0x300,0x0}}, 51 {0xE1,{0x61,0x301,0x0}}, {0xE2,{0x61,0x302,0x0}}, {0xE3,{0x61,0x303,0x0}}, 52 {0xE4,{0x61,0x308,0x0}}, {0xE5,{0x61,0x30A,0x0}}, {0xE7,{0x63,0x327,0x0}}, 53 {0xE8,{0x65,0x300,0x0}}, {0xE9,{0x65,0x301,0x0}}, {0xEA,{0x65,0x302,0x0}}, 54 {0xEB,{0x65,0x308,0x0}}, {0xEC,{0x69,0x300,0x0}}, {0xED,{0x69,0x301,0x0}}, 55 {0xEE,{0x69,0x302,0x0}}, {0xEF,{0x69,0x308,0x0}}, {0xF1,{0x6E,0x303,0x0}}, 56 {0xF2,{0x6F,0x300,0x0}}, {0xF3,{0x6F,0x301,0x0}}, {0xF4,{0x6F,0x302,0x0}}, 57 {0xF5,{0x6F,0x303,0x0}}, {0xF6,{0x6F,0x308,0x0}}, {0xF9,{0x75,0x300,0x0}}, 58 {0xFA,{0x75,0x301,0x0}}, {0xFB,{0x75,0x302,0x0}}, {0xFC,{0x75,0x308,0x0}}, 59 {0xFD,{0x79,0x301,0x0}}, {0xFF,{0x79,0x308,0x0}}, {0x100,{0x41,0x304,0x0}}, 60 {0x101,{0x61,0x304,0x0}}, {0x102,{0x41,0x306,0x0}}, {0x103,{0x61,0x306,0x0}}, 61 {0x104,{0x41,0x328,0x0}}, {0x105,{0x61,0x328,0x0}}, {0x106,{0x43,0x301,0x0}}, 62 {0x107,{0x63,0x301,0x0}}, {0x108,{0x43,0x302,0x0}}, {0x109,{0x63,0x302,0x0}}, 63 {0x10A,{0x43,0x307,0x0}}, {0x10B,{0x63,0x307,0x0}}, {0x10C,{0x43,0x30C,0x0}}, 64 {0x10D,{0x63,0x30C,0x0}}, {0x10E,{0x44,0x30C,0x0}}, {0x10F,{0x64,0x30C,0x0}}, 65 {0x112,{0x45,0x304,0x0}}, {0x113,{0x65,0x304,0x0}}, {0x114,{0x45,0x306,0x0}}, 66 {0x115,{0x65,0x306,0x0}}, {0x116,{0x45,0x307,0x0}}, {0x117,{0x65,0x307,0x0}}, 67 {0x118,{0x45,0x328,0x0}}, {0x119,{0x65,0x328,0x0}}, {0x11A,{0x45,0x30C,0x0}}, 68 {0x11B,{0x65,0x30C,0x0}}, {0x11C,{0x47,0x302,0x0}}, {0x11D,{0x67,0x302,0x0}}, 69 {0x11E,{0x47,0x306,0x0}}, {0x11F,{0x67,0x306,0x0}}, {0x120,{0x47,0x307,0x0}}, 70 {0x121,{0x67,0x307,0x0}}, {0x122,{0x47,0x327,0x0}}, {0x123,{0x67,0x327,0x0}}, 71 {0x124,{0x48,0x302,0x0}}, {0x125,{0x68,0x302,0x0}}, {0x128,{0x49,0x303,0x0}}, 72 {0x129,{0x69,0x303,0x0}}, {0x12A,{0x49,0x304,0x0}}, {0x12B,{0x69,0x304,0x0}}, 73 {0x12C,{0x49,0x306,0x0}}, {0x12D,{0x69,0x306,0x0}}, {0x12E,{0x49,0x328,0x0}}, 74 {0x12F,{0x69,0x328,0x0}}, {0x130,{0x49,0x307,0x0}}, {0x134,{0x4A,0x302,0x0}}, 75 {0x135,{0x6A,0x302,0x0}}, {0x136,{0x4B,0x327,0x0}}, {0x137,{0x6B,0x327,0x0}}, 76 {0x139,{0x4C,0x301,0x0}}, {0x13A,{0x6C,0x301,0x0}}, {0x13B,{0x4C,0x327,0x0}}, 77 {0x13C,{0x6C,0x327,0x0}}, {0x13D,{0x4C,0x30C,0x0}}, {0x13E,{0x6C,0x30C,0x0}}, 78 {0x143,{0x4E,0x301,0x0}}, {0x144,{0x6E,0x301,0x0}}, {0x145,{0x4E,0x327,0x0}}, 79 {0x146,{0x6E,0x327,0x0}}, {0x147,{0x4E,0x30C,0x0}}, {0x148,{0x6E,0x30C,0x0}}, 80 {0x14C,{0x4F,0x304,0x0}}, {0x14D,{0x6F,0x304,0x0}}, {0x14E,{0x4F,0x306,0x0}}, 81 {0x14F,{0x6F,0x306,0x0}}, {0x150,{0x4F,0x30B,0x0}}, {0x151,{0x6F,0x30B,0x0}}, 82 {0x154,{0x52,0x301,0x0}}, {0x155,{0x72,0x301,0x0}}, {0x156,{0x52,0x327,0x0}}, 83 {0x157,{0x72,0x327,0x0}}, {0x158,{0x52,0x30C,0x0}}, {0x159,{0x72,0x30C,0x0}}, 84 {0x15A,{0x53,0x301,0x0}}, {0x15B,{0x73,0x301,0x0}}, {0x15C,{0x53,0x302,0x0}}, 85 {0x15D,{0x73,0x302,0x0}}, {0x15E,{0x53,0x327,0x0}}, {0x15F,{0x73,0x327,0x0}}, 86 {0x160,{0x53,0x30C,0x0}}, {0x161,{0x73,0x30C,0x0}}, {0x162,{0x54,0x327,0x0}}, 87 {0x163,{0x74,0x327,0x0}}, {0x164,{0x54,0x30C,0x0}}, {0x165,{0x74,0x30C,0x0}}, 88 {0x168,{0x55,0x303,0x0}}, {0x169,{0x75,0x303,0x0}}, {0x16A,{0x55,0x304,0x0}}, 89 {0x16B,{0x75,0x304,0x0}}, {0x16C,{0x55,0x306,0x0}}, {0x16D,{0x75,0x306,0x0}}, 90 {0x16E,{0x55,0x30A,0x0}}, {0x16F,{0x75,0x30A,0x0}}, {0x170,{0x55,0x30B,0x0}}, 91 {0x171,{0x75,0x30B,0x0}}, {0x172,{0x55,0x328,0x0}}, {0x173,{0x75,0x328,0x0}}, 92 {0x174,{0x57,0x302,0x0}}, {0x175,{0x77,0x302,0x0}}, {0x176,{0x59,0x302,0x0}}, 93 {0x177,{0x79,0x302,0x0}}, {0x178,{0x59,0x308,0x0}}, {0x179,{0x5A,0x301,0x0}}, 94 {0x17A,{0x7A,0x301,0x0}}, {0x17B,{0x5A,0x307,0x0}}, {0x17C,{0x7A,0x307,0x0}}, 95 {0x17D,{0x5A,0x30C,0x0}}, {0x17E,{0x7A,0x30C,0x0}}, {0x1A0,{0x4F,0x31B,0x0}}, 96 {0x1A1,{0x6F,0x31B,0x0}}, {0x1AF,{0x55,0x31B,0x0}}, {0x1B0,{0x75,0x31B,0x0}}, 97 {0x1CD,{0x41,0x30C,0x0}}, {0x1CE,{0x61,0x30C,0x0}}, {0x1CF,{0x49,0x30C,0x0}}, 98 {0x1D0,{0x69,0x30C,0x0}}, {0x1D1,{0x4F,0x30C,0x0}}, {0x1D2,{0x6F,0x30C,0x0}}, 99 {0x1D3,{0x55,0x30C,0x0}}, {0x1D4,{0x75,0x30C,0x0}}, {0x1D5,{0xDC,0x304,0x0}}, 100 {0x1D6,{0xFC,0x304,0x0}}, {0x1D7,{0xDC,0x301,0x0}}, {0x1D8,{0xFC,0x301,0x0}}, 101 {0x1D9,{0xDC,0x30C,0x0}}, {0x1DA,{0xFC,0x30C,0x0}}, {0x1DB,{0xDC,0x300,0x0}}, 102 {0x1DC,{0xFC,0x300,0x0}}, {0x1DE,{0xC4,0x304,0x0}}, {0x1DF,{0xE4,0x304,0x0}}, 103 {0x1E0,{0x41,0x307,0x304}}, {0x1E1,{0x61,0x307,0x304}}, {0x1E2,{0xC6,0x304,0x0}}, 104 {0x1E3,{0xE6,0x304,0x0}}, {0x1E6,{0x47,0x30C,0x0}}, {0x1E7,{0x67,0x30C,0x0}}, 105 {0x1E8,{0x4B,0x30C,0x0}}, {0x1E9,{0x6B,0x30C,0x0}}, {0x1EA,{0x4F,0x328,0x0}}, 106 {0x1EB,{0x6F,0x328,0x0}}, {0x1EC,{0x1EA,0x304,0x0}}, {0x1ED,{0x1EB,0x304,0x0}}, 107 {0x1EE,{0x1B7,0x30C,0x0}}, {0x1EF,{0x292,0x30C,0x0}}, {0x1F0,{0x6A,0x30C,0x0}}, 108 {0x1F4,{0x47,0x301,0x0}}, {0x1F5,{0x67,0x301,0x0}}, {0x1FA,{0xC5,0x301,0x0}}, 109 {0x1FB,{0xE5,0x301,0x0}}, {0x1FC,{0xC6,0x301,0x0}}, {0x1FD,{0xE6,0x301,0x0}}, 110 {0x1FE,{0xD8,0x301,0x0}}, {0x1FF,{0xF8,0x301,0x0}}, {0x200,{0x41,0x30F,0x0}}, 111 {0x201,{0x61,0x30F,0x0}}, {0x202,{0x41,0x311,0x0}}, {0x203,{0x61,0x311,0x0}}, 112 {0x204,{0x45,0x30F,0x0}}, {0x205,{0x65,0x30F,0x0}}, {0x206,{0x45,0x311,0x0}}, 113 {0x207,{0x65,0x311,0x0}}, {0x208,{0x49,0x30F,0x0}}, {0x209,{0x69,0x30F,0x0}}, 114 {0x20A,{0x49,0x311,0x0}}, {0x20B,{0x69,0x311,0x0}}, {0x20C,{0x4F,0x30F,0x0}}, 115 {0x20D,{0x6F,0x30F,0x0}}, {0x20E,{0x4F,0x311,0x0}}, {0x20F,{0x6F,0x311,0x0}}, 116 {0x210,{0x52,0x30F,0x0}}, {0x211,{0x72,0x30F,0x0}}, {0x212,{0x52,0x311,0x0}}, 117 {0x213,{0x72,0x311,0x0}}, {0x214,{0x55,0x30F,0x0}}, {0x215,{0x75,0x30F,0x0}}, 118 {0x216,{0x55,0x311,0x0}}, {0x217,{0x75,0x311,0x0}}, {0x310,{0x306,0x307,0x0}}, 119 {0x340,{0x300,0x0,0x0}}, {0x341,{0x301,0x0,0x0}}, {0x343,{0x313,0x0,0x0}}, 120 {0x344,{0x308,0x30D,0x0}}, {0x374,{0x2B9,0x0,0x0}}, {0x37E,{0x3B,0x0,0x0}}, 121 {0x385,{0xA8,0x30D,0x0}}, {0x386,{0x391,0x30D,0x0}}, {0x387,{0xB7,0x0,0x0}}, 122 {0x388,{0x395,0x30D,0x0}}, {0x389,{0x397,0x30D,0x0}}, {0x38A,{0x399,0x30D,0x0}}, 123 {0x38C,{0x39F,0x30D,0x0}}, {0x38E,{0x3A5,0x30D,0x0}}, {0x38F,{0x3A9,0x30D,0x0}}, 124 {0x390,{0x3B9,0x344,0x0}}, {0x3AA,{0x399,0x308,0x0}}, {0x3AB,{0x3A5,0x308,0x0}}, 125 {0x3AC,{0x3B1,0x30D,0x0}}, {0x3AD,{0x3B5,0x30D,0x0}}, {0x3AE,{0x3B7,0x30D,0x0}}, 126 {0x3AF,{0x3B9,0x30D,0x0}}, {0x3B0,{0x3C5,0x344,0x0}}, {0x3CA,{0x3B9,0x308,0x0}}, 127 {0x3CB,{0x3C5,0x308,0x0}}, {0x3CC,{0x3BF,0x30D,0x0}}, {0x3CD,{0x3C5,0x30D,0x0}}, 128 {0x3CE,{0x3C9,0x30D,0x0}}, {0x3D3,{0x3D2,0x30D,0x0}}, {0x3D4,{0x3D2,0x308,0x0}}, 129 {0x401,{0x415,0x308,0x0}}, {0x403,{0x413,0x301,0x0}}, {0x407,{0x406,0x308,0x0}}, 130 {0x40C,{0x41A,0x301,0x0}}, {0x40E,{0x423,0x306,0x0}}, {0x419,{0x418,0x306,0x0}}, 131 {0x439,{0x438,0x306,0x0}}, {0x451,{0x435,0x308,0x0}}, {0x453,{0x433,0x301,0x0}}, 132 {0x457,{0x456,0x308,0x0}}, {0x45C,{0x43A,0x301,0x0}}, {0x45E,{0x443,0x306,0x0}}, 133 {0x476,{0x474,0x30F,0x0}}, {0x477,{0x475,0x30F,0x0}}, {0x4C1,{0x416,0x306,0x0}}, 134 {0x4C2,{0x436,0x306,0x0}}, {0x4D0,{0x410,0x306,0x0}}, {0x4D1,{0x430,0x306,0x0}}, 135 {0x4D2,{0x410,0x308,0x0}}, {0x4D3,{0x430,0x308,0x0}}, {0x4D6,{0x415,0x306,0x0}}, 136 {0x4D7,{0x435,0x306,0x0}}, {0x4DA,{0x4D8,0x308,0x0}}, {0x4DB,{0x4D9,0x308,0x0}}, 137 {0x4DC,{0x416,0x308,0x0}}, {0x4DD,{0x436,0x308,0x0}}, {0x4DE,{0x417,0x308,0x0}}, 138 {0x4DF,{0x437,0x308,0x0}}, {0x4E2,{0x418,0x304,0x0}}, {0x4E3,{0x438,0x304,0x0}}, 139 {0x4E4,{0x418,0x308,0x0}}, {0x4E5,{0x438,0x308,0x0}}, {0x4E6,{0x41E,0x308,0x0}}, 140 {0x4E7,{0x43E,0x308,0x0}}, {0x4EA,{0x4E8,0x308,0x0}}, {0x4EB,{0x4E9,0x308,0x0}}, 141 {0x4EE,{0x423,0x304,0x0}}, {0x4EF,{0x443,0x304,0x0}}, {0x4F0,{0x423,0x308,0x0}}, 142 {0x4F1,{0x443,0x308,0x0}}, {0x4F2,{0x423,0x30B,0x0}}, {0x4F3,{0x443,0x30B,0x0}}, 143 {0x4F4,{0x427,0x308,0x0}}, {0x4F5,{0x447,0x308,0x0}}, {0x4F8,{0x42B,0x308,0x0}}, 144 {0x4F9,{0x44B,0x308,0x0}}, {0x929,{0x928,0x93C,0x0}}, {0x931,{0x930,0x93C,0x0}}, 145 {0x934,{0x933,0x93C,0x0}}, {0x958,{0x915,0x93C,0x0}}, {0x959,{0x916,0x93C,0x0}}, 146 {0x95A,{0x917,0x93C,0x0}}, {0x95B,{0x91C,0x93C,0x0}}, {0x95C,{0x921,0x93C,0x0}}, 147 {0x95D,{0x922,0x93C,0x0}}, {0x95E,{0x92B,0x93C,0x0}}, {0x95F,{0x92F,0x93C,0x0}}, 148 {0x9B0,{0x9AC,0x9BC,0x0}}, {0x9CB,{0x9C7,0x9BE,0x0}}, {0x9CC,{0x9C7,0x9D7,0x0}}, 149 {0x9DC,{0x9A1,0x9BC,0x0}}, {0x9DD,{0x9A2,0x9BC,0x0}}, {0x9DF,{0x9AF,0x9BC,0x0}}, 150 {0xA59,{0xA16,0xA3C,0x0}}, {0xA5A,{0xA17,0xA3C,0x0}}, {0xA5B,{0xA1C,0xA3C,0x0}}, 151 {0xA5C,{0xA21,0xA3C,0x0}}, {0xA5E,{0xA2B,0xA3C,0x0}}, {0xB48,{0xB47,0xB56,0x0}}, 152 {0xB4B,{0xB47,0xB3E,0x0}}, {0xB4C,{0xB47,0xB57,0x0}}, {0xB5C,{0xB21,0xB3C,0x0}}, 153 {0xB5D,{0xB22,0xB3C,0x0}}, {0xB5F,{0xB2F,0xB3C,0x0}}, {0xB94,{0xB92,0xBD7,0x0}}, 154 {0xBCA,{0xBC6,0xBBE,0x0}}, {0xBCB,{0xBC7,0xBBE,0x0}}, {0xBCC,{0xBC6,0xBD7,0x0}}, 155 {0xC48,{0xC46,0xC56,0x0}}, {0xCC0,{0xCBF,0xCD5,0x0}}, {0xCC7,{0xCC6,0xCD5,0x0}}, 156 {0xCC8,{0xCC6,0xCD6,0x0}}, {0xCCA,{0xCC6,0xCC2,0x0}}, {0xCCB,{0xCC6,0xCC2,0xCD5}}, 157 {0xD4A,{0xD46,0xD3E,0x0}}, {0xD4B,{0xD47,0xD3E,0x0}}, {0xD4C,{0xD46,0xD57,0x0}}, 158 {0xE33,{0xE4D,0xE32,0x0}}, {0xEB3,{0xECD,0xEB2,0x0}}, {0xF43,{0xF42,0xFB7,0x0}}, 159 {0xF4D,{0xF4C,0xFB7,0x0}}, {0xF52,{0xF51,0xFB7,0x0}}, {0xF57,{0xF56,0xFB7,0x0}}, 160 {0xF5C,{0xF5B,0xFB7,0x0}}, {0xF69,{0xF40,0xFB5,0x0}}, {0xF73,{0xF72,0xF71,0x0}}, 161 {0xF75,{0xF71,0xF74,0x0}}, {0xF76,{0xFB2,0xF80,0x0}}, {0xF77,{0xF76,0xF71,0x0}}, 162 {0xF78,{0xFB3,0xF80,0x0}}, {0xF79,{0xF78,0xF71,0x0}}, {0xF81,{0xF80,0xF71,0x0}}, 163 {0xF93,{0xF92,0xFB7,0x0}}, {0xF9D,{0xF9C,0xFB7,0x0}}, {0xFA2,{0xFA1,0xFB7,0x0}}, 164 {0xFA7,{0xFA6,0xFB7,0x0}}, {0xFAC,{0xFAB,0xFB7,0x0}}, {0xFB9,{0xF90,0xFB5,0x0}}, 165 {0x1E00,{0x41,0x325,0x0}}, {0x1E01,{0x61,0x325,0x0}}, {0x1E02,{0x42,0x307,0x0}}, 166 {0x1E03,{0x62,0x307,0x0}}, {0x1E04,{0x42,0x323,0x0}}, {0x1E05,{0x62,0x323,0x0}}, 167 {0x1E06,{0x42,0x331,0x0}}, {0x1E07,{0x62,0x331,0x0}}, {0x1E08,{0xC7,0x301,0x0}}, 168 {0x1E09,{0xE7,0x301,0x0}}, {0x1E0A,{0x44,0x307,0x0}}, {0x1E0B,{0x64,0x307,0x0}}, 169 {0x1E0C,{0x44,0x323,0x0}}, {0x1E0D,{0x64,0x323,0x0}}, {0x1E0E,{0x44,0x331,0x0}}, 170 {0x1E0F,{0x64,0x331,0x0}}, {0x1E10,{0x44,0x327,0x0}}, {0x1E11,{0x64,0x327,0x0}}, 171 {0x1E12,{0x44,0x32D,0x0}}, {0x1E13,{0x64,0x32D,0x0}}, {0x1E14,{0x112,0x300,0x0}}, 172 {0x1E15,{0x113,0x300,0x0}}, {0x1E16,{0x112,0x301,0x0}}, {0x1E17,{0x113,0x301,0x0}}, 173 {0x1E18,{0x45,0x32D,0x0}}, {0x1E19,{0x65,0x32D,0x0}}, {0x1E1A,{0x45,0x330,0x0}}, 174 {0x1E1B,{0x65,0x330,0x0}}, {0x1E1C,{0x114,0x327,0x0}}, {0x1E1D,{0x115,0x327,0x0}}, 175 {0x1E1E,{0x46,0x307,0x0}}, {0x1E1F,{0x66,0x307,0x0}}, {0x1E20,{0x47,0x304,0x0}}, 176 {0x1E21,{0x67,0x304,0x0}}, {0x1E22,{0x48,0x307,0x0}}, {0x1E23,{0x68,0x307,0x0}}, 177 {0x1E24,{0x48,0x323,0x0}}, {0x1E25,{0x68,0x323,0x0}}, {0x1E26,{0x48,0x308,0x0}}, 178 {0x1E27,{0x68,0x308,0x0}}, {0x1E28,{0x48,0x327,0x0}}, {0x1E29,{0x68,0x327,0x0}}, 179 {0x1E2A,{0x48,0x32E,0x0}}, {0x1E2B,{0x68,0x32E,0x0}}, {0x1E2C,{0x49,0x330,0x0}}, 180 {0x1E2D,{0x69,0x330,0x0}}, {0x1E2E,{0xCF,0x301,0x0}}, {0x1E2F,{0xEF,0x301,0x0}}, 181 {0x1E30,{0x4B,0x301,0x0}}, {0x1E31,{0x6B,0x301,0x0}}, {0x1E32,{0x4B,0x323,0x0}}, 182 {0x1E33,{0x6B,0x323,0x0}}, {0x1E34,{0x4B,0x331,0x0}}, {0x1E35,{0x6B,0x331,0x0}}, 183 {0x1E36,{0x4C,0x323,0x0}}, {0x1E37,{0x6C,0x323,0x0}}, {0x1E38,{0x1E36,0x304,0x0}}, 184 {0x1E39,{0x1E37,0x304,0x0}}, {0x1E3A,{0x4C,0x331,0x0}}, {0x1E3B,{0x6C,0x331,0x0}}, 185 {0x1E3C,{0x4C,0x32D,0x0}}, {0x1E3D,{0x6C,0x32D,0x0}}, {0x1E3E,{0x4D,0x301,0x0}}, 186 {0x1E3F,{0x6D,0x301,0x0}}, {0x1E40,{0x4D,0x307,0x0}}, {0x1E41,{0x6D,0x307,0x0}}, 187 {0x1E42,{0x4D,0x323,0x0}}, {0x1E43,{0x6D,0x323,0x0}}, {0x1E44,{0x4E,0x307,0x0}}, 188 {0x1E45,{0x6E,0x307,0x0}}, {0x1E46,{0x4E,0x323,0x0}}, {0x1E47,{0x6E,0x323,0x0}}, 189 {0x1E48,{0x4E,0x331,0x0}}, {0x1E49,{0x6E,0x331,0x0}}, {0x1E4A,{0x4E,0x32D,0x0}}, 190 {0x1E4B,{0x6E,0x32D,0x0}}, {0x1E4C,{0xD5,0x301,0x0}}, {0x1E4D,{0xF5,0x301,0x0}}, 191 {0x1E4E,{0xD5,0x308,0x0}}, {0x1E4F,{0xF5,0x308,0x0}}, {0x1E50,{0x14C,0x300,0x0}}, 192 {0x1E51,{0x14D,0x300,0x0}}, {0x1E52,{0x14C,0x301,0x0}}, {0x1E53,{0x14D,0x301,0x0}}, 193 {0x1E54,{0x50,0x301,0x0}}, {0x1E55,{0x70,0x301,0x0}}, {0x1E56,{0x50,0x307,0x0}}, 194 {0x1E57,{0x70,0x307,0x0}}, {0x1E58,{0x52,0x307,0x0}}, {0x1E59,{0x72,0x307,0x0}}, 195 {0x1E5A,{0x52,0x323,0x0}}, {0x1E5B,{0x72,0x323,0x0}}, {0x1E5C,{0x1E5A,0x304,0x0}}, 196 {0x1E5D,{0x1E5B,0x304,0x0}}, {0x1E5E,{0x52,0x331,0x0}}, {0x1E5F,{0x72,0x331,0x0}}, 197 {0x1E60,{0x53,0x307,0x0}}, {0x1E61,{0x73,0x307,0x0}}, {0x1E62,{0x53,0x323,0x0}}, 198 {0x1E63,{0x73,0x323,0x0}}, {0x1E64,{0x15A,0x307,0x0}}, {0x1E65,{0x15B,0x307,0x0}}, 199 {0x1E66,{0x160,0x307,0x0}}, {0x1E67,{0x161,0x307,0x0}}, {0x1E68,{0x1E62,0x307,0x0}}, 200 {0x1E69,{0x1E63,0x307,0x0}}, {0x1E6A,{0x54,0x307,0x0}}, {0x1E6B,{0x74,0x307,0x0}}, 201 {0x1E6C,{0x54,0x323,0x0}}, {0x1E6D,{0x74,0x323,0x0}}, {0x1E6E,{0x54,0x331,0x0}}, 202 {0x1E6F,{0x74,0x331,0x0}}, {0x1E70,{0x54,0x32D,0x0}}, {0x1E71,{0x74,0x32D,0x0}}, 203 {0x1E72,{0x55,0x324,0x0}}, {0x1E73,{0x75,0x324,0x0}}, {0x1E74,{0x55,0x330,0x0}}, 204 {0x1E75,{0x75,0x330,0x0}}, {0x1E76,{0x55,0x32D,0x0}}, {0x1E77,{0x75,0x32D,0x0}}, 205 {0x1E78,{0x168,0x301,0x0}}, {0x1E79,{0x169,0x301,0x0}}, {0x1E7A,{0x16A,0x308,0x0}}, 206 {0x1E7B,{0x16B,0x308,0x0}}, {0x1E7C,{0x56,0x303,0x0}}, {0x1E7D,{0x76,0x303,0x0}}, 207 {0x1E7E,{0x56,0x323,0x0}}, {0x1E7F,{0x76,0x323,0x0}}, {0x1E80,{0x57,0x300,0x0}}, 208 {0x1E81,{0x77,0x300,0x0}}, {0x1E82,{0x57,0x301,0x0}}, {0x1E83,{0x77,0x301,0x0}}, 209 {0x1E84,{0x57,0x308,0x0}}, {0x1E85,{0x77,0x308,0x0}}, {0x1E86,{0x57,0x307,0x0}}, 210 {0x1E87,{0x77,0x307,0x0}}, {0x1E88,{0x57,0x323,0x0}}, {0x1E89,{0x77,0x323,0x0}}, 211 {0x1E8A,{0x58,0x307,0x0}}, {0x1E8B,{0x78,0x307,0x0}}, {0x1E8C,{0x58,0x308,0x0}}, 212 {0x1E8D,{0x78,0x308,0x0}}, {0x1E8E,{0x59,0x307,0x0}}, {0x1E8F,{0x79,0x307,0x0}}, 213 {0x1E90,{0x5A,0x302,0x0}}, {0x1E91,{0x7A,0x302,0x0}}, {0x1E92,{0x5A,0x323,0x0}}, 214 {0x1E93,{0x7A,0x323,0x0}}, {0x1E94,{0x5A,0x331,0x0}}, {0x1E95,{0x7A,0x331,0x0}}, 215 {0x1E96,{0x68,0x331,0x0}}, {0x1E97,{0x74,0x308,0x0}}, {0x1E98,{0x77,0x30A,0x0}}, 216 {0x1E99,{0x79,0x30A,0x0}}, {0x1E9B,{0x17F,0x307,0x0}}, {0x1EA0,{0x41,0x323,0x0}}, 217 {0x1EA1,{0x61,0x323,0x0}}, {0x1EA2,{0x41,0x309,0x0}}, {0x1EA3,{0x61,0x309,0x0}}, 218 {0x1EA4,{0xC2,0x301,0x0}}, {0x1EA5,{0xE2,0x301,0x0}}, {0x1EA6,{0xC2,0x300,0x0}}, 219 {0x1EA7,{0xE2,0x300,0x0}}, {0x1EA8,{0xC2,0x309,0x0}}, {0x1EA9,{0xE2,0x309,0x0}}, 220 {0x1EAA,{0xC2,0x303,0x0}}, {0x1EAB,{0xE2,0x303,0x0}}, {0x1EAC,{0xC2,0x323,0x0}}, 221 {0x1EAD,{0xE2,0x323,0x0}}, {0x1EAE,{0x102,0x301,0x0}}, {0x1EAF,{0x103,0x301,0x0}}, 222 {0x1EB0,{0x102,0x300,0x0}}, {0x1EB1,{0x103,0x300,0x0}}, {0x1EB2,{0x102,0x309,0x0}}, 223 {0x1EB3,{0x103,0x309,0x0}}, {0x1EB4,{0x102,0x303,0x0}}, {0x1EB5,{0x103,0x303,0x0}}, 224 {0x1EB6,{0x102,0x323,0x0}}, {0x1EB7,{0x103,0x323,0x0}}, {0x1EB8,{0x45,0x323,0x0}}, 225 {0x1EB9,{0x65,0x323,0x0}}, {0x1EBA,{0x45,0x309,0x0}}, {0x1EBB,{0x65,0x309,0x0}}, 226 {0x1EBC,{0x45,0x303,0x0}}, {0x1EBD,{0x65,0x303,0x0}}, {0x1EBE,{0xCA,0x301,0x0}}, 227 {0x1EBF,{0xEA,0x301,0x0}}, {0x1EC0,{0xCA,0x300,0x0}}, {0x1EC1,{0xEA,0x300,0x0}}, 228 {0x1EC2,{0xCA,0x309,0x0}}, {0x1EC3,{0xEA,0x309,0x0}}, {0x1EC4,{0xCA,0x303,0x0}}, 229 {0x1EC5,{0xEA,0x303,0x0}}, {0x1EC6,{0xCA,0x323,0x0}}, {0x1EC7,{0xEA,0x323,0x0}}, 230 {0x1EC8,{0x49,0x309,0x0}}, {0x1EC9,{0x69,0x309,0x0}}, {0x1ECA,{0x49,0x323,0x0}}, 231 {0x1ECB,{0x69,0x323,0x0}}, {0x1ECC,{0x4F,0x323,0x0}}, {0x1ECD,{0x6F,0x323,0x0}}, 232 {0x1ECE,{0x4F,0x309,0x0}}, {0x1ECF,{0x6F,0x309,0x0}}, {0x1ED0,{0xD4,0x301,0x0}}, 233 {0x1ED1,{0xF4,0x301,0x0}}, {0x1ED2,{0xD4,0x300,0x0}}, {0x1ED3,{0xF4,0x300,0x0}}, 234 {0x1ED4,{0xD4,0x309,0x0}}, {0x1ED5,{0xF4,0x309,0x0}}, {0x1ED6,{0xD4,0x303,0x0}}, 235 {0x1ED7,{0xF4,0x303,0x0}}, {0x1ED8,{0xD4,0x323,0x0}}, {0x1ED9,{0xF4,0x323,0x0}}, 236 {0x1EDA,{0x1A0,0x301,0x0}}, {0x1EDB,{0x1A1,0x301,0x0}}, {0x1EDC,{0x1A0,0x300,0x0}}, 237 {0x1EDD,{0x1A1,0x300,0x0}}, {0x1EDE,{0x1A0,0x309,0x0}}, {0x1EDF,{0x1A1,0x309,0x0}}, 238 {0x1EE0,{0x1A0,0x303,0x0}}, {0x1EE1,{0x1A1,0x303,0x0}}, {0x1EE2,{0x1A0,0x323,0x0}}, 239 {0x1EE3,{0x1A1,0x323,0x0}}, {0x1EE4,{0x55,0x323,0x0}}, {0x1EE5,{0x75,0x323,0x0}}, 240 {0x1EE6,{0x55,0x309,0x0}}, {0x1EE7,{0x75,0x309,0x0}}, {0x1EE8,{0x1AF,0x301,0x0}}, 241 {0x1EE9,{0x1B0,0x301,0x0}}, {0x1EEA,{0x1AF,0x300,0x0}}, {0x1EEB,{0x1B0,0x300,0x0}}, 242 {0x1EEC,{0x1AF,0x309,0x0}}, {0x1EED,{0x1B0,0x309,0x0}}, {0x1EEE,{0x1AF,0x303,0x0}}, 243 {0x1EEF,{0x1B0,0x303,0x0}}, {0x1EF0,{0x1AF,0x323,0x0}}, {0x1EF1,{0x1B0,0x323,0x0}}, 244 {0x1EF2,{0x59,0x300,0x0}}, {0x1EF3,{0x79,0x300,0x0}}, {0x1EF4,{0x59,0x323,0x0}}, 245 {0x1EF5,{0x79,0x323,0x0}}, {0x1EF6,{0x59,0x309,0x0}}, {0x1EF7,{0x79,0x309,0x0}}, 246 {0x1EF8,{0x59,0x303,0x0}}, {0x1EF9,{0x79,0x303,0x0}}, {0x1F00,{0x3B1,0x313,0x0}}, 247 {0x1F01,{0x3B1,0x314,0x0}}, {0x1F02,{0x1F00,0x300,0x0}}, {0x1F03,{0x1F01,0x300,0x0}}, 248 {0x1F04,{0x1F00,0x301,0x0}}, {0x1F05,{0x1F01,0x301,0x0}}, {0x1F06,{0x1F00,0x342,0x0}}, 249 {0x1F07,{0x1F01,0x342,0x0}}, {0x1F08,{0x391,0x313,0x0}}, {0x1F09,{0x391,0x314,0x0}}, 250 {0x1F0A,{0x1F08,0x300,0x0}}, {0x1F0B,{0x1F09,0x300,0x0}}, {0x1F0C,{0x1F08,0x301,0x0}}, 251 {0x1F0D,{0x1F09,0x301,0x0}}, {0x1F0E,{0x1F08,0x342,0x0}}, {0x1F0F,{0x1F09,0x342,0x0}}, 252 {0x1F10,{0x3B5,0x313,0x0}}, {0x1F11,{0x3B5,0x314,0x0}}, {0x1F12,{0x1F10,0x300,0x0}}, 253 {0x1F13,{0x1F11,0x300,0x0}}, {0x1F14,{0x1F10,0x301,0x0}}, {0x1F15,{0x1F11,0x301,0x0}}, 254 {0x1F18,{0x395,0x313,0x0}}, {0x1F19,{0x395,0x314,0x0}}, {0x1F1A,{0x1F18,0x300,0x0}}, 255 {0x1F1B,{0x1F19,0x300,0x0}}, {0x1F1C,{0x1F18,0x301,0x0}}, {0x1F1D,{0x1F19,0x301,0x0}}, 256 {0x1F20,{0x3B7,0x313,0x0}}, {0x1F21,{0x3B7,0x314,0x0}}, {0x1F22,{0x1F20,0x300,0x0}}, 257 {0x1F23,{0x1F21,0x300,0x0}}, {0x1F24,{0x1F20,0x301,0x0}}, {0x1F25,{0x1F21,0x301,0x0}}, 258 {0x1F26,{0x1F20,0x342,0x0}}, {0x1F27,{0x1F21,0x342,0x0}}, {0x1F28,{0x397,0x313,0x0}}, 259 {0x1F29,{0x397,0x314,0x0}}, {0x1F2A,{0x1F28,0x300,0x0}}, {0x1F2B,{0x1F29,0x300,0x0}}, 260 {0x1F2C,{0x1F28,0x301,0x0}}, {0x1F2D,{0x1F29,0x301,0x0}}, {0x1F2E,{0x1F28,0x342,0x0}}, 261 {0x1F2F,{0x1F29,0x342,0x0}}, {0x1F30,{0x3B9,0x313,0x0}}, {0x1F31,{0x3B9,0x314,0x0}}, 262 {0x1F32,{0x1F30,0x300,0x0}}, {0x1F33,{0x1F31,0x300,0x0}}, {0x1F34,{0x1F30,0x301,0x0}}, 263 {0x1F35,{0x1F31,0x301,0x0}}, {0x1F36,{0x1F30,0x342,0x0}}, {0x1F37,{0x1F31,0x342,0x0}}, 264 {0x1F38,{0x399,0x313,0x0}}, {0x1F39,{0x399,0x314,0x0}}, {0x1F3A,{0x1F38,0x300,0x0}}, 265 {0x1F3B,{0x1F39,0x300,0x0}}, {0x1F3C,{0x1F38,0x301,0x0}}, {0x1F3D,{0x1F39,0x301,0x0}}, 266 {0x1F3E,{0x1F38,0x342,0x0}}, {0x1F3F,{0x1F39,0x342,0x0}}, {0x1F40,{0x3BF,0x313,0x0}}, 267 {0x1F41,{0x3BF,0x314,0x0}}, {0x1F42,{0x1F40,0x300,0x0}}, {0x1F43,{0x1F41,0x300,0x0}}, 268 {0x1F44,{0x1F40,0x301,0x0}}, {0x1F45,{0x1F41,0x301,0x0}}, {0x1F48,{0x39F,0x313,0x0}}, 269 {0x1F49,{0x39F,0x314,0x0}}, {0x1F4A,{0x1F48,0x300,0x0}}, {0x1F4B,{0x1F49,0x300,0x0}}, 270 {0x1F4C,{0x1F48,0x301,0x0}}, {0x1F4D,{0x1F49,0x301,0x0}}, {0x1F50,{0x3C5,0x313,0x0}}, 271 {0x1F51,{0x3C5,0x314,0x0}}, {0x1F52,{0x1F50,0x300,0x0}}, {0x1F53,{0x1F51,0x300,0x0}}, 272 {0x1F54,{0x1F50,0x301,0x0}}, {0x1F55,{0x1F51,0x301,0x0}}, {0x1F56,{0x1F50,0x342,0x0}}, 273 {0x1F57,{0x1F51,0x342,0x0}}, {0x1F59,{0x3A5,0x314,0x0}}, {0x1F5B,{0x1F59,0x300,0x0}}, 274 {0x1F5D,{0x1F59,0x301,0x0}}, {0x1F5F,{0x1F59,0x342,0x0}}, {0x1F60,{0x3C9,0x313,0x0}}, 275 {0x1F61,{0x3C9,0x314,0x0}}, {0x1F62,{0x1F60,0x300,0x0}}, {0x1F63,{0x1F61,0x300,0x0}}, 276 {0x1F64,{0x1F60,0x301,0x0}}, {0x1F65,{0x1F61,0x301,0x0}}, {0x1F66,{0x1F60,0x342,0x0}}, 277 {0x1F67,{0x1F61,0x342,0x0}}, {0x1F68,{0x3A9,0x313,0x0}}, {0x1F69,{0x3A9,0x314,0x0}}, 278 {0x1F6A,{0x1F68,0x300,0x0}}, {0x1F6B,{0x1F69,0x300,0x0}}, {0x1F6C,{0x1F68,0x301,0x0}}, 279 {0x1F6D,{0x1F69,0x301,0x0}}, {0x1F6E,{0x1F68,0x342,0x0}}, {0x1F6F,{0x1F69,0x342,0x0}}, 280 {0x1F70,{0x3B1,0x300,0x0}}, {0x1F71,{0x3B1,0x301,0x0}}, {0x1F72,{0x3B5,0x300,0x0}}, 281 {0x1F73,{0x3B5,0x301,0x0}}, {0x1F74,{0x3B7,0x300,0x0}}, {0x1F75,{0x3B7,0x301,0x0}}, 282 {0x1F76,{0x3B9,0x300,0x0}}, {0x1F77,{0x3B9,0x301,0x0}}, {0x1F78,{0x3BF,0x300,0x0}}, 283 {0x1F79,{0x3BF,0x301,0x0}}, {0x1F7A,{0x3C5,0x300,0x0}}, {0x1F7B,{0x3C5,0x301,0x0}}, 284 {0x1F7C,{0x3C9,0x300,0x0}}, {0x1F7D,{0x3C9,0x301,0x0}}, {0x1F80,{0x1F00,0x345,0x0}}, 285 {0x1F81,{0x1F01,0x345,0x0}}, {0x1F82,{0x1F02,0x345,0x0}}, {0x1F83,{0x1F03,0x345,0x0}}, 286 {0x1F84,{0x1F04,0x345,0x0}}, {0x1F85,{0x1F05,0x345,0x0}}, {0x1F86,{0x1F06,0x345,0x0}}, 287 {0x1F87,{0x1F07,0x345,0x0}}, {0x1F88,{0x1F08,0x345,0x0}}, {0x1F89,{0x1F09,0x345,0x0}}, 288 {0x1F8A,{0x1F0A,0x345,0x0}}, {0x1F8B,{0x1F0B,0x345,0x0}}, {0x1F8C,{0x1F0C,0x345,0x0}}, 289 {0x1F8D,{0x1F0D,0x345,0x0}}, {0x1F8E,{0x1F0E,0x345,0x0}}, {0x1F8F,{0x1F0F,0x345,0x0}}, 290 {0x1F90,{0x1F20,0x345,0x0}}, {0x1F91,{0x1F21,0x345,0x0}}, {0x1F92,{0x1F22,0x345,0x0}}, 291 {0x1F93,{0x1F23,0x345,0x0}}, {0x1F94,{0x1F24,0x345,0x0}}, {0x1F95,{0x1F25,0x345,0x0}}, 292 {0x1F96,{0x1F26,0x345,0x0}}, {0x1F97,{0x1F27,0x345,0x0}}, {0x1F98,{0x1F28,0x345,0x0}}, 293 {0x1F99,{0x1F29,0x345,0x0}}, {0x1F9A,{0x1F2A,0x345,0x0}}, {0x1F9B,{0x1F2B,0x345,0x0}}, 294 {0x1F9C,{0x1F2C,0x345,0x0}}, {0x1F9D,{0x1F2D,0x345,0x0}}, {0x1F9E,{0x1F2E,0x345,0x0}}, 295 {0x1F9F,{0x1F2F,0x345,0x0}}, {0x1FA0,{0x1F60,0x345,0x0}}, {0x1FA1,{0x1F61,0x345,0x0}}, 296 {0x1FA2,{0x1F62,0x345,0x0}}, {0x1FA3,{0x1F63,0x345,0x0}}, {0x1FA4,{0x1F64,0x345,0x0}}, 297 {0x1FA5,{0x1F65,0x345,0x0}}, {0x1FA6,{0x1F66,0x345,0x0}}, {0x1FA7,{0x1F67,0x345,0x0}}, 298 {0x1FA8,{0x1F68,0x345,0x0}}, {0x1FA9,{0x1F69,0x345,0x0}}, {0x1FAA,{0x1F6A,0x345,0x0}}, 299 {0x1FAB,{0x1F6B,0x345,0x0}}, {0x1FAC,{0x1F6C,0x345,0x0}}, {0x1FAD,{0x1F6D,0x345,0x0}}, 300 {0x1FAE,{0x1F6E,0x345,0x0}}, {0x1FAF,{0x1F6F,0x345,0x0}}, {0x1FB0,{0x3B1,0x306,0x0}}, 301 {0x1FB1,{0x3B1,0x304,0x0}}, {0x1FB2,{0x1F70,0x345,0x0}}, {0x1FB3,{0x3B1,0x345,0x0}}, 302 {0x1FB4,{0x1F71,0x345,0x0}}, {0x1FB6,{0x3B1,0x342,0x0}}, {0x1FB7,{0x1FB6,0x345,0x0}}, 303 {0x1FB8,{0x391,0x306,0x0}}, {0x1FB9,{0x391,0x304,0x0}}, {0x1FBA,{0x391,0x300,0x0}}, 304 {0x1FBB,{0x391,0x301,0x0}}, {0x1FBC,{0x391,0x345,0x0}}, {0x1FBE,{0x3B9,0x0,0x0}}, 305 {0x1FC1,{0xA8,0x342,0x0}}, {0x1FC2,{0x1F74,0x345,0x0}}, {0x1FC3,{0x3B7,0x345,0x0}}, 306 {0x1FC4,{0x1F75,0x345,0x0}}, {0x1FC6,{0x3B7,0x342,0x0}}, {0x1FC7,{0x1FC6,0x345,0x0}}, 307 {0x1FC8,{0x395,0x300,0x0}}, {0x1FC9,{0x395,0x301,0x0}}, {0x1FCA,{0x397,0x300,0x0}}, 308 {0x1FCB,{0x397,0x301,0x0}}, {0x1FCC,{0x397,0x345,0x0}}, {0x1FCD,{0x1FBF,0x300,0x0}}, 309 {0x1FCE,{0x1FBF,0x301,0x0}}, {0x1FCF,{0x1FBF,0x342,0x0}}, {0x1FD0,{0x3B9,0x306,0x0}}, 310 {0x1FD1,{0x3B9,0x304,0x0}}, {0x1FD2,{0x3CA,0x300,0x0}}, {0x1FD3,{0x3CA,0x301,0x0}}, 311 {0x1FD6,{0x3B9,0x342,0x0}}, {0x1FD7,{0x3CA,0x342,0x0}}, {0x1FD8,{0x399,0x306,0x0}}, 312 {0x1FD9,{0x399,0x304,0x0}}, {0x1FDA,{0x399,0x300,0x0}}, {0x1FDB,{0x399,0x301,0x0}}, 313 {0x1FDD,{0x1FFE,0x300,0x0}}, {0x1FDE,{0x1FFE,0x301,0x0}}, {0x1FDF,{0x1FFE,0x342,0x0}}, 314 {0x1FE0,{0x3C5,0x306,0x0}}, {0x1FE1,{0x3C5,0x304,0x0}}, {0x1FE2,{0x3CB,0x300,0x0}}, 315 {0x1FE3,{0x3CB,0x301,0x0}}, {0x1FE4,{0x3C1,0x313,0x0}}, {0x1FE5,{0x3C1,0x314,0x0}}, 316 {0x1FE6,{0x3C5,0x342,0x0}}, {0x1FE7,{0x3CB,0x342,0x0}}, {0x1FE8,{0x3A5,0x306,0x0}}, 317 {0x1FE9,{0x3A5,0x304,0x0}}, {0x1FEA,{0x3A5,0x300,0x0}}, {0x1FEB,{0x3A5,0x301,0x0}}, 318 {0x1FEC,{0x3A1,0x314,0x0}}, {0x1FED,{0xA8,0x300,0x0}}, {0x1FEE,{0xA8,0x301,0x0}}, 319 {0x1FEF,{0x60,0x0,0x0}}, {0x1FF2,{0x1F7C,0x345,0x0}}, {0x1FF3,{0x3C9,0x345,0x0}}, 320 {0x1FF4,{0x1F79,0x345,0x0}}, {0x1FF6,{0x3C9,0x342,0x0}}, {0x1FF7,{0x1FF6,0x345,0x0}}, 321 {0x1FF8,{0x39F,0x300,0x0}}, {0x1FF9,{0x39F,0x301,0x0}}, {0x1FFA,{0x3A9,0x300,0x0}}, 322 {0x1FFB,{0x3A9,0x301,0x0}}, {0x1FFC,{0x3A9,0x345,0x0}}, {0x1FFD,{0xB4,0x0,0x0}}, 323 {0x2000,{0x2002,0x0,0x0}}, {0x2001,{0x2003,0x0,0x0}}, {0x2126,{0x3A9,0x0,0x0}}, 324 {0x212A,{0x4B,0x0,0x0}}, {0x212B,{0xC5,0x0,0x0}}, {0x2204,{0x2203,0x338,0x0}}, 325 {0x2209,{0x2208,0x338,0x0}}, {0x220C,{0x220B,0x338,0x0}}, {0x2224,{0x2223,0x338,0x0}}, 326 {0x2226,{0x2225,0x338,0x0}}, {0x2241,{0x7E,0x338,0x0}}, {0x2244,{0x2243,0x338,0x0}}, 327 {0x2247,{0x2245,0x338,0x0}}, {0x2249,{0x2248,0x338,0x0}}, {0x2260,{0x3D,0x338,0x0}}, 328 {0x2262,{0x2261,0x338,0x0}}, {0x226D,{0x224D,0x338,0x0}}, {0x226E,{0x3C,0x338,0x0}}, 329 {0x226F,{0x3E,0x338,0x0}}, {0x2270,{0x2264,0x338,0x0}}, {0x2271,{0x2265,0x338,0x0}}, 330 {0x2274,{0x2272,0x338,0x0}}, {0x2275,{0x2273,0x338,0x0}}, {0x2278,{0x2276,0x338,0x0}}, 331 {0x2279,{0x2277,0x338,0x0}}, {0x2280,{0x227A,0x338,0x0}}, {0x2281,{0x227B,0x338,0x0}}, 332 {0x2284,{0x2282,0x338,0x0}}, {0x2285,{0x2283,0x338,0x0}}, {0x2288,{0x2286,0x338,0x0}}, 333 {0x2289,{0x2287,0x338,0x0}}, {0x22AC,{0x22A2,0x338,0x0}}, {0x22AD,{0x22A8,0x338,0x0}}, 334 {0x22AE,{0x22A9,0x338,0x0}}, {0x22AF,{0x22AB,0x338,0x0}}, {0x22E0,{0x227C,0x338,0x0}}, 335 {0x22E1,{0x227D,0x338,0x0}}, {0x22E2,{0x2291,0x338,0x0}}, {0x22E3,{0x2292,0x338,0x0}}, 336 {0x22EA,{0x22B2,0x338,0x0}}, {0x22EB,{0x22B3,0x338,0x0}}, {0x22EC,{0x22B4,0x338,0x0}}, 337 {0x22ED,{0x22B5,0x338,0x0}}, {0x2329,{0x3008,0x0,0x0}}, {0x232A,{0x3009,0x0,0x0}}, 338 {0x304C,{0x304B,0x3099,0x0}}, {0x304E,{0x304D,0x3099,0x0}}, {0x3050,{0x304F,0x3099,0x0}}, 339 {0x3052,{0x3051,0x3099,0x0}}, {0x3054,{0x3053,0x3099,0x0}}, {0x3056,{0x3055,0x3099,0x0}}, 340 {0x3058,{0x3057,0x3099,0x0}}, {0x305A,{0x3059,0x3099,0x0}}, {0x305C,{0x305B,0x3099,0x0}}, 341 {0x305E,{0x305D,0x3099,0x0}}, {0x3060,{0x305F,0x3099,0x0}}, {0x3062,{0x3061,0x3099,0x0}}, 342 {0x3065,{0x3064,0x3099,0x0}}, {0x3067,{0x3066,0x3099,0x0}}, {0x3069,{0x3068,0x3099,0x0}}, 343 {0x3070,{0x306F,0x3099,0x0}}, {0x3071,{0x306F,0x309A,0x0}}, {0x3073,{0x3072,0x3099,0x0}}, 344 {0x3074,{0x3072,0x309A,0x0}}, {0x3076,{0x3075,0x3099,0x0}}, {0x3077,{0x3075,0x309A,0x0}}, 345 {0x3079,{0x3078,0x3099,0x0}}, {0x307A,{0x3078,0x309A,0x0}}, {0x307C,{0x307B,0x3099,0x0}}, 346 {0x307D,{0x307B,0x309A,0x0}}, {0x3094,{0x3046,0x3099,0x0}}, {0x309E,{0x309D,0x3099,0x0}}, 347 {0x30AC,{0x30AB,0x3099,0x0}}, {0x30AE,{0x30AD,0x3099,0x0}}, {0x30B0,{0x30AF,0x3099,0x0}}, 348 {0x30B2,{0x30B1,0x3099,0x0}}, {0x30B4,{0x30B3,0x3099,0x0}}, {0x30B6,{0x30B5,0x3099,0x0}}, 349 {0x30B8,{0x30B7,0x3099,0x0}}, {0x30BA,{0x30B9,0x3099,0x0}}, {0x30BC,{0x30BB,0x3099,0x0}}, 350 {0x30BE,{0x30BD,0x3099,0x0}}, {0x30C0,{0x30BF,0x3099,0x0}}, {0x30C2,{0x30C1,0x3099,0x0}}, 351 {0x30C5,{0x30C4,0x3099,0x0}}, {0x30C7,{0x30C6,0x3099,0x0}}, {0x30C9,{0x30C8,0x3099,0x0}}, 352 {0x30D0,{0x30CF,0x3099,0x0}}, {0x30D1,{0x30CF,0x309A,0x0}}, {0x30D3,{0x30D2,0x3099,0x0}}, 353 {0x30D4,{0x30D2,0x309A,0x0}}, {0x30D6,{0x30D5,0x3099,0x0}}, {0x30D7,{0x30D5,0x309A,0x0}}, 354 {0x30D9,{0x30D8,0x3099,0x0}}, {0x30DA,{0x30D8,0x309A,0x0}}, {0x30DC,{0x30DB,0x3099,0x0}}, 355 {0x30DD,{0x30DB,0x309A,0x0}}, {0x30F4,{0x30A6,0x3099,0x0}}, {0x30F7,{0x30EF,0x3099,0x0}}, 356 {0x30F8,{0x30F0,0x3099,0x0}}, {0x30F9,{0x30F1,0x3099,0x0}}, {0x30FA,{0x30F2,0x3099,0x0}}, 357 {0x30FE,{0x30FD,0x3099,0x0}}, {0xF900,{0x8C48,0x0,0x0}}, {0xF901,{0x66F4,0x0,0x0}}, 358 {0xF902,{0x8ECA,0x0,0x0}}, {0xF903,{0x8CC8,0x0,0x0}}, {0xF904,{0x6ED1,0x0,0x0}}, 359 {0xF905,{0x4E32,0x0,0x0}}, {0xF906,{0x53E5,0x0,0x0}}, {0xF907,{0x9F9C,0x0,0x0}}, 360 {0xF908,{0x9F9C,0x0,0x0}}, {0xF909,{0x5951,0x0,0x0}}, {0xF90A,{0x91D1,0x0,0x0}}, 361 {0xF90B,{0x5587,0x0,0x0}}, {0xF90C,{0x5948,0x0,0x0}}, {0xF90D,{0x61F6,0x0,0x0}}, 362 {0xF90E,{0x7669,0x0,0x0}}, {0xF90F,{0x7F85,0x0,0x0}}, {0xF910,{0x863F,0x0,0x0}}, 363 {0xF911,{0x87BA,0x0,0x0}}, {0xF912,{0x88F8,0x0,0x0}}, {0xF913,{0x908F,0x0,0x0}}, 364 {0xF914,{0x6A02,0x0,0x0}}, {0xF915,{0x6D1B,0x0,0x0}}, {0xF916,{0x70D9,0x0,0x0}}, 365 {0xF917,{0x73DE,0x0,0x0}}, {0xF918,{0x843D,0x0,0x0}}, {0xF919,{0x916A,0x0,0x0}}, 366 {0xF91A,{0x99F1,0x0,0x0}}, {0xF91B,{0x4E82,0x0,0x0}}, {0xF91C,{0x5375,0x0,0x0}}, 367 {0xF91D,{0x6B04,0x0,0x0}}, {0xF91E,{0x721B,0x0,0x0}}, {0xF91F,{0x862D,0x0,0x0}}, 368 {0xF920,{0x9E1E,0x0,0x0}}, {0xF921,{0x5D50,0x0,0x0}}, {0xF922,{0x6FEB,0x0,0x0}}, 369 {0xF923,{0x85CD,0x0,0x0}}, {0xF924,{0x8964,0x0,0x0}}, {0xF925,{0x62C9,0x0,0x0}}, 370 {0xF926,{0x81D8,0x0,0x0}}, {0xF927,{0x881F,0x0,0x0}}, {0xF928,{0x5ECA,0x0,0x0}}, 371 {0xF929,{0x6717,0x0,0x0}}, {0xF92A,{0x6D6A,0x0,0x0}}, {0xF92B,{0x72FC,0x0,0x0}}, 372 {0xF92C,{0x90CE,0x0,0x0}}, {0xF92D,{0x4F86,0x0,0x0}}, {0xF92E,{0x51B7,0x0,0x0}}, 373 {0xF92F,{0x52DE,0x0,0x0}}, {0xF930,{0x64C4,0x0,0x0}}, {0xF931,{0x6AD3,0x0,0x0}}, 374 {0xF932,{0x7210,0x0,0x0}}, {0xF933,{0x76E7,0x0,0x0}}, {0xF934,{0x8001,0x0,0x0}}, 375 {0xF935,{0x8606,0x0,0x0}}, {0xF936,{0x865C,0x0,0x0}}, {0xF937,{0x8DEF,0x0,0x0}}, 376 {0xF938,{0x9732,0x0,0x0}}, {0xF939,{0x9B6F,0x0,0x0}}, {0xF93A,{0x9DFA,0x0,0x0}}, 377 {0xF93B,{0x788C,0x0,0x0}}, {0xF93C,{0x797F,0x0,0x0}}, {0xF93D,{0x7DA0,0x0,0x0}}, 378 {0xF93E,{0x83C9,0x0,0x0}}, {0xF93F,{0x9304,0x0,0x0}}, {0xF940,{0x9E7F,0x0,0x0}}, 379 {0xF941,{0x8AD6,0x0,0x0}}, {0xF942,{0x58DF,0x0,0x0}}, {0xF943,{0x5F04,0x0,0x0}}, 380 {0xF944,{0x7C60,0x0,0x0}}, {0xF945,{0x807E,0x0,0x0}}, {0xF946,{0x7262,0x0,0x0}}, 381 {0xF947,{0x78CA,0x0,0x0}}, {0xF948,{0x8CC2,0x0,0x0}}, {0xF949,{0x96F7,0x0,0x0}}, 382 {0xF94A,{0x58D8,0x0,0x0}}, {0xF94B,{0x5C62,0x0,0x0}}, {0xF94C,{0x6A13,0x0,0x0}}, 383 {0xF94D,{0x6DDA,0x0,0x0}}, {0xF94E,{0x6F0F,0x0,0x0}}, {0xF94F,{0x7D2F,0x0,0x0}}, 384 {0xF950,{0x7E37,0x0,0x0}}, {0xF951,{0x96FB,0x0,0x0}}, {0xF952,{0x52D2,0x0,0x0}}, 385 {0xF953,{0x808B,0x0,0x0}}, {0xF954,{0x51DC,0x0,0x0}}, {0xF955,{0x51CC,0x0,0x0}}, 386 {0xF956,{0x7A1C,0x0,0x0}}, {0xF957,{0x7DBE,0x0,0x0}}, {0xF958,{0x83F1,0x0,0x0}}, 387 {0xF959,{0x9675,0x0,0x0}}, {0xF95A,{0x8B80,0x0,0x0}}, {0xF95B,{0x62CF,0x0,0x0}}, 388 {0xF95C,{0x6A02,0x0,0x0}}, {0xF95D,{0x8AFE,0x0,0x0}}, {0xF95E,{0x4E39,0x0,0x0}}, 389 {0xF95F,{0x5BE7,0x0,0x0}}, {0xF960,{0x6012,0x0,0x0}}, {0xF961,{0x7387,0x0,0x0}}, 390 {0xF962,{0x7570,0x0,0x0}}, {0xF963,{0x5317,0x0,0x0}}, {0xF964,{0x78FB,0x0,0x0}}, 391 {0xF965,{0x4FBF,0x0,0x0}}, {0xF966,{0x5FA9,0x0,0x0}}, {0xF967,{0x4E0D,0x0,0x0}}, 392 {0xF968,{0x6CCC,0x0,0x0}}, {0xF969,{0x6578,0x0,0x0}}, {0xF96A,{0x7D22,0x0,0x0}}, 393 {0xF96B,{0x53C3,0x0,0x0}}, {0xF96C,{0x585E,0x0,0x0}}, {0xF96D,{0x7701,0x0,0x0}}, 394 {0xF96E,{0x8449,0x0,0x0}}, {0xF96F,{0x8AAA,0x0,0x0}}, {0xF970,{0x6BBA,0x0,0x0}}, 395 {0xF971,{0x8FB0,0x0,0x0}}, {0xF972,{0x6C88,0x0,0x0}}, {0xF973,{0x62FE,0x0,0x0}}, 396 {0xF974,{0x82E5,0x0,0x0}}, {0xF975,{0x63A0,0x0,0x0}}, {0xF976,{0x7565,0x0,0x0}}, 397 {0xF977,{0x4EAE,0x0,0x0}}, {0xF978,{0x5169,0x0,0x0}}, {0xF979,{0x51C9,0x0,0x0}}, 398 {0xF97A,{0x6881,0x0,0x0}}, {0xF97B,{0x7CE7,0x0,0x0}}, {0xF97C,{0x826F,0x0,0x0}}, 399 {0xF97D,{0x8AD2,0x0,0x0}}, {0xF97E,{0x91CF,0x0,0x0}}, {0xF97F,{0x52F5,0x0,0x0}}, 400 {0xF980,{0x5442,0x0,0x0}}, {0xF981,{0x5973,0x0,0x0}}, {0xF982,{0x5EEC,0x0,0x0}}, 401 {0xF983,{0x65C5,0x0,0x0}}, {0xF984,{0x6FFE,0x0,0x0}}, {0xF985,{0x792A,0x0,0x0}}, 402 {0xF986,{0x95AD,0x0,0x0}}, {0xF987,{0x9A6A,0x0,0x0}}, {0xF988,{0x9E97,0x0,0x0}}, 403 {0xF989,{0x9ECE,0x0,0x0}}, {0xF98A,{0x529B,0x0,0x0}}, {0xF98B,{0x66C6,0x0,0x0}}, 404 {0xF98C,{0x6B77,0x0,0x0}}, {0xF98D,{0x8F62,0x0,0x0}}, {0xF98E,{0x5E74,0x0,0x0}}, 405 {0xF98F,{0x6190,0x0,0x0}}, {0xF990,{0x6200,0x0,0x0}}, {0xF991,{0x649A,0x0,0x0}}, 406 {0xF992,{0x6F23,0x0,0x0}}, {0xF993,{0x7149,0x0,0x0}}, {0xF994,{0x7489,0x0,0x0}}, 407 {0xF995,{0x79CA,0x0,0x0}}, {0xF996,{0x7DF4,0x0,0x0}}, {0xF997,{0x806F,0x0,0x0}}, 408 {0xF998,{0x8F26,0x0,0x0}}, {0xF999,{0x84EE,0x0,0x0}}, {0xF99A,{0x9023,0x0,0x0}}, 409 {0xF99B,{0x934A,0x0,0x0}}, {0xF99C,{0x5217,0x0,0x0}}, {0xF99D,{0x52A3,0x0,0x0}}, 410 {0xF99E,{0x54BD,0x0,0x0}}, {0xF99F,{0x70C8,0x0,0x0}}, {0xF9A0,{0x88C2,0x0,0x0}}, 411 {0xF9A1,{0x8AAA,0x0,0x0}}, {0xF9A2,{0x5EC9,0x0,0x0}}, {0xF9A3,{0x5FF5,0x0,0x0}}, 412 {0xF9A4,{0x637B,0x0,0x0}}, {0xF9A5,{0x6BAE,0x0,0x0}}, {0xF9A6,{0x7C3E,0x0,0x0}}, 413 {0xF9A7,{0x7375,0x0,0x0}}, {0xF9A8,{0x4EE4,0x0,0x0}}, {0xF9A9,{0x56F9,0x0,0x0}}, 414 {0xF9AA,{0x5BE7,0x0,0x0}}, {0xF9AB,{0x5DBA,0x0,0x0}}, {0xF9AC,{0x601C,0x0,0x0}}, 415 {0xF9AD,{0x73B2,0x0,0x0}}, {0xF9AE,{0x7469,0x0,0x0}}, {0xF9AF,{0x7F9A,0x0,0x0}}, 416 {0xF9B0,{0x8046,0x0,0x0}}, {0xF9B1,{0x9234,0x0,0x0}}, {0xF9B2,{0x96F6,0x0,0x0}}, 417 {0xF9B3,{0x9748,0x0,0x0}}, {0xF9B4,{0x9818,0x0,0x0}}, {0xF9B5,{0x4F8B,0x0,0x0}}, 418 {0xF9B6,{0x79AE,0x0,0x0}}, {0xF9B7,{0x91B4,0x0,0x0}}, {0xF9B8,{0x96B8,0x0,0x0}}, 419 {0xF9B9,{0x60E1,0x0,0x0}}, {0xF9BA,{0x4E86,0x0,0x0}}, {0xF9BB,{0x50DA,0x0,0x0}}, 420 {0xF9BC,{0x5BEE,0x0,0x0}}, {0xF9BD,{0x5C3F,0x0,0x0}}, {0xF9BE,{0x6599,0x0,0x0}}, 421 {0xF9BF,{0x6A02,0x0,0x0}}, {0xF9C0,{0x71CE,0x0,0x0}}, {0xF9C1,{0x7642,0x0,0x0}}, 422 {0xF9C2,{0x84FC,0x0,0x0}}, {0xF9C3,{0x907C,0x0,0x0}}, {0xF9C4,{0x9F8D,0x0,0x0}}, 423 {0xF9C5,{0x6688,0x0,0x0}}, {0xF9C6,{0x962E,0x0,0x0}}, {0xF9C7,{0x5289,0x0,0x0}}, 424 {0xF9C8,{0x677B,0x0,0x0}}, {0xF9C9,{0x67F3,0x0,0x0}}, {0xF9CA,{0x6D41,0x0,0x0}}, 425 {0xF9CB,{0x6E9C,0x0,0x0}}, {0xF9CC,{0x7409,0x0,0x0}}, {0xF9CD,{0x7559,0x0,0x0}}, 426 {0xF9CE,{0x786B,0x0,0x0}}, {0xF9CF,{0x7D10,0x0,0x0}}, {0xF9D0,{0x985E,0x0,0x0}}, 427 {0xF9D1,{0x516D,0x0,0x0}}, {0xF9D2,{0x622E,0x0,0x0}}, {0xF9D3,{0x9678,0x0,0x0}}, 428 {0xF9D4,{0x502B,0x0,0x0}}, {0xF9D5,{0x5D19,0x0,0x0}}, {0xF9D6,{0x6DEA,0x0,0x0}}, 429 {0xF9D7,{0x8F2A,0x0,0x0}}, {0xF9D8,{0x5F8B,0x0,0x0}}, {0xF9D9,{0x6144,0x0,0x0}}, 430 {0xF9DA,{0x6817,0x0,0x0}}, {0xF9DB,{0x7387,0x0,0x0}}, {0xF9DC,{0x9686,0x0,0x0}}, 431 {0xF9DD,{0x5229,0x0,0x0}}, {0xF9DE,{0x540F,0x0,0x0}}, {0xF9DF,{0x5C65,0x0,0x0}}, 432 {0xF9E0,{0x6613,0x0,0x0}}, {0xF9E1,{0x674E,0x0,0x0}}, {0xF9E2,{0x68A8,0x0,0x0}}, 433 {0xF9E3,{0x6CE5,0x0,0x0}}, {0xF9E4,{0x7406,0x0,0x0}}, {0xF9E5,{0x75E2,0x0,0x0}}, 434 {0xF9E6,{0x7F79,0x0,0x0}}, {0xF9E7,{0x88CF,0x0,0x0}}, {0xF9E8,{0x88E1,0x0,0x0}}, 435 {0xF9E9,{0x91CC,0x0,0x0}}, {0xF9EA,{0x96E2,0x0,0x0}}, {0xF9EB,{0x533F,0x0,0x0}}, 436 {0xF9EC,{0x6EBA,0x0,0x0}}, {0xF9ED,{0x541D,0x0,0x0}}, {0xF9EE,{0x71D0,0x0,0x0}}, 437 {0xF9EF,{0x7498,0x0,0x0}}, {0xF9F0,{0x85FA,0x0,0x0}}, {0xF9F1,{0x96A3,0x0,0x0}}, 438 {0xF9F2,{0x9C57,0x0,0x0}}, {0xF9F3,{0x9E9F,0x0,0x0}}, {0xF9F4,{0x6797,0x0,0x0}}, 439 {0xF9F5,{0x6DCB,0x0,0x0}}, {0xF9F6,{0x81E8,0x0,0x0}}, {0xF9F7,{0x7ACB,0x0,0x0}}, 440 {0xF9F8,{0x7B20,0x0,0x0}}, {0xF9F9,{0x7C92,0x0,0x0}}, {0xF9FA,{0x72C0,0x0,0x0}}, 441 {0xF9FB,{0x7099,0x0,0x0}}, {0xF9FC,{0x8B58,0x0,0x0}}, {0xF9FD,{0x4EC0,0x0,0x0}}, 442 {0xF9FE,{0x8336,0x0,0x0}}, {0xF9FF,{0x523A,0x0,0x0}}, {0xFA00,{0x5207,0x0,0x0}}, 443 {0xFA01,{0x5EA6,0x0,0x0}}, {0xFA02,{0x62D3,0x0,0x0}}, {0xFA03,{0x7CD6,0x0,0x0}}, 444 {0xFA04,{0x5B85,0x0,0x0}}, {0xFA05,{0x6D1E,0x0,0x0}}, {0xFA06,{0x66B4,0x0,0x0}}, 445 {0xFA07,{0x8F3B,0x0,0x0}}, {0xFA08,{0x884C,0x0,0x0}}, {0xFA09,{0x964D,0x0,0x0}}, 446 {0xFA0A,{0x898B,0x0,0x0}}, {0xFA0B,{0x5ED3,0x0,0x0}}, {0xFA0C,{0x5140,0x0,0x0}}, 447 {0xFA0D,{0x55C0,0x0,0x0}}, {0xFA10,{0x585A,0x0,0x0}}, {0xFA12,{0x6674,0x0,0x0}}, 448 {0xFA15,{0x51DE,0x0,0x0}}, {0xFA16,{0x732A,0x0,0x0}}, {0xFA17,{0x76CA,0x0,0x0}}, 449 {0xFA18,{0x793C,0x0,0x0}}, {0xFA19,{0x795E,0x0,0x0}}, {0xFA1A,{0x7965,0x0,0x0}}, 450 {0xFA1B,{0x798F,0x0,0x0}}, {0xFA1C,{0x9756,0x0,0x0}}, {0xFA1D,{0x7CBE,0x0,0x0}}, 451 {0xFA1E,{0x7FBD,0x0,0x0}}, {0xFA20,{0x8612,0x0,0x0}}, {0xFA22,{0x8AF8,0x0,0x0}}, 452 {0xFA25,{0x9038,0x0,0x0}}, {0xFA26,{0x90FD,0x0,0x0}}, {0xFA2A,{0x98EF,0x0,0x0}}, 453 {0xFA2B,{0x98FC,0x0,0x0}}, {0xFA2C,{0x9928,0x0,0x0}}, {0xFA2D,{0x9DB4,0x0,0x0}}, 454 {0xFB1F,{0x5F2,0x5B7,0x0}}, {0xFB2A,{0x5E9,0x5C1,0x0}}, {0xFB2B,{0x5E9,0x5C2,0x0}}, 455 {0xFB2C,{0x5E9,0x5BC,0x5C1}}, {0xFB2D,{0x5E9,0x5BC,0x5C2}}, {0xFB2E,{0x5D0,0x5B7,0x0}}, 456 {0xFB2F,{0x5D0,0x5B8,0x0}}, {0xFB30,{0x5D0,0x5BC,0x0}}, {0xFB31,{0x5D1,0x5BC,0x0}}, 457 {0xFB32,{0x5D2,0x5BC,0x0}}, {0xFB33,{0x5D3,0x5BC,0x0}}, {0xFB34,{0x5D4,0x5BC,0x0}}, 458 {0xFB35,{0x5D5,0x5BC,0x0}}, {0xFB36,{0x5D6,0x5BC,0x0}}, {0xFB38,{0x5D8,0x5BC,0x0}}, 459 {0xFB39,{0x5D9,0x5BC,0x0}}, {0xFB3A,{0x5DA,0x5BC,0x0}}, {0xFB3B,{0x5DB,0x5BC,0x0}}, 460 {0xFB3C,{0x5DC,0x5BC,0x0}}, {0xFB3E,{0x5DE,0x5BC,0x0}}, {0xFB40,{0x5E0,0x5BC,0x0}}, 461 {0xFB41,{0x5E1,0x5BC,0x0}}, {0xFB43,{0x5E3,0x5BC,0x0}}, {0xFB44,{0x5E4,0x5BC,0x0}}, 462 {0xFB46,{0x5E6,0x5BC,0x0}}, {0xFB47,{0x5E7,0x5BC,0x0}}, {0xFB48,{0x5E8,0x5BC,0x0}}, 463 {0xFB49,{0x5E9,0x5BC,0x0}}, {0xFB4A,{0x5EA,0x5BC,0x0}}, {0xFB4B,{0x5D5,0x5B9,0x0}}, 464 {0xFB4C,{0x5D1,0x5BF,0x0}}, {0xFB4D,{0x5DB,0x5BF,0x0}}, {0xFB4E,{0x5E4,0x5BF,0x0}} 465 465 }; 466 466 … … 1464 1464 * column 1465 1465 */ 1466 /* unsignedlong *unicode_cat_data;*/1466 /*mg_u_long *unicode_cat_data;*/ 1467 1467 1468 1468 void create_unicat_data () { … … 1470 1470 int min_start=0; 1471 1471 int min_end=0; 1472 register unsignedlong min_value=0; /* filling the whole byte */1472 register mg_u_long min_value=0; /* filling the whole byte */ 1473 1473 1474 1474 const unirange *letter_here = letter_info; … … 1480 1480 1481 1481 if (unicode_cat_data != NULL) return; 1482 unicode_cat_data = ( unsignedlong *) malloc (0x10000/4);1482 unicode_cat_data = (mg_u_long *) malloc (0x10000/4); 1483 1483 if (unicode_cat_data == NULL) return; 1484 1484 … … 1529 1529 1530 1530 } else { 1531 register unsignedlong mask = 3 << ((i % 16) * 2);1531 register mg_u_long mask = 3 << ((i % 16) * 2); 1532 1532 unicode_cat_data[i/16] = (unicode_cat_data[i/16] & (~mask)) | 1533 1533 (min_value & mask); -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/win32in.c
r16583 r25147 3 3 #include "win32in.h" 4 4 5 unsigned long htonl(unsignedlong x) {5 mg_u_long htonl(mg_u_long x) { 6 6 #if defined (LITTLE_ENDIAN) || defined (_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN) 7 7 x = ((x >> 24) & 0x000000FF) | ((x >> 8) & 0x0000FF00) | … … 24 24 } 25 25 26 unsigned long ntohl(unsignedlong x) {26 mg_u_long ntohl(mg_u_long x) { 27 27 #if defined (LITTLE_ENDIAN) || defined (_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN) 28 28 x = ((x >> 24) & 0x000000FF) | ((x >> 8) & 0x0000FF00) | … … 50 50 51 51 main () { 52 long x;52 mg_s_long x; 53 53 short sx; 54 54 -
main/trunk/greenstone2/common-src/indexers/mgpp/lib/win32in.h
r16583 r25147 6 6 7 7 #include "longlong.h" 8 #include "mglong.h" 8 9 #ifdef __cplusplus 9 10 extern "C" { 10 11 #endif 11 12 12 unsigned long htonl(unsignedlong x);13 unsigned long ntohl(unsignedlong x);13 mg_u_long htonl(mg_u_long x); 14 mg_u_long ntohl(mg_u_long x); 14 15 mg_ullong ntohll(mg_ullong x); 15 16 unsigned short htons(unsigned short x); -
main/trunk/greenstone2/common-src/indexers/mgpp/text/FIvfLevelInfo.cpp
r16583 r25147 79 79 80 80 // read in the array size 81 unsignedlong arrSize = 0;81 mg_u_long arrSize = 0; 82 82 if (!ReadVarLenUL (f, arrSize)) return false; 83 83 -
main/trunk/greenstone2/common-src/indexers/mgpp/text/FIvfLevelInfo.h
r16583 r25147 31 31 #endif 32 32 33 #include "mglong.h" 33 34 #include <stdio.h> 34 35 #include "UCArray.h" … … 38 39 public: 39 40 UCArray levelTag; 40 unsignedlong numEntries; // N for level41 unsignedlong approxWeightsDiskPtr;42 unsignedlong exactWeightsDiskPtr;41 mg_u_long numEntries; // N for level 42 mg_u_long approxWeightsDiskPtr; 43 mg_u_long exactWeightsDiskPtr; 43 44 bool workInLevel; // this is just a working variable, 44 45 // it is not saved or read from the file -
main/trunk/greenstone2/common-src/indexers/mgpp/text/FText.cpp
r16583 r25147 41 41 } 42 42 43 #define BITADDRLEN (sizeof( unsignedlong) + sizeof(unsigned char))43 #define BITADDRLEN (sizeof(mg_u_long) + sizeof(unsigned char)) 44 44 45 45 … … 85 85 bool FTextLevel::Read (FILE *f) { 86 86 // read in the array size 87 unsignedlong arrSize = 0;87 mg_u_long arrSize = 0; 88 88 if (!ReadVarLenUL (f, arrSize)) return false; 89 89 … … 141 141 142 142 bool TextIdx::Read (FILE *f, const TextLevelInfo &levelInfo, 143 unsignedlong docNum) {143 mg_u_long docNum) { 144 144 if (!SeekTextIdx (f, levelInfo, docNum)) return false; 145 145 return Read (f); … … 166 166 167 167 bool SeekTextIdx (FILE *f, const TextLevelInfo &levelInfo, 168 unsignedlong docNum) {168 mg_u_long docNum) { 169 169 if (docNum == 0 || docNum > levelInfo.numEntries) return false; 170 170 171 unsignedlong seekPos = levelInfo.textIdxPtr + (docNum-1) * TEXTIDXLEN;171 mg_u_long seekPos = levelInfo.textIdxPtr + (docNum-1) * TEXTIDXLEN; 172 172 if (fseek (f, seekPos, SEEK_SET) != 0) return false; 173 173 … … 176 176 177 177 178 bool ReadTextIdxArray (FILE *f, TextIdxArray &a, unsignedlong arrSize) {178 bool ReadTextIdxArray (FILE *f, TextIdxArray &a, mg_u_long arrSize) { 179 179 // clear the array 180 180 a.erase (a.begin(), a.end()); … … 218 218 } 219 219 220 void CompressTextInfo::SetStart ( unsignedlong startPos,220 void CompressTextInfo::SetStart (mg_u_long startPos, 221 221 unsigned char startBit, 222 222 unsigned char startWhich) { … … 232 232 } 233 233 234 void CompressTextInfo::SetEnd ( unsignedlong endPos,234 void CompressTextInfo::SetEnd (mg_u_long endPos, 235 235 unsigned char endBit) { 236 236 if (inDoc) { -
main/trunk/greenstone2/common-src/indexers/mgpp/text/FText.h
r16583 r25147 38 38 class BitAddr { 39 39 public: 40 unsignedlong byte;40 mg_u_long byte; 41 41 unsigned char bit; 42 42 … … 52 52 public: 53 53 UCArray levelTag; 54 unsignedlong textIdxPtr;55 unsignedlong numEntries;54 mg_u_long textIdxPtr; 55 mg_u_long numEntries; 56 56 57 57 TextLevelInfo (); … … 96 96 // does a seek and reads the appropriate record 97 97 bool Read (FILE *f, const TextLevelInfo &levelInfo, 98 unsignedlong docNum);98 mg_u_long docNum); 99 99 100 100 bool Read (FILE *f); … … 109 109 110 110 bool SeekTextIdx (FILE *f, const TextLevelInfo &levelInfo, 111 unsignedlong docNum);111 mg_u_long docNum); 112 112 113 113 … … 115 115 typedef vector<TextIdx> TextIdxArray; 116 116 117 bool ReadTextIdxArray (FILE *f, TextIdxArray &a, unsignedlong arrSize);117 bool ReadTextIdxArray (FILE *f, TextIdxArray &a, mg_u_long arrSize); 118 118 bool WriteTextIdxArray (FILE *f, const TextIdxArray &a); 119 119 … … 135 135 // set the start of a level (closing off the last opening 136 136 // tag if needed) 137 void SetStart ( unsignedlong startPos,137 void SetStart (mg_u_long startPos, 138 138 unsigned char startBit, 139 139 unsigned char startWhich); … … 141 141 // if in a document, it will set the end, add the document to the 142 142 // list of document ptrs, and then call ResetStart 143 void SetEnd ( unsignedlong endPos,143 void SetEnd (mg_u_long endPos, 144 144 unsigned char endBit); 145 145 }; -
main/trunk/greenstone2/common-src/indexers/mgpp/text/FragLevelConvert.cpp
r16583 r25147 31 31 32 32 bool FragLevelConvert::Read (FILE *invfFile, 33 unsignedlong levelPtr,34 unsignedlong _numFrags,35 unsignedlong _numLevelDocs) {33 mg_u_long levelPtr, 34 mg_u_long _numFrags, 35 mg_u_long _numLevelDocs) { 36 36 levelStarts.erase (levelStarts.begin(), levelStarts.end()); 37 37 numFrags = _numFrags; … … 43 43 stdio_bitio_buffer buffer(invfFile); 44 44 45 unsignedlong pTag = numLevelDocs*2;46 unsignedlong B = BIO_Bblock_Init (numFrags+pTag, pTag);47 unsignedlong fragNum = 0;48 unsignedlong i;45 mg_u_long pTag = numLevelDocs*2; 46 mg_u_long B = BIO_Bblock_Init (numFrags+pTag, pTag); 47 mg_u_long fragNum = 0; 48 mg_u_long i; 49 49 for (i=0; i<numLevelDocs; ++i) { 50 unsignedlong delta = buffer.bblock_decode (B, NULL)-1;50 mg_u_long delta = buffer.bblock_decode (B, NULL)-1; 51 51 fragNum += delta; 52 52 … … 70 70 } 71 71 72 bool FragLevelConvert::FragToLevel ( unsignedlong fragNum,73 unsignedlong &levelDocNum) const {72 bool FragLevelConvert::FragToLevel (mg_u_long fragNum, 73 mg_u_long &levelDocNum) const { 74 74 // do binary search for something containing this fragment number 75 unsignedlong low = 1, high = numLevelDocs;76 unsignedlong mid;75 mg_u_long low = 1, high = numLevelDocs; 76 mg_u_long mid; 77 77 78 78 while ((mid = (low+high)/2) >= 1 && low <= high) { … … 89 89 90 90 bool FragLevelConvert::LevelToLevel (FragLevelConvert sectionLevelConvert, 91 unsigned long levelNum, unsignedlong &DocNum) {91 mg_u_long levelNum, mg_u_long &DocNum) { 92 92 93 93 if (levelNum==1) { … … 95 95 return true; 96 96 } 97 unsignedlong levelfragnum = sectionLevelConvert.levelStarts[levelNum-1]+1;97 mg_u_long levelfragnum = sectionLevelConvert.levelStarts[levelNum-1]+1; 98 98 99 99 if (FragToLevel(levelfragnum, DocNum)) { -
main/trunk/greenstone2/common-src/indexers/mgpp/text/FragLevelConvert.h
r16583 r25147 23 23 #define FRAGLEVELCONVERT_H 24 24 25 #include "mglong.h" 25 26 #include <stdio.h> 26 27 #include "UCArray.h" 27 28 28 29 29 /*Notes about levelStarts (kjm18) - this is my interpretation of … … 45 45 protected: 46 46 // note fragment start is one before before real start 47 vector< unsignedlong> levelStarts;48 unsignedlong numFrags;49 unsignedlong numLevelDocs;47 vector<mg_u_long> levelStarts; 48 mg_u_long numFrags; 49 mg_u_long numLevelDocs; 50 50 51 51 public: 52 52 FragLevelConvert (); 53 53 54 bool Read (FILE *invfFile, unsignedlong levelPtr,55 unsigned long _numFrags, unsignedlong _numLevelDocs);54 bool Read (FILE *invfFile, mg_u_long levelPtr, 55 mg_u_long _numFrags, mg_u_long _numLevelDocs); 56 56 57 bool FragToLevel ( unsigned long fragNum, unsignedlong &levelDocNum) const;57 bool FragToLevel (mg_u_long fragNum, mg_u_long &levelDocNum) const; 58 58 59 59 // this function converts from one level number to another … … 64 64 // coresponding level 65 65 bool LevelToLevel (FragLevelConvert sectionLevelConvert, 66 unsigned long levelNum, unsignedlong &DocNum);66 mg_u_long levelNum, mg_u_long &DocNum); 67 67 }; 68 68 -
main/trunk/greenstone2/common-src/indexers/mgpp/text/GSDLQueryParser.cpp
r16583 r25147 140 140 } 141 141 142 static unsignedlong GetStemMethod(LexEl &el, int defaultStemMethod) {142 static mg_u_long GetStemMethod(LexEl &el, int defaultStemMethod) { 143 143 // here expect el to contain some of c,s,i,u,f,a -- see mg_files.h CHAR_FLAG_STEM_* constants 144 unsigned long stem = (unsignedlong)defaultStemMethod;144 mg_u_long stem = (mg_u_long)defaultStemMethod; 145 145 146 146 UCArray::const_iterator here = el.text.begin(); … … 205 205 if (termNode.stemMethod == STEM_INVALID) { // error so backtrack 206 206 here = oldHere; 207 termNode.stemMethod = ( unsignedlong)defaultStemMethod;207 termNode.stemMethod = (mg_u_long)defaultStemMethod; 208 208 } 209 209 } else here = oldHere; //ignore - wrong syntax -
main/trunk/greenstone2/common-src/indexers/mgpp/text/IndexData.cpp
r16583 r25147 163 163 // read in the information from the dictionary 164 164 block_dict_el tagEl; 165 unsignedlong tagElNum;165 mg_u_long tagElNum; 166 166 if (!SearchBlockDictEl (dictFile, biTags, bdh.entries_per_tblk, 167 167 bdh.tag_dict_size, level, tagEl, tagElNum)) -
main/trunk/greenstone2/common-src/indexers/mgpp/text/IndexData.h
r16583 r25147 59 59 // level specific information 60 60 UCArray curLevel; // last level that was loaded 61 unsignedlong curLevelNum;61 mg_u_long curLevelNum; 62 62 FragLevelConvert levelConverter; 63 63 ApproxWeightsData weightData; -
main/trunk/greenstone2/common-src/indexers/mgpp/text/MGQuery.cpp
r16583 r25147 40 40 void PrintNode (ostream &s, QueryNode *node, int indent) { 41 41 if (node == NULL) { 42 PrintIndentText (s, "NULL\n", indent);42 PrintIndentText (s, (char*)"NULL\n", indent); 43 43 } else { 44 44 node->Print (s, indent+2); … … 102 102 103 103 // combine document numbers and corresponding ranks 104 unsignedlong leftI = 0;105 unsignedlong rightI = 0;106 unsignedlong outI = 0;104 mg_u_long leftI = 0; 105 mg_u_long rightI = 0; 106 mg_u_long outI = 0; 107 107 while (leftI < result.docs.size() && 108 108 rightI < rightResult.docs.size()) { … … 146 146 147 147 void AndQueryNode::Print (ostream &s, int indent) const { 148 PrintIndentText (s, "leftNode:\n", indent);148 PrintIndentText (s, (char*)"leftNode:\n", indent); 149 149 PrintNode (s, leftNode, indent+2); 150 PrintIndentText (s, "AND\n", indent);151 PrintIndentText (s, "rightNode:\n", indent);150 PrintIndentText (s, (char*)"AND\n", indent); 151 PrintIndentText (s, (char*)"rightNode:\n", indent); 152 152 PrintNode (s, rightNode, indent+2); 153 153 } … … 187 187 188 188 // combine document numbers and corresponding ranks 189 unsignedlong leftSize = leftResult.docs.size();190 unsignedlong rightSize = rightResult.docs.size();191 unsignedlong leftI = 0;192 unsignedlong rightI = 0;193 unsignedlong leftDocNum = 0;194 unsignedlong rightDocNum = 0;189 mg_u_long leftSize = leftResult.docs.size(); 190 mg_u_long rightSize = rightResult.docs.size(); 191 mg_u_long leftI = 0; 192 mg_u_long rightI = 0; 193 mg_u_long leftDocNum = 0; 194 mg_u_long rightDocNum = 0; 195 195 while (leftI < leftSize || rightI < rightSize) { 196 196 // check leftI 197 197 if (leftI < leftResult.docs.size()) 198 198 leftDocNum = leftResult.docs[leftI]; 199 else leftDocNum = ULONG_MAX;199 else leftDocNum = (mg_u_long)ULONG_MAX; 200 200 201 201 // check rightI 202 202 if (rightI < rightResult.docs.size()) 203 203 rightDocNum = rightResult.docs[rightI]; 204 else rightDocNum = ULONG_MAX;204 else rightDocNum = (mg_u_long)ULONG_MAX; 205 205 206 206 // combine … … 250 250 251 251 void OrQueryNode::Print (ostream &s, int indent) const { 252 PrintIndentText (s, "leftNode:\n", indent);252 PrintIndentText (s, (char*)"leftNode:\n", indent); 253 253 PrintNode (s, leftNode, indent+2); 254 PrintIndentText (s, "OR\n", indent);255 PrintIndentText (s, "rightNode:\n", indent);254 PrintIndentText (s, (char*)"OR\n", indent); 255 PrintIndentText (s, (char*)"rightNode:\n", indent); 256 256 PrintNode (s, rightNode, indent+2); 257 257 } … … 297 297 298 298 // combine document numbers and corresponding ranks 299 unsignedlong queryI = 0;300 unsignedlong notI = 0;301 unsignedlong outI = 0;299 mg_u_long queryI = 0; 300 mg_u_long notI = 0; 301 mg_u_long outI = 0; 302 302 while (queryI < result.docs.size() && 303 303 notI < notResult.docs.size()) { … … 342 342 343 343 void NotQueryNode::Print (ostream &s, int indent) const { 344 PrintIndentText (s, "queryNode:\n", indent);344 PrintIndentText (s, (char*)"queryNode:\n", indent); 345 345 PrintNode (s, queryNode, indent+2); 346 PrintIndentText (s, "NOT\n", indent);347 PrintIndentText (s, "notNode:\n", indent);346 PrintIndentText (s, (char*)"NOT\n", indent); 347 PrintIndentText (s, (char*)"notNode:\n", indent); 348 348 PrintNode (s, notNode, indent+2); 349 349 } … … 361 361 // get information about this tag 362 362 block_dict_el tagEl; 363 unsignedlong tagElNum;363 mg_u_long tagElNum; 364 364 if (!SearchBlockDictEl (indexData.dictFile, indexData.biTags, 365 365 indexData.bdh.entries_per_tblk, … … 373 373 stdio_bitio_buffer buffer(indexData.invfFile); 374 374 375 unsignedlong pTag = tagEl.frag_occur*2;376 unsignedlong B = BIO_Bblock_Init (indexData.bdh.num_frags+pTag, pTag);377 unsignedlong fragNum = 0;378 unsignedlong i;375 mg_u_long pTag = tagEl.frag_occur*2; 376 mg_u_long B = BIO_Bblock_Init (indexData.bdh.num_frags+pTag, pTag); 377 mg_u_long fragNum = 0; 378 mg_u_long i; 379 379 FragRange thisFrag; 380 380 for (i=0; i<tagEl.frag_occur; ++i) { 381 381 // get start 382 unsignedlong delta = buffer.bblock_decode (B, NULL)-1;382 mg_u_long delta = buffer.bblock_decode (B, NULL)-1; 383 383 fragNum += delta; 384 384 … … 427 427 428 428 // get a list of term numbers 429 vector< unsignedlong> equivNums;429 vector<mg_u_long> equivNums; 430 430 FindWordNumbers (indexData, term, stemMethod, equivNums); 431 431 … … 435 435 FragData tempFragData2; 436 436 UCArray equivWord; 437 vector< unsignedlong>::iterator here = equivNums.begin();438 vector< unsignedlong>::iterator end = equivNums.end();437 vector<mg_u_long>::iterator here = equivNums.begin(); 438 vector<mg_u_long>::iterator end = equivNums.end(); 439 439 while (here != end) { 440 440 // get the information for this word … … 565 565 566 566 void ProxMatchQueryNode::Print (ostream &s, int indent) const { 567 PrintIndentText (s, "PROXMATCH\n", indent);567 PrintIndentText (s, (char*)"PROXMATCH\n", indent); 568 568 if (tagNodePtr != NULL) tagNodePtr->Print (s, indent+2); 569 569 … … 583 583 void BrowseQueryNode::Calculate (IndexData &indexData, BrowseQueryResult &result) const { 584 584 585 unsignedlong number=0;585 mg_u_long number=0; 586 586 FindNearestWordNumber(indexData, term, number); 587 587 if (number + startPosition > 0 ) { … … 604 604 605 605 void BrowseQueryNode::Print (ostream &s, int indent) const { 606 PrintIndentText(s, "BROWSEQUERYNODE\n", indent);606 PrintIndentText(s, (char*)"BROWSEQUERYNODE\n", indent); 607 607 PrintIndent (s, indent+2); 608 608 s << "TERM:"<<term<<"\n"; … … 631 631 632 632 // make weights into ranks if needed 633 unsignedlong i;633 mg_u_long i; 634 634 if (queryInfo.sortByRank || queryInfo.needRankInfo) { 635 635 for (i=0; i<result.ranks.size(); ++i) { … … 639 639 } 640 640 641 unsignedlong resultsSize = queryInfo.maxDocs;641 mg_u_long resultsSize = queryInfo.maxDocs; 642 642 if (resultsSize == 0 || resultsSize > result.docs.size()) 643 643 resultsSize = result.docs.size(); … … 655 655 result.docs.begin()+resultsSize, 656 656 result.ranks.begin()+resultsSize, 657 ( unsignedlong) result.ranks.size()-resultsSize,657 (mg_u_long) result.ranks.size()-resultsSize, 658 658 gtRank); 659 659 … … 665 665 if (queryInfo.exactWeights && 666 666 (queryInfo.sortByRank || queryInfo.needRankInfo)) { 667 unsignedlong exactDiskPtr =667 mg_u_long exactDiskPtr = 668 668 indexData.levels.levelInfo[indexData.curLevel].exactWeightsDiskPtr; 669 669 … … 737 737 } 738 738 739 unsignedlong DocNum = 0;740 741 for ( unsignedlong i=0; i<realresult.docs.size(); ++i) {739 mg_u_long DocNum = 0; 740 741 for (mg_u_long i=0; i<realresult.docs.size(); ++i) { 742 742 743 743 // do an if ! here???? -
main/trunk/greenstone2/common-src/indexers/mgpp/text/MGQuery.h
r16583 r25147 107 107 108 108 109 #define NO_TERM_RANGE_START ( LONG_MIN/2)110 #define NO_TERM_RANGE_END ( LONG_MAX/2)109 #define NO_TERM_RANGE_START (INT_MIN/2) 110 #define NO_TERM_RANGE_END (INT_MAX/2) 111 111 112 112 /* NOTE: range stuff - the range values are for the previous term relative … … 123 123 public: 124 124 UCArray term; 125 unsignedlong termWeight;126 unsignedlong stemMethod;127 signedlong startRange; // range relative to last term128 signedlong endRange;125 mg_u_long termWeight; 126 mg_u_long stemMethod; 127 mg_s_long startRange; // range relative to last term 128 mg_s_long endRange; 129 129 130 130 void Clear (); … … 161 161 public: 162 162 UCArray term; 163 signedlong startPosition;164 unsignedlong numTerms;163 mg_s_long startPosition; 164 mg_u_long numTerms; 165 165 166 166 void Clear(); -
main/trunk/greenstone2/common-src/indexers/mgpp/text/Makefile.in
r22070 r25147 53 53 CC = @CC@ 54 54 CXX = @CXX@ 55 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@-ansi -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS)56 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@-fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS)55 CFLAGS = @CFLAGS@ -ansi -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS) 56 CXXFLAGS = @CXXFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS) 57 57 DEFS = @DEFS@ 58 58 RANLIB = @RANLIB@ … … 60 60 INSTALL_DATA = @INSTALL_DATA@ 61 61 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 62 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@62 LDFLAGS = @LDFLAGS@ 63 63 LIBS = ../lib/libmgpplib.a $(AFLIBS) -lstdc++ ../../../packages/iconv/lib/libiconv.a @LIBS@ 64 64 TOUCH = echo timestamp > -
main/trunk/greenstone2/common-src/indexers/mgpp/text/QueryResultsSort.h
r16583 r25147 45 45 void PushHeap (DocNumArray::iterator docNumHeap, 46 46 RandomAccessIterator parallelHeap, 47 unsignedlong heapSize,47 mg_u_long heapSize, 48 48 const Compare &comp) { 49 unsignedlong holeIndex = heapSize-1;50 unsignedlong parent = (holeIndex - 1) / 2;49 mg_u_long holeIndex = heapSize-1; 50 mg_u_long parent = (holeIndex - 1) / 2; 51 51 while (holeIndex > 0 && comp (*(parallelHeap+parent), 52 52 *(parallelHeap+holeIndex))) { … … 63 63 void AdjustHeap (DocNumArray::iterator docNumHeap, 64 64 RandomAccessIterator parallelHeap, 65 unsignedlong holeIndex,66 unsignedlong heapSize,65 mg_u_long holeIndex, 66 mg_u_long heapSize, 67 67 const Compare &comp) { 68 unsignedlong secondChild = 2 * holeIndex + 2;68 mg_u_long secondChild = 2 * holeIndex + 2; 69 69 while (secondChild < heapSize) { 70 70 if (comp(*(parallelHeap + secondChild), … … 87 87 void PopHeap (DocNumArray::iterator docNumHeap, 88 88 RandomAccessIterator parallelHeap, 89 unsignedlong heapSize,89 mg_u_long heapSize, 90 90 const Compare &comp) { 91 91 swap (*(parallelHeap), *(parallelHeap+heapSize-1)); 92 92 swap (*(docNumHeap), *(docNumHeap+heapSize-1)); 93 AdjustHeap (docNumHeap, parallelHeap, ( unsignedlong)0, heapSize-1, comp);93 AdjustHeap (docNumHeap, parallelHeap, (mg_u_long)0, heapSize-1, comp); 94 94 } 95 95 … … 97 97 void MakeHeap (DocNumArray::iterator docNumHeap, 98 98 RandomAccessIterator parallelHeap, 99 unsignedlong size,99 mg_u_long size, 100 100 const Compare &comp) { 101 101 if (size < 2) return; 102 102 103 unsignedlong i = 0;103 mg_u_long i = 0; 104 104 for (i=1; i<=size; ++i) 105 105 PushHeap (docNumHeap, parallelHeap, i, comp); … … 110 110 void SortHeap (DocNumArray::iterator docNumHeap, 111 111 RandomAccessIterator parallelHeap, 112 unsignedlong size,112 mg_u_long size, 113 113 const Compare &comp) { 114 114 if (size < 2) return; 115 115 116 unsignedlong i;116 mg_u_long i; 117 117 for (i=size; i>1; --i) 118 118 PopHeap (docNumHeap, parallelHeap, i, comp); … … 123 123 void SelectAddHeap (DocNumArray::iterator docNumHeap, 124 124 RandomAccessIterator parallelHeap, 125 unsignedlong heapSize,125 mg_u_long heapSize, 126 126 DocNumArray::iterator docNumAdd, 127 127 RandomAccessIterator parallelAdd, 128 unsignedlong addSize,128 mg_u_long addSize, 129 129 const Compare &comp) { 130 unsignedlong i;130 mg_u_long i; 131 131 for (i=0; i<addSize; ++i) { 132 132 if (comp(*(parallelAdd+i), *(parallelHeap))) { 133 133 swap (*(docNumHeap), *(docNumAdd+i)); 134 134 swap (*(parallelHeap), *(parallelAdd+i)); 135 AdjustHeap (docNumHeap, parallelHeap, ( unsignedlong)0, heapSize, comp);135 AdjustHeap (docNumHeap, parallelHeap, (mg_u_long)0, heapSize, comp); 136 136 } 137 137 } -
main/trunk/greenstone2/common-src/indexers/mgpp/text/Queryer.cpp
r19822 r25147 63 63 int main (int argc, char **argv) { 64 64 int ch; 65 char *textfilename = "";66 char *indexfilename = "";67 char *basePath = "";65 char *textfilename = (char*)""; 66 char *indexfilename = (char*)""; 67 char *basePath = (char*)""; 68 68 69 69 opterr = 0; … … 186 186 // print 187 187 UCArray docText; 188 unsignedlong docNum = 0;188 mg_u_long docNum = 0; 189 189 cin >> docNum; 190 190 cin.getline(query, 2048, '\n'); // eat up return -
main/trunk/greenstone2/common-src/indexers/mgpp/text/Terms.cpp
r16583 r25147 50 50 << t.stemMethod << ")equiv terms("; 51 51 52 unsignedlong i;52 mg_u_long i; 53 53 for (i=0; i<t.equivTerms.size(); ++i) { 54 54 s << t.equivTerms[i] << ", "; … … 83 83 84 84 s << "termFreqs: "; 85 for ( unsignedlong i=0; i<termFreqs.size(); ++i)85 for (mg_u_long i=0; i<termFreqs.size(); ++i) 86 86 s << termFreqs[i] << ", "; 87 87 … … 94 94 ostream &operator<< (ostream &s, const QueryResult &r) { 95 95 s << "docs: "; 96 unsignedlong i;96 mg_u_long i; 97 97 for (i=0; i<r.docs.size(); ++i) 98 98 s << r.docs[i] << ", "; … … 136 136 ostream &operator<< (ostream &s, const ExtQueryResult &r) { 137 137 s << "docs: "; 138 unsignedlong i;138 mg_u_long i; 139 139 for (i=0; i<r.docs.size(); ++i) 140 140 s << r.docs[i] << ", "; … … 181 181 ostream &operator<< (ostream &s, const BrowseQueryResult &r) { 182 182 s << "terms: "; 183 unsignedlong i;183 mg_u_long i; 184 184 for (i=0; i<r.termFreqs.size(); ++i) 185 185 s << r.termFreqs[i] << ", "; … … 207 207 void FindWordNumbers (IndexData &indexData, 208 208 const UCArray &term, 209 unsignedlong stemMethod,210 vector< unsignedlong> &equivWords) {209 mg_u_long stemMethod, 210 vector<mg_u_long> &equivWords) { 211 211 equivWords.erase (equivWords.begin(), equivWords.end()); 212 212 … … 222 222 // don't need to stem the word, 223 223 // find the word number(s) for this term 224 unsignedlong wordElNum = 0;225 unsignedlong numLevels = indexData.bdh.num_levels;224 mg_u_long wordElNum = 0; 225 mg_u_long numLevels = indexData.bdh.num_levels; 226 226 word_block_dict_el wordDictEl; 227 227 wordDictEl.SetNumLevels (numLevels); … … 245 245 unsigned char mgWord[MAXSTEMLEN + 1]; 246 246 UCArray stemTerm; 247 unsignedlong stemmerNum = 0;247 mg_u_long stemmerNum = 0; 248 248 249 249 /* [JFG - Mar 06: Accent folding patch] */ … … 266 266 // need to look up this term in the appropriate dictionary 267 267 stem_block_dict_el stemDictEl; 268 unsignedlong stemElNum;268 mg_u_long stemElNum; 269 269 bool result = false; 270 270 … … 287 287 void ReadTermFragData (IndexData &indexData, 288 288 bool needFragFreqs, 289 unsignedlong termNum,289 mg_u_long termNum, 290 290 FragData &fragData, 291 291 FragRangeArray *fragLimits, … … 294 294 295 295 // look up the word in the dictionary 296 unsignedlong numLevels = indexData.bdh.num_levels;296 mg_u_long numLevels = indexData.bdh.num_levels; 297 297 word_block_dict_el wordDictEl; 298 298 wordDictEl.SetNumLevels (numLevels); … … 311 311 stdio_bitio_buffer buffer (indexData.invfFile); 312 312 313 unsignedlong B = BIO_Bblock_Init (indexData.bdh.num_frags,313 mg_u_long B = BIO_Bblock_Init (indexData.bdh.num_frags, 314 314 wordDictEl.frag_occur); 315 unsignedlong fragNum = 0;316 unsignedlong termFreq = 0;317 318 unsignedlong fragLimitI = 0;319 unsignedlong i;315 mg_u_long fragNum = 0; 316 mg_u_long termFreq = 0; 317 318 mg_u_long fragLimitI = 0; 319 mg_u_long i; 320 320 for (i=0; i<wordDictEl.frag_occur; ++i) { 321 321 fragNum += buffer.bblock_decode (B, NULL); … … 359 359 360 360 // do or 361 unsignedlong f1I = 0, f1Size = f1.fragNums.size();362 unsignedlong f2I = 0, f2Size = f2.fragNums.size();361 mg_u_long f1I = 0, f1Size = f1.fragNums.size(); 362 mg_u_long f2I = 0, f2Size = f2.fragNums.size(); 363 363 while (f1I < f1Size || f2I < f2Size) { 364 364 if (f2I < f2Size && … … 395 395 FragData &fragData, 396 396 const FragData &comFragData, 397 signedlong startRange,398 signedlong endRange,397 mg_s_long startRange, 398 mg_s_long endRange, 399 399 const FragRangeArray *fragLimits) { 400 400 // sanity check on range 401 401 if (startRange > endRange) { 402 signedlong temp = endRange;402 mg_s_long temp = endRange; 403 403 endRange = startRange; 404 404 startRange = temp; … … 409 409 fragData.matchDocs = comFragData.matchDocs; 410 410 411 unsignedlong fragDataI = 0;412 unsignedlong fragDataSize = fragData.fragNums.size();413 unsignedlong comFragDataI = 0;414 unsignedlong comFragDataSize = comFragData.fragNums.size();415 unsignedlong fragLimitI = 0;416 unsignedlong fragLimitSize = (fragLimits==NULL) ? 0 : (*fragLimits).size();417 unsignedlong outI = 0;411 mg_u_long fragDataI = 0; 412 mg_u_long fragDataSize = fragData.fragNums.size(); 413 mg_u_long comFragDataI = 0; 414 mg_u_long comFragDataSize = comFragData.fragNums.size(); 415 mg_u_long fragLimitI = 0; 416 mg_u_long fragLimitSize = (fragLimits==NULL) ? 0 : (*fragLimits).size(); 417 mg_u_long outI = 0; 418 418 419 419 while (fragDataI < fragDataSize && 420 420 comFragDataI < comFragDataSize) { 421 signed long fragNum = (signedlong)fragData.fragNums[fragDataI];422 signed long comFragNum = (signedlong)comFragData.fragNums[comFragDataI];421 mg_s_long fragNum = (mg_s_long)fragData.fragNums[fragDataI]; 422 mg_s_long comFragNum = (mg_s_long)comFragData.fragNums[comFragDataI]; 423 423 424 424 // go to the right fragment limit (for the com frag) 425 425 if (fragLimits != NULL) { 426 426 while (fragLimitI+1 < fragLimitSize && 427 comFragNum > ( signedlong)(*fragLimits)[fragLimitI+1].rangeStart) {427 comFragNum > (mg_s_long)(*fragLimits)[fragLimitI+1].rangeStart) { 428 428 ++fragLimitI; 429 429 } … … 432 432 if (fragNum <= comFragNum+startRange || 433 433 (fragLimits!=NULL && 434 fragNum<=( signedlong)(*fragLimits)[fragLimitI].rangeStart)) {434 fragNum<=(mg_s_long)(*fragLimits)[fragLimitI].rangeStart)) { 435 435 ++fragDataI; 436 436 437 437 } else if (fragNum > comFragNum+endRange || 438 438 (fragLimits!=NULL && 439 fragNum>( signedlong)(*fragLimits)[fragLimitI].rangeEnd)) {439 fragNum>(mg_s_long)(*fragLimits)[fragLimitI].rangeEnd)) { 440 440 ++comFragDataI; 441 441 … … 471 471 const UCArray &tag, 472 472 const UCArray &term, 473 unsignedlong stemMethod,474 unsignedlong termWeight,473 mg_u_long stemMethod, 474 mg_u_long termWeight, 475 475 UCArrayVector &equivTerms, 476 476 QueryResult &result) { … … 480 480 481 481 // log (N / ft) 482 unsignedlong N = indexData.levels.levelInfo[indexData.curLevel].numEntries;482 mg_u_long N = indexData.levels.levelInfo[indexData.curLevel].numEntries; 483 483 float wordLog = log((double)N / (double)termData.matchDocs); 484 484 … … 491 491 float Wdt; 492 492 493 unsignedlong termDataI = 0;494 unsignedlong termDataSize = termData.fragNums.size();495 unsignedlong levelDocNum = 0;496 497 unsignedlong termDocFreq = 0;498 unsignedlong lastLevelDocNum = 0;499 unsignedlong overallwordfreq = 0;493 mg_u_long termDataI = 0; 494 mg_u_long termDataSize = termData.fragNums.size(); 495 mg_u_long levelDocNum = 0; 496 497 mg_u_long termDocFreq = 0; 498 mg_u_long lastLevelDocNum = 0; 499 mg_u_long overallwordfreq = 0; 500 500 501 501 while (termDataI < termDataSize) { … … 552 552 const UCArray &tag, 553 553 const UCArray &term, 554 unsignedlong stemMethod,555 unsignedlong termWeight,554 mg_u_long stemMethod, 555 mg_u_long termWeight, 556 556 UCArrayVector &equivTerms, 557 557 QueryResult &result) { … … 571 571 float Wdt; 572 572 573 unsignedlong termDataI = 0;574 unsignedlong termDataSize = termData.fragNums.size();575 unsignedlong levelDocNum = 0;576 577 unsignedlong termDocFreq = 0;578 unsignedlong lastLevelDocNum = 0;579 unsignedlong overallwordfreq = 0;580 unsignedlong resultI = 0;581 unsignedlong resultSize = result.docs.size();582 unsignedlong resultOutI = 0;573 mg_u_long termDataI = 0; 574 mg_u_long termDataSize = termData.fragNums.size(); 575 mg_u_long levelDocNum = 0; 576 577 mg_u_long termDocFreq = 0; 578 mg_u_long lastLevelDocNum = 0; 579 mg_u_long overallwordfreq = 0; 580 mg_u_long resultI = 0; 581 mg_u_long resultSize = result.docs.size(); 582 mg_u_long resultOutI = 0; 583 583 584 584 … … 664 664 bool needRanks = (queryInfo.sortByRank || queryInfo.needRankInfo); 665 665 666 unsignedlong termDataI = 0;667 unsignedlong termDataSize = termData.fragNums.size();668 unsignedlong levelDocNum = 0;669 670 unsignedlong lastLevelDocNum = 0;671 672 unsignedlong resultI = 0;673 unsignedlong resultSize = result.docs.size();674 unsignedlong resultOutI = 0;666 mg_u_long termDataI = 0; 667 mg_u_long termDataSize = termData.fragNums.size(); 668 mg_u_long levelDocNum = 0; 669 670 mg_u_long lastLevelDocNum = 0; 671 672 mg_u_long resultI = 0; 673 mg_u_long resultSize = result.docs.size(); 674 mg_u_long resultOutI = 0; 675 675 676 676 while (termDataI < termDataSize) { … … 732 732 void FindNearestWordNumber (IndexData &indexData, 733 733 const UCArray &term, 734 unsignedlong &number) {734 mg_u_long &number) { 735 735 736 736 // find the word number for this term 737 unsignedlong wordElNum = 0;738 unsignedlong numLevels = indexData.bdh.num_levels;737 mg_u_long wordElNum = 0; 738 mg_u_long numLevels = indexData.bdh.num_levels; 739 739 word_block_dict_el wordDictEl; 740 740 wordDictEl.SetNumLevels (numLevels); … … 748 748 749 749 void GetTermList(IndexData &indexData, 750 unsignedlong startTerm,751 unsignedlong numTerms,750 mg_u_long startTerm, 751 mg_u_long numTerms, 752 752 TermFreqArray &terms) { 753 753 … … 777 777 778 778 void GetTermList(IndexData &indexData, 779 unsignedlong startTerm,780 unsignedlong numTerms,779 mg_u_long startTerm, 780 mg_u_long numTerms, 781 781 UCArrayVector &terms) { 782 782 -
main/trunk/greenstone2/common-src/indexers/mgpp/text/Terms.h
r16583 r25147 24 24 25 25 #include "IndexData.h" 26 #include "mglong.h" 26 27 27 28 #if defined(GSDL_USE_OBJECTSPACE) … … 38 39 // general query information 39 40 UCArray docLevel; 40 unsignedlong maxDocs; // 0 = all41 mg_u_long maxDocs; // 0 = all 41 42 bool sortByRank; 42 43 bool exactWeights; … … 57 58 int stemMethod; 58 59 UCArrayVector equivTerms; // the stemmed and casefolded variants of the term 59 unsignedlong matchDocs; // tf for level - num levels60 mg_u_long matchDocs; // tf for level - num levels 60 61 // containing this term 61 unsignedlong termFreq; // overall term freq - num words that62 mg_u_long termFreq; // overall term freq - num words that 62 63 // are this term 63 64 void Clear (); … … 72 73 73 74 typedef vector<float> RankArray; 74 typedef vector< unsignedlong> DocNumArray;75 typedef vector<mg_u_long> DocNumArray; 75 76 76 77 class QueryResult { … … 81 82 TermFreqArray termFreqs; 82 83 83 unsignedlong actualNumDocs;84 mg_u_long actualNumDocs; 84 85 void Clear (); 85 86 QueryResult (); … … 90 91 bool operator== (const QueryResult &r1, const QueryResult &r2); 91 92 92 typedef vector< unsignedlong> FragNumArray;93 typedef vector< unsignedlong> FragFreqArray;93 typedef vector<mg_u_long> FragNumArray; 94 typedef vector<mg_u_long> FragFreqArray; 94 95 95 96 class FragData { 96 97 public: 97 unsignedlong matchDocs; // ft for level98 mg_u_long matchDocs; // ft for level 98 99 FragNumArray fragNums; 99 100 FragFreqArray fragFreqs; … … 106 107 class FragRange { 107 108 public: 108 unsignedlong rangeStart;109 unsignedlong rangeEnd;109 mg_u_long rangeStart; 110 mg_u_long rangeEnd; 110 111 111 112 void Clear () { rangeStart = rangeEnd = 0; } … … 119 120 void FindWordNumbers (IndexData &indexData, 120 121 const UCArray &term, 121 unsignedlong stemMethod,122 vector< unsignedlong> &equivWords);122 mg_u_long stemMethod, 123 vector<mg_u_long> &equivWords); 123 124 124 125 void ReadTermFragData (IndexData &indexData, 125 126 bool needFragFreqs, 126 unsignedlong termNum,127 mg_u_long termNum, 127 128 FragData &fragData, 128 129 FragRangeArray *fragLimits, … … 138 139 FragData &fragData, 139 140 const FragData &comFragData, 140 signedlong startRange,141 signedlong endRange,141 mg_s_long startRange, 142 mg_s_long endRange, 142 143 const FragRangeArray *fragLimits); 143 144 … … 147 148 const UCArray &tag, 148 149 const UCArray &term, 149 unsignedlong stemMethod,150 unsignedlong termWeight,150 mg_u_long stemMethod, 151 mg_u_long termWeight, 151 152 UCArrayVector &equivTerms, 152 153 QueryResult &result); … … 157 158 const UCArray &tag, 158 159 const UCArray &term, 159 unsignedlong stemMethod,160 unsignedlong termWeight,160 mg_u_long stemMethod, 161 mg_u_long termWeight, 161 162 UCArrayVector &equivTerms, 162 163 QueryResult &result); … … 201 202 void FindNearestWordNumber (IndexData &indexData, 202 203 const UCArray &term, 203 unsignedlong &number);204 mg_u_long &number); 204 205 205 206 void GetTermList(IndexData &indexData, 206 unsignedlong startTerm,207 unsignedlong numTerms,207 mg_u_long startTerm, 208 mg_u_long numTerms, 208 209 TermFreqArray &terms); 209 210 210 211 void GetTermList (IndexData &indexData, 211 unsignedlong startTerm,212 unsignedlong numTerms,212 mg_u_long startTerm, 213 mg_u_long numTerms, 213 214 UCArrayVector &terms); 214 215 -
main/trunk/greenstone2/common-src/indexers/mgpp/text/TextEl.cpp
r16583 r25147 246 246 } 247 247 248 static void AddTextEl (TextElArray &doc, unsignedlong &docLen,248 static void AddTextEl (TextElArray &doc, mg_u_long &docLen, 249 249 const TextEl &el) { 250 250 doc.push_back (el); … … 258 258 259 259 bool ReadDoc (FileBuf &buf, const UCArray &docTag, 260 TextElArray &doc, unsignedlong &docLen,260 TextElArray &doc, mg_u_long &docLen, 261 261 bool compatMode) { 262 262 bool compatInPara = false; … … 316 316 // copy of readdoc to get TextElArray from u_char buffer 317 317 bool ReadDoc(u_char ** buffer, const UCArray &docTag, 318 TextElArray &doc, unsignedlong &docLen,318 TextElArray &doc, mg_u_long &docLen, 319 319 bool compatMode) { 320 320 bool compatInPara = false; -
main/trunk/greenstone2/common-src/indexers/mgpp/text/TextEl.h
r16583 r25147 60 60 // returns true if a document could be found 61 61 bool ReadDoc (FileBuf &buf, const UCArray &docTag, 62 TextElArray &doc, unsignedlong &docLen,62 TextElArray &doc, mg_u_long &docLen, 63 63 bool compatMode=false); 64 64 65 65 bool ReadDoc(u_char **buffer, const UCArray &docTag, 66 TextElArray &doc, unsignedlong &docLen,66 TextElArray &doc, mg_u_long &docLen, 67 67 bool compatMode=false); 68 68 -
main/trunk/greenstone2/common-src/indexers/mgpp/text/TextGet.cpp
r16583 r25147 187 187 huff_type type) { 188 188 huff_data * hd; 189 u_long ** vals;189 mg_u_long ** vals; 190 190 191 191 if (!(hd = new huff_data)) … … 326 326 if (text_fast_comp_dict == NULL) return false; 327 327 328 u _long*p, *end;328 uintptr_t *p, *end; 329 329 u_char *fixup; 330 u_long mem;331 u_long fixup_mem;330 mg_u_long mem; 331 mg_u_long fixup_mem; 332 332 int i; /* [RPAP - Jan 97: Endian Ordering] */ 333 333 … … 343 343 } 344 344 345 end = (u _long*) (((u_char *) cd) + mem);345 end = (uintptr_t *) (((u_char *) cd) + mem); 346 346 fread (cd, sizeof (u_char), mem, text_fast_comp_dict); 347 347 … … 354 354 fread (fixup, fixup_mem, sizeof (u_char), text_fast_comp_dict); 355 355 356 for (p = (u _long *) cd; (u_long) p < (u_long) end; ++p)356 for (p = (uintptr_t *) cd; (uintptr_t) p < (uintptr_t) end; ++p) 357 357 if (IS_FIXUP (p)) 358 358 { 359 359 NTOHUL(*p); /* [RPAP - Jan 97: Endian Ordering] */ 360 *p = *p + (u _long) cd;360 *p = *p + (uintptr_t) cd; 361 361 } 362 362 … … 464 464 465 465 // seek to the appropriate place and read the level information 466 bool res = ((fseek (levelFile, sizeof ( u_long), SEEK_SET) == 0) &&466 bool res = ((fseek (levelFile, sizeof (mg_u_long), SEEK_SET) == 0) && 467 467 levels.Read (levelFile)); 468 468 … … 507 507 508 508 // read in the compressed text header 509 if ((fseek (textFile, sizeof ( u_long), SEEK_SET) != 0) || !cth.Read (textFile))509 if ((fseek (textFile, sizeof (mg_u_long), SEEK_SET) != 0) || !cth.Read (textFile)) 510 510 return false; 511 511 … … 535 535 536 536 bool GetDocIdx (TextData &td, const UCArray &docLevel, 537 unsignedlong docNum, TextIdx &docIdx) {537 mg_u_long docNum, TextIdx &docIdx) { 538 538 // make sure the text index file was opened successfully 539 539 if (td.textIdxFile == NULL) return false; … … 551 551 #define MY_HUFF_DECODE(len, code, mcodes) \ 552 552 do { \ 553 register unsignedlong *__min_code = (mcodes); \554 register unsignedlong *__mclen = __min_code; \555 register unsignedlong __code = 0; \553 register mg_u_long *__min_code = (mcodes); \ 554 register mg_u_long *__mclen = __min_code; \ 555 register mg_u_long __code = 0; \ 556 556 do \ 557 557 { \ … … 565 565 566 566 bool GetDocText (TextData &td, const UCArray &docLevel, 567 unsignedlong docNum, UCArray &docText) {567 mg_u_long docNum, UCArray &docText) { 568 568 // erase the current text 569 569 docText.erase (docText.begin(), docText.end()); … … 581 581 auxiliary_dict *ad = cd.ad; 582 582 int which = docIdx.which; 583 unsignedlong num_bits = (docIdx.end.byte*8+(8-docIdx.end.bit)) -583 mg_u_long num_bits = (docIdx.end.byte*8+(8-docIdx.end.bit)) - 584 584 (docIdx.start.byte*8+(8-docIdx.start.bit)); 585 unsignedlong bits = 0;585 mg_u_long bits = 0; 586 586 587 587 if (docText.capacity() < docText.size() + num_bits + 1) { -
main/trunk/greenstone2/common-src/indexers/mgpp/text/TextGet.h
r16583 r25147 49 49 // get information about where a document starts and finishes 50 50 bool GetDocIdx (TextData &td, const UCArray &docLevel, 51 unsignedlong docNum, TextIdx &docIdx);51 mg_u_long docNum, TextIdx &docIdx); 52 52 53 53 54 54 // decompress a document's text 55 55 bool GetDocText (TextData &td, const UCArray &docLevel, 56 unsignedlong docNum, UCArray &docText);56 mg_u_long docNum, UCArray &docText); 57 57 58 58 #endif -
main/trunk/greenstone2/common-src/indexers/mgpp/text/UCArray.cpp
r16583 r25147 104 104 105 105 106 bool ReadVarLenUL (FILE *f, unsignedlong &n) {107 register unsignedlong temp = 0;106 bool ReadVarLenUL (FILE *f, mg_u_long &n) { 107 register mg_u_long temp = 0; 108 108 register unsigned int bitPos = 0; 109 109 unsigned char b = 0; … … 121 121 } 122 122 123 bool WriteVarLenUL (FILE *f, unsignedlong n) {124 register unsignedlong temp = n;123 bool WriteVarLenUL (FILE *f, mg_u_long n) { 124 register mg_u_long temp = n; 125 125 register unsigned char b = 0; 126 126 do { … … 135 135 136 136 137 bool ReadUL (FILE *f, unsignedlong &n) {138 if (fread (&n, sizeof ( unsignedlong), 1, f) <= 0) return false;137 bool ReadUL (FILE *f, mg_u_long &n) { 138 if (fread (&n, sizeof (mg_u_long), 1, f) <= 0) return false; 139 139 NTOHUL (n); 140 140 return true; … … 142 142 143 143 144 bool WriteUL (FILE *f, unsignedlong n) {144 bool WriteUL (FILE *f, mg_u_long n) { 145 145 HTONUL (n); 146 return (fwrite (&n, sizeof ( unsignedlong), 1, f) > 0);146 return (fwrite (&n, sizeof (mg_u_long), 1, f) > 0); 147 147 } 148 148 … … 174 174 175 175 // read in the array size 176 unsignedlong arraySize = 0;176 mg_u_long arraySize = 0; 177 177 if (!ReadVarLenUL (f, arraySize)) return false; 178 178 … … 382 382 383 383 384 unsignedlong PrefixLen (const UCArray &a1, const UCArray &a2) {385 unsignedlong l = (a1.size() < a2.size()) ? a1.size() : a2.size();386 unsignedlong i = 0;384 mg_u_long PrefixLen (const UCArray &a1, const UCArray &a2) { 385 mg_u_long l = (a1.size() < a2.size()) ? a1.size() : a2.size(); 386 mg_u_long i = 0; 387 387 388 388 UCArray::const_iterator a1Here = a1.begin(); -
main/trunk/greenstone2/common-src/indexers/mgpp/text/UCArray.h
r18717 r25147 22 22 #ifndef UCARRAY_H 23 23 #define UCARRAY_H 24 25 #include "mglong.h" 24 26 25 27 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) … … 81 83 82 84 // used for reading and writing variable length unsigned longs 83 bool ReadVarLenUL (FILE *f, unsignedlong &n);84 bool WriteVarLenUL (FILE *f, unsignedlong n);85 bool ReadVarLenUL (FILE *f, mg_u_long &n); 86 bool WriteVarLenUL (FILE *f, mg_u_long n); 85 87 86 // used for reading and writing unsigned longs 87 bool ReadUL (FILE *f, unsignedlong &n);88 bool WriteUL (FILE *f, unsignedlong n);88 // used for reading and writing unsigned longs 89 bool ReadUL (FILE *f, mg_u_long &n); 90 bool WriteUL (FILE *f, mg_u_long n); 89 91 90 92 // used for reading and writing floats … … 123 125 typedef vector<UCArray> UCArrayVector; 124 126 125 unsignedlong PrefixLen (const UCArray &a1, const UCArray &a2);127 mg_u_long PrefixLen (const UCArray &a1, const UCArray &a2); 126 128 127 129 // prev == NULL if no previous string -
main/trunk/greenstone2/common-src/indexers/mgpp/text/Weights.cpp
r16583 r25147 24 24 #include "sysfuncs.h" 25 25 26 #define MAXBITS (sizeof( unsignedlong) * 8)26 #define MAXBITS (sizeof(mg_u_long) * 8) 27 27 28 28 … … 53 53 } 54 54 55 bool ApproxWeightsData::Read (FILE *approxWeightsFile, unsignedlong diskPtr,56 unsignedlong _numLevelDocs) {55 bool ApproxWeightsData::Read (FILE *approxWeightsFile, mg_u_long diskPtr, 56 mg_u_long _numLevelDocs) { 57 57 Free (); 58 58 … … 69 69 70 70 // allocate buffer for the weights 71 unsigned long arrSize = (bits*numLevelDocs+sizeof(unsignedlong)-1) / 32;72 weightBuf = new unsignedlong[arrSize];71 mg_u_long arrSize = (bits*numLevelDocs+sizeof(mg_u_long)-1) / 32; 72 weightBuf = new mg_u_long[arrSize]; 73 73 74 74 // read in the weights 75 unsignedlong i;75 mg_u_long i; 76 76 for (i=0; i<arrSize; ++i) { 77 77 ReadUL (approxWeightsFile, weightBuf[i]); … … 81 81 // (if not small enough table == NULL 82 82 if (bits <= 12) { 83 unsignedlong i, tableSize = (1 << bits);83 mg_u_long i, tableSize = (1 << bits); 84 84 table = new float[tableSize]; 85 85 table[0] = L; … … 91 91 } 92 92 93 float ApproxWeightsData::GetLowerApproxDocWeight ( unsignedlong levelDocNum) {93 float ApproxWeightsData::GetLowerApproxDocWeight (mg_u_long levelDocNum) { 94 94 // sanity check 95 95 if (bits == 0 || weightBuf == NULL) return 1.0; 96 96 97 register unsignedlong c, pos;98 register unsignedlong *dw;97 register mg_u_long c, pos; 98 register mg_u_long *dw; 99 99 100 100 // get the compressed version of the weight … … 114 114 115 115 116 float GetExactDocWeight (FILE *exactWeightsFile, unsignedlong diskPtr,117 unsignedlong levelDocNum) {116 float GetExactDocWeight (FILE *exactWeightsFile, mg_u_long diskPtr, 117 mg_u_long levelDocNum) { 118 118 // go to the appropriate place in the weights file 119 119 fseek (exactWeightsFile, diskPtr+sizeof(float)*levelDocNum, SEEK_SET); -
main/trunk/greenstone2/common-src/indexers/mgpp/text/Weights.h
r16583 r25147 23 23 #define WEIGHTS_H 24 24 25 #include "mglong.h" 25 26 #include <stdio.h> 26 27 … … 29 30 public: 30 31 unsigned char bits; 31 unsignedlong mask;32 mg_u_long mask; 32 33 double L; 33 34 double B; 34 unsignedlong numLevelDocs;35 unsignedlong *weightBuf;35 mg_u_long numLevelDocs; 36 mg_u_long *weightBuf; 36 37 float *table; // precomputed translation table 37 38 … … 41 42 void Free (); // frees any allocated memory 42 43 43 bool Read (FILE *approxWeightsFile, unsignedlong diskPtr,44 unsignedlong _numLevelDocs);44 bool Read (FILE *approxWeightsFile, mg_u_long diskPtr, 45 mg_u_long _numLevelDocs); 45 46 46 float GetLowerApproxDocWeight ( unsignedlong levelDocNum);47 float GetLowerApproxDocWeight (mg_u_long levelDocNum); 47 48 }; 48 49 … … 50 51 // diskPtr points to the start of the exact document weights 51 52 // for this level 52 float GetExactDocWeight (FILE *exactWeightsFile, unsignedlong diskPtr,53 unsignedlong levelDocNum);53 float GetExactDocWeight (FILE *exactWeightsFile, mg_u_long diskPtr, 54 mg_u_long levelDocNum); 54 55 55 56 -
main/trunk/greenstone2/common-src/indexers/mgpp/text/WordData.h
r16583 r25147 24 24 25 25 public: 26 unsignedlong docCount;27 unsignedlong wordCount;26 mg_u_long docCount; 27 mg_u_long wordCount; 28 28 29 29 inline void read(FILE *f) … … 36 36 } 37 37 38 inline unsignedlong documents()38 inline mg_u_long documents() 39 39 { 40 40 return docCount; -
main/trunk/greenstone2/common-src/indexers/mgpp/text/build.h
r16583 r25147 77 77 78 78 79 extern unsignedlong invf_buffer_size;79 extern mg_u_long invf_buffer_size; 80 80 /* 81 81 * The amount of memory to allocate to the invertion buffer. -
main/trunk/greenstone2/common-src/indexers/mgpp/text/comp_dict.cpp
r16583 r25147 42 42 huff_data char_huff[2]; 43 43 huff_data lens_huff[2]; 44 u_long *char_codes[2], *lens_codes[2];45 u_long Words_disk = 0;46 u_long Chars_disk = 0;44 mg_u_long *char_codes[2], *lens_codes[2]; 45 mg_u_long Words_disk = 0; 46 mg_u_long Chars_disk = 0; 47 47 48 48 … … 55 55 dict_hash_table *ht; 56 56 u_char **words; 57 u_long ht_size;57 mg_u_long ht_size; 58 58 59 59 ht_size = prime (cfh->hd.num_codes * HASH_RATIO); … … 99 99 100 100 memcpy (allwords + 1, prev + 1, copy); 101 fread (allwords + copy + 1, sizeof (u_char), val, dict); 101 size_t numbytes = fread (allwords + copy + 1, sizeof (u_char), val, dict); 102 if (numbytes != val) 103 { 104 #ifdef DEBUG 105 fprintf(stderr, "[mgpp/text/comp_dict.cpp L104] number of bytes read by fread does not match the requested amount\n"); 106 #endif 107 } 102 108 *allwords = val + copy; 103 109 … … 108 114 { 109 115 register u_char **wptr; 110 register unsignedlong tsize = ht->size;111 register unsignedlong hashval, step;116 register mg_u_long tsize = ht->size; 117 register mg_u_long hashval, step; 112 118 113 119 HASH (hashval, step, allwords, tsize); … … 166 172 return COMPERROR; 167 173 168 Words_disk = sizeof ( u_long);174 Words_disk = sizeof (mg_u_long); 169 175 170 176 if (Read_cdh (dict, &cdh, NULL, &Words_disk) == -1) -
main/trunk/greenstone2/common-src/indexers/mgpp/text/comp_dict.h
r16583 r25147 24 24 typedef struct dict_hash_table 25 25 { 26 u_long size;26 mg_u_long size; 27 27 huff_data *hd; 28 u_long *codes;28 mg_u_long *codes; 29 29 u_char **words; 30 30 u_char **table[1]; … … 40 40 extern huff_data char_huff[2]; 41 41 extern huff_data lens_huff[2]; 42 extern u_long *char_codes[2], *lens_codes[2];43 extern u_long Words_disk;44 extern u_long Chars_disk;42 extern mg_u_long *char_codes[2], *lens_codes[2]; 43 extern mg_u_long Words_disk; 44 extern mg_u_long Chars_disk; 45 45 46 46 -
main/trunk/greenstone2/common-src/indexers/mgpp/text/hash.h
r16583 r25147 26 26 do { \ 27 27 register u_char *p=wd; \ 28 register long len = *p++; \29 register unsignedlong hval; \28 register mg_s_long len = *p++; \ 29 register mg_u_long hval; \ 30 30 if (len>25) len = 25; \ 31 31 for (hval=0; len; --len) \ -
main/trunk/greenstone2/common-src/indexers/mgpp/text/invf.cpp
r16583 r25147 104 104 } 105 105 106 void word_dict_el::SetNumLevels ( unsignedlong numLevels) {106 void word_dict_el::SetNumLevels (mg_u_long numLevels) { 107 107 if (levelFreqs != NULL) delete [] levelFreqs; 108 levelFreqs = new unsignedlong [numLevels];109 } 110 111 bool word_dict_el::Read (FILE *f, unsignedlong numLevels) {108 levelFreqs = new mg_u_long [numLevels]; 109 } 110 111 bool word_dict_el::Read (FILE *f, mg_u_long numLevels) { 112 112 if (!dict_el::Read (f)) return false; 113 113 114 114 if (levelFreqs == NULL) return false; 115 115 116 unsignedlong i;116 mg_u_long i; 117 117 for (i=0; i<numLevels; ++i) { 118 118 if (!ReadUL (f, levelFreqs[i])) return false; … … 123 123 124 124 bool word_dict_el::Write (FILE *f, const UCArray *lastEl, 125 unsignedlong numLevels) const {125 mg_u_long numLevels) const { 126 126 if (!dict_el::Write (f, lastEl)) return false; 127 127 128 128 if (levelFreqs == NULL) return false; 129 129 130 unsignedlong i;130 mg_u_long i; 131 131 for (i=0; i<numLevels; ++i) { 132 132 if (!WriteUL (f, levelFreqs[i])) return false; … … 229 229 } 230 230 231 void word_block_dict_el::SetNumLevels ( unsignedlong numLevels) {231 void word_block_dict_el::SetNumLevels (mg_u_long numLevels) { 232 232 if (levelFreqs != NULL) delete [] levelFreqs; 233 levelFreqs = new unsignedlong [numLevels];234 } 235 236 bool word_block_dict_el::Read (FILE *f, unsignedlong numLevels) {233 levelFreqs = new mg_u_long [numLevels]; 234 } 235 236 bool word_block_dict_el::Read (FILE *f, mg_u_long numLevels) { 237 237 if (!block_dict_el::Read (f)) return false; 238 238 239 239 if (levelFreqs == NULL) return false; 240 240 241 unsignedlong i;241 mg_u_long i; 242 242 for (i=0; i<numLevels; ++i) { 243 243 if (!ReadUL (f, levelFreqs[i])) return false; … … 248 248 249 249 bool word_block_dict_el::Write (FILE *f, const UCArray *lastEl, 250 unsignedlong numLevels) const {250 mg_u_long numLevels) const { 251 251 if (!block_dict_el::Write (f, lastEl)) return false; 252 252 253 253 if (levelFreqs == NULL) return false; 254 254 255 unsignedlong i;255 mg_u_long i; 256 256 for (i=0; i<numLevels; ++i) { 257 257 if (!WriteUL (f, levelFreqs[i])) return false; … … 288 288 289 289 // read in the array size 290 unsignedlong arraySize = 0;290 mg_u_long arraySize = 0; 291 291 if (!ReadVarLenUL (f, arraySize)) return false; 292 292 … … 383 383 384 384 // read in the array size 385 unsignedlong arraySize = 0;385 mg_u_long arraySize = 0; 386 386 if (!ReadVarLenUL (f, arraySize)) return false; 387 387 388 388 // read in the array 389 unsignedlong wordNum;389 mg_u_long wordNum; 390 390 while (arraySize > 0) { 391 391 if (!ReadUL (f, wordNum)) return false; … … 404 404 if (!WriteVarLenUL (f, equivWords.size())) return false; 405 405 406 vector< unsignedlong>::const_iterator here = equivWords.begin();407 vector< unsignedlong>::const_iterator end = equivWords.end();406 vector<mg_u_long>::const_iterator here = equivWords.begin(); 407 vector<mg_u_long>::const_iterator end = equivWords.end(); 408 408 while (here != end) { 409 409 if (!WriteUL (f, (*here))) return false; … … 464 464 465 465 bool SearchElNum (const block_idx &bIdx, 466 unsignedlong entriesPerBlock,467 unsignedlong elNum,468 unsignedlong &blockIdxNum,469 unsignedlong &blockStartElNum) {466 mg_u_long entriesPerBlock, 467 mg_u_long elNum, 468 mg_u_long &blockIdxNum, 469 mg_u_long &blockStartElNum) { 470 470 blockIdxNum = 0; 471 471 blockStartElNum = 0; … … 481 481 482 482 bool SearchEl (const block_idx &bIdx, 483 unsignedlong entriesPerBlock,483 mg_u_long entriesPerBlock, 484 484 const UCArray &el, 485 unsignedlong &blockIdxNum,486 unsignedlong &blockStartElNum) {485 mg_u_long &blockIdxNum, 486 mg_u_long &blockStartElNum) { 487 487 blockIdxNum = 0; 488 488 blockStartElNum = 0; 489 489 490 unsignedlong begin = 0;491 unsignedlong bIdxEnd = bIdx.size();492 unsignedlong end = bIdxEnd;493 unsignedlong mid;490 mg_u_long begin = 0; 491 mg_u_long bIdxEnd = bIdx.size(); 492 mg_u_long end = bIdxEnd; 493 mg_u_long mid; 494 494 while (begin < end) { 495 495 mid = (begin+end)/2; … … 517 517 bool SearchBlockDictElNum (FILE *dictFile, 518 518 const block_idx &bIdx, 519 unsignedlong entriesPerBlock,520 unsignedlong dictSize,521 unsignedlong elNum,519 mg_u_long entriesPerBlock, 520 mg_u_long dictSize, 521 mg_u_long elNum, 522 522 block_dict_el &dictEl) { 523 523 UCArrayClear (dictEl.el); … … 525 525 526 526 // find the block that contains the element 527 unsignedlong blockIdxNum, curElNum;527 mg_u_long blockIdxNum, curElNum; 528 528 if (!SearchElNum (bIdx, entriesPerBlock, elNum, 529 529 blockIdxNum, curElNum)) … … 541 541 bool SearchBlockDictEl (FILE *dictFile, 542 542 const block_idx &bIdx, 543 unsignedlong entriesPerBlock,544 unsignedlong dictSize,543 mg_u_long entriesPerBlock, 544 mg_u_long dictSize, 545 545 const UCArray &el, 546 546 block_dict_el &dictEl, 547 unsignedlong &elNum) {547 mg_u_long &elNum) { 548 548 UCArrayClear (dictEl.el); 549 549 550 550 // find the block that contains the element 551 unsignedlong blockIdxNum;551 mg_u_long blockIdxNum; 552 552 if (!SearchEl (bIdx, entriesPerBlock, el, 553 553 blockIdxNum, elNum)) 554 554 return false; 555 555 556 unsignedlong blockEndElNum = elNum + entriesPerBlock;556 mg_u_long blockEndElNum = elNum + entriesPerBlock; 557 557 if (blockEndElNum > dictSize) blockEndElNum = dictSize; 558 558 … … 576 576 bool SearchWordBlockDictElNum (FILE *dictFile, 577 577 const block_idx &bIdx, 578 unsignedlong entriesPerBlock,579 unsignedlong dictSize,580 unsignedlong numLevels,581 unsignedlong elNum,578 mg_u_long entriesPerBlock, 579 mg_u_long dictSize, 580 mg_u_long numLevels, 581 mg_u_long elNum, 582 582 word_block_dict_el &dictEl) { 583 583 UCArrayClear (dictEl.el); … … 585 585 586 586 // find the block that contains the element 587 unsignedlong blockIdxNum, curElNum;587 mg_u_long blockIdxNum, curElNum; 588 588 if (!SearchElNum (bIdx, entriesPerBlock, elNum, 589 589 blockIdxNum, curElNum)) … … 601 601 bool SearchWordBlockDictEl (FILE *dictFile, 602 602 const block_idx &bIdx, 603 unsignedlong entriesPerBlock,604 unsignedlong dictSize,605 unsignedlong numLevels,603 mg_u_long entriesPerBlock, 604 mg_u_long dictSize, 605 mg_u_long numLevels, 606 606 const UCArray &el, 607 607 word_block_dict_el &dictEl, 608 unsignedlong &elNum) {608 mg_u_long &elNum) { 609 609 UCArrayClear (dictEl.el); 610 610 611 611 // find the block that contains the element 612 unsignedlong blockIdxNum;612 mg_u_long blockIdxNum; 613 613 if (!SearchEl (bIdx, entriesPerBlock, el, 614 614 blockIdxNum, elNum)) 615 615 return false; 616 616 617 unsignedlong blockEndElNum = elNum + entriesPerBlock;617 mg_u_long blockEndElNum = elNum + entriesPerBlock; 618 618 if (blockEndElNum > dictSize) blockEndElNum = dictSize; 619 619 … … 637 637 bool SearchStemBlockDictElNum (FILE *dictFile, 638 638 const block_idx &bIdx, 639 unsignedlong entriesPerBlock,640 unsignedlong dictSize,641 unsignedlong elNum,639 mg_u_long entriesPerBlock, 640 mg_u_long dictSize, 641 mg_u_long elNum, 642 642 stem_block_dict_el &dictEl) { 643 643 UCArrayClear (dictEl.el); … … 645 645 646 646 // find the block that contains the element 647 unsignedlong blockIdxNum, curElNum;647 mg_u_long blockIdxNum, curElNum; 648 648 if (!SearchElNum (bIdx, entriesPerBlock, elNum, 649 649 blockIdxNum, curElNum)) … … 661 661 bool SearchStemBlockDictEl (FILE *dictFile, 662 662 const block_idx &bIdx, 663 unsignedlong entriesPerBlock,664 unsignedlong dictSize,663 mg_u_long entriesPerBlock, 664 mg_u_long dictSize, 665 665 const UCArray &el, 666 666 stem_block_dict_el &dictEl, 667 unsignedlong &elNum) {667 mg_u_long &elNum) { 668 668 UCArrayClear (dictEl.el); 669 669 670 670 // find the block that contains the element 671 unsignedlong blockIdxNum;671 mg_u_long blockIdxNum; 672 672 if (!SearchEl (bIdx, entriesPerBlock, el, 673 673 blockIdxNum, elNum)) 674 674 return false; 675 675 676 unsignedlong blockEndElNum = elNum + entriesPerBlock;676 mg_u_long blockEndElNum = elNum + entriesPerBlock; 677 677 if (blockEndElNum > dictSize) blockEndElNum = dictSize; 678 678 … … 696 696 bool PartialMatchSearchWordBlockDictEl (FILE *dictFile, 697 697 const block_idx &bIdx, 698 unsignedlong entriesPerBlock,699 unsignedlong dictSize,700 unsignedlong numLevels,698 mg_u_long entriesPerBlock, 699 mg_u_long dictSize, 700 mg_u_long numLevels, 701 701 const UCArray &el, 702 702 word_block_dict_el &dictEl, 703 vector< unsignedlong> &elNumList,703 vector<mg_u_long> &elNumList, 704 704 bool casefold) { 705 705 706 706 UCArrayClear (dictEl.el); 707 707 elNumList.erase (elNumList.begin(), elNumList.end()); 708 unsignedlong elNum;708 mg_u_long elNum; 709 709 // find the block that contains the element 710 unsignedlong blockIdxNum;710 mg_u_long blockIdxNum; 711 711 // will this work?? 712 712 if (!SearchEl (bIdx, entriesPerBlock, el, … … 714 714 return false; 715 715 } 716 unsignedlong blockEndElNum = elNum + entriesPerBlock;716 mg_u_long blockEndElNum = elNum + entriesPerBlock; 717 717 if (blockEndElNum > dictSize) blockEndElNum = dictSize; 718 718 … … 770 770 bool NearestSearchWordBlockDictEl (FILE *dictFile, 771 771 const block_idx &bIdx, 772 unsignedlong entriesPerBlock,773 unsignedlong dictSize,774 unsignedlong numLevels,772 mg_u_long entriesPerBlock, 773 mg_u_long dictSize, 774 mg_u_long numLevels, 775 775 const UCArray &el, 776 776 word_block_dict_el &dictEl, 777 unsignedlong &elNum) {777 mg_u_long &elNum) { 778 778 779 779 UCArrayClear (dictEl.el); 780 780 781 781 // find the block that contains the element 782 unsignedlong blockIdxNum;782 mg_u_long blockIdxNum; 783 783 if (!SearchEl (bIdx, entriesPerBlock, el, 784 784 blockIdxNum, elNum)) 785 785 return false; 786 786 787 unsignedlong blockEndElNum = elNum + entriesPerBlock;787 mg_u_long blockEndElNum = elNum + entriesPerBlock; 788 788 if (blockEndElNum > dictSize) blockEndElNum = dictSize; 789 789 … … 809 809 bool SearchWordBlockDictElNumRange (FILE *dictFile, 810 810 const block_idx &bIdx, 811 unsignedlong entriesPerBlock,812 unsignedlong dictSize,813 unsignedlong numLevels,814 unsignedlong elNum,815 unsignedlong numWords,811 mg_u_long entriesPerBlock, 812 mg_u_long dictSize, 813 mg_u_long numLevels, 814 mg_u_long elNum, 815 mg_u_long numWords, 816 816 UCArrayVector &terms) { 817 817 … … 825 825 826 826 // find the block that contains the element 827 unsignedlong blockIdxNum, curElNum;827 mg_u_long blockIdxNum, curElNum; 828 828 if (!SearchElNum (bIdx, entriesPerBlock, elNum, 829 829 blockIdxNum, curElNum)) 830 830 return false; 831 831 832 unsignedlong lastElNum = elNum + numWords - 1;832 mg_u_long lastElNum = elNum + numWords - 1; 833 833 if (lastElNum > dictSize) lastElNum = dictSize; 834 834 … … 859 859 bool SearchWordBlockDictElNumRange (FILE *dictFile, 860 860 const block_idx &bIdx, 861 unsignedlong entriesPerBlock,862 unsignedlong dictSize,863 unsignedlong numLevels,864 unsignedlong elNum,865 unsignedlong numWords,861 mg_u_long entriesPerBlock, 862 mg_u_long dictSize, 863 mg_u_long numLevels, 864 mg_u_long elNum, 865 mg_u_long numWords, 866 866 word_block_dict_el_array &terms) { 867 867 … … 876 876 877 877 // find the block that contains the element 878 unsignedlong blockIdxNum, curElNum;878 mg_u_long blockIdxNum, curElNum; 879 879 if (!SearchElNum (bIdx, entriesPerBlock, elNum, 880 880 blockIdxNum, curElNum)) 881 881 return false; 882 882 883 unsignedlong lastElNum = elNum + numWords - 1;883 mg_u_long lastElNum = elNum + numWords - 1; 884 884 if (lastElNum > dictSize) lastElNum = dictSize; 885 885 -
main/trunk/greenstone2/common-src/indexers/mgpp/text/invf.h
r16583 r25147 25 25 #define H_INVF 26 26 27 #include "mglong.h" 27 28 #include <stdio.h> 28 29 … … 32 33 // header info for .invf.dict file 33 34 struct invf_dict_header { 34 unsignedlong lookback;35 unsignedlong word_dict_start;36 unsignedlong word_dict_size;37 unsignedlong tag_dict_start;38 unsignedlong tag_dict_size;39 unsignedlong num_docs;40 unsignedlong num_frags;41 unsignedlong num_words;42 unsignedlong total_bytes;43 unsignedlong index_string_bytes;44 unsignedlong num_levels;35 mg_u_long lookback; 36 mg_u_long word_dict_start; 37 mg_u_long word_dict_size; 38 mg_u_long tag_dict_start; 39 mg_u_long tag_dict_size; 40 mg_u_long num_docs; 41 mg_u_long num_frags; 42 mg_u_long num_words; 43 mg_u_long total_bytes; 44 mg_u_long index_string_bytes; 45 mg_u_long num_levels; 45 46 46 47 invf_dict_header (); … … 55 56 struct dict_el { 56 57 UCArray el; // word or tag 57 unsignedlong frag_occur;58 unsignedlong freq;58 mg_u_long frag_occur; 59 mg_u_long freq; 59 60 60 61 virtual void Clear (); … … 69 70 70 71 struct word_dict_el : public dict_el { 71 unsignedlong *levelFreqs;72 mg_u_long *levelFreqs; 72 73 73 74 void Clear (); … … 75 76 ~word_dict_el (); 76 77 77 void SetNumLevels ( unsignedlong numLevels);78 void SetNumLevels (mg_u_long numLevels); 78 79 79 80 // SetNumLevels should be called before either … … 81 82 82 83 // Read assumes that the last word is in el 83 bool Read (FILE *f, unsignedlong numLevels);84 bool Read (FILE *f, mg_u_long numLevels); 84 85 bool Write (FILE *f, const UCArray *lastEl, 85 unsignedlong numLevels) const;86 mg_u_long numLevels) const; 86 87 }; 87 88 … … 100 101 // for blocked dictionaries 101 102 102 unsignedlong entries_per_wblk; // word blocks103 unsignedlong num_wblks;104 unsignedlong max_wblk_size;105 unsignedlong wblk_start;106 unsignedlong wblk_idx_start;107 108 unsignedlong entries_per_tblk; // tag blocks109 unsignedlong num_tblks;110 unsignedlong max_tblk_size;111 unsignedlong tblk_start;112 unsignedlong tblk_idx_start;103 mg_u_long entries_per_wblk; // word blocks 104 mg_u_long num_wblks; 105 mg_u_long max_wblk_size; 106 mg_u_long wblk_start; 107 mg_u_long wblk_idx_start; 108 109 mg_u_long entries_per_tblk; // tag blocks 110 mg_u_long num_tblks; 111 mg_u_long max_tblk_size; 112 mg_u_long tblk_start; 113 mg_u_long tblk_idx_start; 113 114 114 115 block_dict_header (); … … 122 123 struct block_dict_el { 123 124 UCArray el; // word or tag 124 unsignedlong frag_occur; // # entries in invf file - if have a125 mg_u_long frag_occur; // # entries in invf file - if have a 125 126 // word level index, this is the same as freq, otherwise, its the number 126 127 // of fragments containing this word 127 unsignedlong freq; // # of times this word occurs128 unsignedlong invf_ptr; // pointer into inverted file128 mg_u_long freq; // # of times this word occurs 129 mg_u_long invf_ptr; // pointer into inverted file 129 130 130 131 virtual void Clear (); … … 140 141 141 142 struct word_block_dict_el : public block_dict_el { 142 unsignedlong *levelFreqs; // freq of the word at each level143 mg_u_long *levelFreqs; // freq of the word at each level 143 144 144 145 void Clear (); … … 146 147 ~word_block_dict_el (); 147 148 148 void SetNumLevels ( unsignedlong numLevels);149 void SetNumLevels (mg_u_long numLevels); 149 150 150 151 // SetNumLevels should be called before either … … 152 153 153 154 // Read assumes that the last word is in el 154 bool Read (FILE *f, unsignedlong numLevels);155 bool Read (FILE *f, mg_u_long numLevels); 155 156 bool Write (FILE *f, const UCArray *lastEl, 156 unsignedlong numLevels) const;157 mg_u_long numLevels) const; 157 158 }; 158 159 … … 161 162 struct block_idx_info { 162 163 UCArray el; 163 unsignedlong block_ptr;164 mg_u_long block_ptr; 164 165 165 166 block_idx_info (); … … 179 180 180 181 struct stem_idx_header { 181 unsignedlong lookback;182 unsignedlong dict_size;183 184 unsignedlong entries_per_block;185 unsignedlong num_blocks;186 unsignedlong max_block_size;187 unsignedlong blocks_start;188 unsignedlong block_idx_start;189 190 unsignedlong stemmer_num;191 unsignedlong stem_method;182 mg_u_long lookback; 183 mg_u_long dict_size; 184 185 mg_u_long entries_per_block; 186 mg_u_long num_blocks; 187 mg_u_long max_block_size; 188 mg_u_long blocks_start; 189 mg_u_long block_idx_start; 190 191 mg_u_long stemmer_num; 192 mg_u_long stem_method; 192 193 193 194 stem_idx_header (); … … 200 201 struct stem_block_dict_el { 201 202 UCArray el; // word or tag 202 vector< unsignedlong> equivWords;203 vector<mg_u_long> equivWords; 203 204 204 205 stem_block_dict_el (); … … 220 221 // with num entries, and a pointer into invf file 221 222 struct invf_file_header { 222 unsignedlong no_of_words;223 unsignedlong no_of_tags;224 unsignedlong skip_mode;225 unsignedlong word_level_index; // 1 if word level index226 unsignedlong params[16];223 mg_u_long no_of_words; 224 mg_u_long no_of_tags; 225 mg_u_long skip_mode; 226 mg_u_long word_level_index; // 1 if word level index 227 mg_u_long params[16]; 227 228 228 229 invf_file_header (); … … 242 243 // the block index is sorted by DictCompare (or DictLTUCArray) 243 244 bool SearchElNum (const block_idx &bIdx, 244 unsignedlong entriesPerBlock,245 unsignedlong elNum,246 unsignedlong &blockIdxNum,247 unsignedlong &blockStartElNum);245 mg_u_long entriesPerBlock, 246 mg_u_long elNum, 247 mg_u_long &blockIdxNum, 248 mg_u_long &blockStartElNum); 248 249 bool SearchEl (const block_idx &bIdx, 249 unsignedlong entriesPerBlock,250 mg_u_long entriesPerBlock, 250 251 const UCArray &el, 251 unsignedlong &blockIdxNum,252 unsignedlong &blockStartElNum);252 mg_u_long &blockIdxNum, 253 mg_u_long &blockStartElNum); 253 254 254 255 … … 258 259 bool SearchBlockDictElNum (FILE *dictFile, 259 260 const block_idx &bIdx, 260 unsignedlong entriesPerBlock,261 unsignedlong dictSize,262 unsignedlong elNum,261 mg_u_long entriesPerBlock, 262 mg_u_long dictSize, 263 mg_u_long elNum, 263 264 block_dict_el &dictEl); 264 265 bool SearchBlockDictEl (FILE *dictFile, 265 266 const block_idx &bIdx, 266 unsignedlong entriesPerBlock,267 unsignedlong dictSize,267 mg_u_long entriesPerBlock, 268 mg_u_long dictSize, 268 269 const UCArray &el, 269 270 block_dict_el &dictEl, 270 unsignedlong &elNum);271 mg_u_long &elNum); 271 272 272 273 // assumes the numLevels has been set for dictEl 273 274 bool SearchWordBlockDictElNum (FILE *dictFile, 274 275 const block_idx &bIdx, 275 unsignedlong entriesPerBlock,276 unsignedlong dictSize,277 unsignedlong numLevels,278 unsignedlong elNum,276 mg_u_long entriesPerBlock, 277 mg_u_long dictSize, 278 mg_u_long numLevels, 279 mg_u_long elNum, 279 280 word_block_dict_el &dictEl); 280 281 bool SearchWordBlockDictEl (FILE *dictFile, 281 282 const block_idx &bIdx, 282 unsignedlong entriesPerBlock,283 unsignedlong dictSize,284 unsignedlong numLevels,283 mg_u_long entriesPerBlock, 284 mg_u_long dictSize, 285 mg_u_long numLevels, 285 286 const UCArray &el, 286 287 word_block_dict_el &dictEl, 287 unsignedlong &elNum);288 mg_u_long &elNum); 288 289 289 290 bool SearchStemBlockDictElNum (FILE *dictFile, 290 291 const block_idx &bIdx, 291 unsignedlong entriesPerBlock,292 unsignedlong dictSize,293 unsignedlong elNum,292 mg_u_long entriesPerBlock, 293 mg_u_long dictSize, 294 mg_u_long elNum, 294 295 stem_block_dict_el &dictEl); 295 296 bool SearchStemBlockDictEl (FILE *dictFile, 296 297 const block_idx &bIdx, 297 unsignedlong entriesPerBlock,298 unsignedlong dictSize,298 mg_u_long entriesPerBlock, 299 mg_u_long dictSize, 299 300 const UCArray &el, 300 301 stem_block_dict_el &dictEl, 301 unsignedlong &elNum);302 mg_u_long &elNum); 302 303 303 304 //----------------------------------------------------- … … 307 308 bool PartialMatchSearchWordBlockDictEl (FILE *dictFile, 308 309 const block_idx &bIdx, 309 unsignedlong entriesPerBlock,310 unsignedlong dictSize,311 unsignedlong numLevels,310 mg_u_long entriesPerBlock, 311 mg_u_long dictSize, 312 mg_u_long numLevels, 312 313 const UCArray &el, 313 314 word_block_dict_el &dictEl, 314 vector< unsignedlong> &elNumList,315 vector<mg_u_long> &elNumList, 315 316 bool casefold); 316 317 //---------------------------------------------------------- … … 320 321 bool NearestSearchWordBlockDictEl (FILE *dictFile, 321 322 const block_idx &bIdx, 322 unsignedlong entriesPerBlock,323 unsignedlong dictSize,324 unsignedlong numLevels,323 mg_u_long entriesPerBlock, 324 mg_u_long dictSize, 325 mg_u_long numLevels, 325 326 const UCArray &el, 326 327 word_block_dict_el &dictEl, 327 unsignedlong &elNum);328 mg_u_long &elNum); 328 329 329 330 // returns a list of word_block_dict_el, with no levelfreqs 330 331 bool SearchWordBlockDictElNumRange (FILE *dictFile, 331 332 const block_idx &bIdx, 332 unsignedlong entriesPerBlock,333 unsignedlong dictSize,334 unsignedlong numLevels,335 unsignedlong elNum,336 unsignedlong numWords,333 mg_u_long entriesPerBlock, 334 mg_u_long dictSize, 335 mg_u_long numLevels, 336 mg_u_long elNum, 337 mg_u_long numWords, 337 338 word_block_dict_el_array &terms); 338 339 … … 340 341 bool SearchWordBlockDictElNumRange (FILE *dictFile, 341 342 const block_idx &bIdx, 342 unsignedlong entriesPerBlock,343 unsignedlong dictSize,344 unsignedlong numLevels,345 unsignedlong elNum,346 unsignedlong numWords,343 mg_u_long entriesPerBlock, 344 mg_u_long dictSize, 345 mg_u_long numLevels, 346 mg_u_long elNum, 347 mg_u_long numWords, 347 348 UCArrayVector &terms); 348 349 -
main/trunk/greenstone2/common-src/indexers/mgpp/text/ivf.pass1.cpp
r16583 r25147 51 51 // structure to determine level information 52 52 struct LevelWorker { 53 unsignedlong lastLevelDocNum;54 unsignedlong count;53 mg_u_long lastLevelDocNum; 54 mg_u_long count; 55 55 56 56 LevelWorker () { … … 62 62 // note: the word is stored in the map 63 63 struct IvfWordInfo { 64 unsignedlong wordCount; // word frequency65 unsignedlong fragCount; // number of fragments that contain the word66 unsignedlong lastFragNum; // last fragment to contain the word67 unsignedlong chunkWordCount; // word frequency within this chunk68 unsignedlong chunkFragCount; // number of fragments within this chunk that64 mg_u_long wordCount; // word frequency 65 mg_u_long fragCount; // number of fragments that contain the word 66 mg_u_long lastFragNum; // last fragment to contain the word 67 mg_u_long chunkWordCount; // word frequency within this chunk 68 mg_u_long chunkFragCount; // number of fragments within this chunk that 69 69 // contain the word 70 70 … … 81 81 // tags don't require as much information 82 82 struct IvfTagInfo { 83 unsignedlong tagCount; // tag frequency84 unsignedlong fragCount; // number of fragments that contain the tag85 unsignedlong lastFragNum; // last fragment to contain the tag86 unsignedlong chunkFragCount; // number of fragments within this chunk that83 mg_u_long tagCount; // tag frequency 84 mg_u_long fragCount; // number of fragments that contain the tag 85 mg_u_long lastFragNum; // last fragment to contain the tag 86 mg_u_long chunkFragCount; // number of fragments within this chunk that 87 87 // contain the tag 88 88 … … 109 109 IvfTagInfoItArray ivfTagInfoOccurOrder; 110 110 111 static unsignedlong chunksWritten;112 static unsignedlong maxMemNeeded;113 114 static unsignedlong numDocs;115 static unsignedlong numChunkDocs;116 117 static unsignedlong numFrags;118 static unsignedlong numChunkFrags;119 120 static unsignedlong numWords;111 static mg_u_long chunksWritten; 112 static mg_u_long maxMemNeeded; 113 114 static mg_u_long numDocs; 115 static mg_u_long numChunkDocs; 116 117 static mg_u_long numFrags; 118 static mg_u_long numChunkFrags; 119 120 static mg_u_long numWords; 121 121 122 122 // the number of document numbers in the inverted file 123 static unsignedlong numChunkEntries;123 static mg_u_long numChunkEntries; 124 124 125 125 // next entry in the inverted file to check memory 126 126 // requirements for the current chunk 127 static unsignedlong entryCheckPoint;127 static mg_u_long entryCheckPoint; 128 128 129 129 // information about all the different levels … … 173 173 MAGIC_CHUNK, MG_MESSAGE))) 174 174 return COMPERROR; 175 fwrite (" ", sizeof ( u_long), 1, ic); // Space for the maxmem175 fwrite (" ", sizeof (mg_u_long), 1, ic); // Space for the maxmem 176 176 icb.attachFile (ic); 177 177 icb.encodeStart(); … … 195 195 196 196 numChunkEntries = 0; 197 entryCheckPoint = ( unsignedlong) ((invf_buffer_size * INIT_CHECK_FRAC) / CHECK_DIV);197 entryCheckPoint = (mg_u_long) ((invf_buffer_size * INIT_CHECK_FRAC) / CHECK_DIV); 198 198 199 199 // init the level information … … 347 347 348 348 349 static unsignedlong MemoryRequired (bool wordLevelIndex) {350 register unsignedlong total = 0;349 static mg_u_long MemoryRequired (bool wordLevelIndex) { 350 register mg_u_long total = 0; 351 351 352 352 // add memory required for word entries … … 372 372 if (info.chunkFragCount > 0) { 373 373 // two d entries for each frag entry 374 unsignedlong pTag = info.chunkFragCount*2;374 mg_u_long pTag = info.chunkFragCount*2; 375 375 total += BIO_Bblock_Bound (numChunkFrags+pTag, pTag); 376 376 } … … 385 385 386 386 /* 387 static void PrintChunkInfo ( unsignedlong mem) {387 static void PrintChunkInfo (mg_u_long mem) { 388 388 cout << "Chunk Number: " << chunksWritten << "\n"; 389 389 cout << "numChunkDocs " << numChunkDocs << "\n"; … … 396 396 IvfTagInfoMap::iterator tagMapHere = ivfTagInfo.begin(); 397 397 IvfTagInfoMap::iterator tagMapEnd = ivfTagInfo.end(); 398 unsignedlong tagNum = 0;398 mg_u_long tagNum = 0; 399 399 while (tagMapHere != tagMapEnd) { 400 400 cout << (*tagMapHere).first << " " << tagNum … … 406 406 */ 407 407 408 static void OutputChunkInfo ( unsignedlong mem, bool /*wordLevelIndex*/) {408 static void OutputChunkInfo (mg_u_long mem, bool /*wordLevelIndex*/) { 409 409 ++chunksWritten; 410 410 … … 493 493 // check the amount of memory needed for this chunk 494 494 if (numChunkEntries >= entryCheckPoint) { 495 unsignedlong mem = MemoryRequired (wordLevelIndex);495 mg_u_long mem = MemoryRequired (wordLevelIndex); 496 496 if (mem >= invf_buffer_size * CHECK_CLOSE) { 497 497 if (mem > maxMemNeeded) maxMemNeeded = mem; 498 498 OutputChunkInfo (mem, wordLevelIndex); 499 entryCheckPoint = ( unsignedlong)499 entryCheckPoint = (mg_u_long) 500 500 ((invf_buffer_size * INIT_CHECK_FRAC) / CHECK_DIV); 501 501 502 502 } else { 503 entryCheckPoint = ( unsignedlong)503 entryCheckPoint = (mg_u_long) 504 504 (entryCheckPoint * ((CHECK_FRAC * (invf_buffer_size - mem)) / mem) + 505 505 entryCheckPoint); … … 513 513 514 514 515 static void CalcInvfDictSize ( unsignedlong &totalBytes,516 unsignedlong &indexStringBytes) {515 static void CalcInvfDictSize (mg_u_long &totalBytes, 516 mg_u_long &indexStringBytes) { 517 517 totalBytes = 0; // The sum of the length of all words, including 518 518 // the length byte … … 526 526 IvfWordInfoMap::iterator wordEnd = ivfWordInfo.end(); 527 527 while (wordHere != wordEnd) { 528 unsignedlong wordSize = (*wordHere).first.size();528 mg_u_long wordSize = (*wordHere).first.size(); 529 529 totalBytes += wordSize + 1; 530 530 indexStringBytes += wordSize + 2; … … 541 541 IvfTagInfoMap::iterator tagEnd = ivfTagInfo.end(); 542 542 while (tagHere != tagEnd) { 543 unsignedlong tagSize = (*tagHere).first.size();543 mg_u_long tagSize = (*tagHere).first.size(); 544 544 totalBytes += tagSize + 1; 545 545 indexStringBytes += tagSize + 2; … … 642 642 643 643 // write out the updated header 644 fseek (sp, sizeof ( u_long), SEEK_SET);644 fseek (sp, sizeof (mg_u_long), SEEK_SET); 645 645 if (!idh.Write (sp)) { fclose (sp); return; } 646 646 … … 691 691 692 692 // write out the word translation table 693 unsignedlong wordDictSize = ivfWordInfoOccurOrder.size();693 mg_u_long wordDictSize = ivfWordInfoOccurOrder.size(); 694 694 IvfWordInfoItArray::iterator wordItHere = ivfWordInfoOccurOrder.begin(); 695 695 IvfWordInfoItArray::iterator wordItEnd = ivfWordInfoOccurOrder.end(); 696 unsignedlong oN = 0;696 mg_u_long oN = 0; 697 697 while (wordItHere != wordItEnd) { 698 698 register IvfWordInfo &ivfWordInfo = (*(*wordItHere)).second; … … 703 703 704 704 // write out the tag translation table 705 unsignedlong tagDictSize = ivfTagInfoOccurOrder.size();705 mg_u_long tagDictSize = ivfTagInfoOccurOrder.size(); 706 706 IvfTagInfoItArray::iterator tagItHere = ivfTagInfoOccurOrder.begin(); 707 707 IvfTagInfoItArray::iterator tagItEnd = ivfTagInfoOccurOrder.end(); … … 737 737 738 738 char *temp_str = msg_prefix; 739 msg_prefix = "ivf.pass1";739 msg_prefix = (char*)"ivf.pass1"; 740 740 741 741 // output the last chunk 742 742 if (numChunkDocs > 0) { 743 unsignedlong mem = MemoryRequired (wordLevelIndex);743 mg_u_long mem = MemoryRequired (wordLevelIndex); 744 744 OutputChunkInfo (mem, wordLevelIndex); 745 745 if (mem > maxMemNeeded) maxMemNeeded = mem; … … 751 751 752 752 // write out the maximum memory required and close the file 753 fseek (ic, sizeof ( long), 0);753 fseek (ic, sizeof (mg_u_long), 0); 754 754 WriteUL (ic, maxMemNeeded); 755 755 fclose (ic); -
main/trunk/greenstone2/common-src/indexers/mgpp/text/ivf.pass2.cpp
r19822 r25147 79 79 80 80 81 static unsignedlong numDocs = 0;82 static unsignedlong numChunkDocs = 0;83 static unsignedlong numDocsInChunk = 0;84 85 static unsignedlong numFrags = 0;86 static unsignedlong numFragsInChunk = 0;87 static unsignedlong chunkStartFragNum = 0;81 static mg_u_long numDocs = 0; 82 static mg_u_long numChunkDocs = 0; 83 static mg_u_long numDocsInChunk = 0; 84 85 static mg_u_long numFrags = 0; 86 static mg_u_long numFragsInChunk = 0; 87 static mg_u_long chunkStartFragNum = 0; 88 88 89 89 … … 91 91 92 92 struct BitPtr { 93 unsignedlong start;94 unsignedlong here;95 unsignedlong lastFragNum;96 unsignedlong lgB;93 mg_u_long start; 94 mg_u_long here; 95 mg_u_long lastFragNum; 96 mg_u_long lgB; 97 97 98 98 void Clear () { start = here = lastFragNum = lgB = 0; } … … 102 102 class WordBitPtrs { 103 103 protected: 104 unsignedlong numWords;105 unsignedlong numTags;106 unsignedlong size;104 mg_u_long numWords; 105 mg_u_long numTags; 106 mg_u_long size; 107 107 BitPtr *wordBitPtrs; 108 108 109 void CheckBufOverrun ( unsignedlong num) {109 void CheckBufOverrun (mg_u_long num) { 110 110 if (wordBitPtrs[num].here > wordBitPtrs[num+1].start) { 111 111 cerr << "numDocs: " << numDocs << "\n"; … … 127 127 WordBitPtrs () { wordBitPtrs = NULL; Clear(); } 128 128 ~WordBitPtrs (); 129 void SetSize ( unsignedlong _numWords,130 unsignedlong _numTags);129 void SetSize (mg_u_long _numWords, 130 mg_u_long _numTags); 131 131 132 132 void ResetPtrs () { 133 133 if (wordBitPtrs == NULL) return; 134 unsignedlong i;134 mg_u_long i; 135 135 for (i=0; i<size; ++i) wordBitPtrs[i].Clear(); 136 136 } 137 137 138 BitPtr &GetWordBitPtr ( unsignedlong wordNum)138 BitPtr &GetWordBitPtr (mg_u_long wordNum) 139 139 { return wordBitPtrs[wordNum]; } 140 unsigned long &GetWordStart (unsignedlong wordNum)140 mg_u_long &GetWordStart (mg_u_long wordNum) 141 141 { return wordBitPtrs[wordNum].start; } 142 unsigned long &GetWordHere (unsignedlong wordNum)142 mg_u_long &GetWordHere (mg_u_long wordNum) 143 143 { return wordBitPtrs[wordNum].here; } 144 void CheckWordBufOverrun ( unsignedlong wordNum)144 void CheckWordBufOverrun (mg_u_long wordNum) 145 145 { CheckBufOverrun (wordNum); } 146 146 147 BitPtr &GetTagBitPtr ( unsignedlong tagNum)147 BitPtr &GetTagBitPtr (mg_u_long tagNum) 148 148 { return wordBitPtrs[tagNum + numWords]; } 149 unsigned long &GetTagStart (unsignedlong tagNum)149 mg_u_long &GetTagStart (mg_u_long tagNum) 150 150 { return wordBitPtrs[tagNum + numWords].start; } 151 unsigned long &GetTagHere (unsignedlong tagNum)151 mg_u_long &GetTagHere (mg_u_long tagNum) 152 152 { return wordBitPtrs[tagNum + numWords].here; } 153 void CheckTagBufOverrun ( unsignedlong tagNum)153 void CheckTagBufOverrun (mg_u_long tagNum) 154 154 { CheckBufOverrun (tagNum + numWords); } 155 155 156 156 BitPtr &GetEndBitPtr () 157 157 { return wordBitPtrs[size-1]; } 158 unsignedlong &GetEndStart ()158 mg_u_long &GetEndStart () 159 159 { return wordBitPtrs[size-1].start; } 160 unsignedlong &GetEndHere ()160 mg_u_long &GetEndHere () 161 161 { return wordBitPtrs[size-1].here; } 162 162 }; … … 165 165 struct IP2TagInfo { 166 166 bool inTag; 167 unsignedlong startFrag;168 unsignedlong tagNum;167 mg_u_long startFrag; 168 mg_u_long tagNum; 169 169 170 170 IP2TagInfo () { … … 183 183 class OccurToDictConverter { 184 184 protected: 185 unsignedlong pos;186 unsignedlong val;185 mg_u_long pos; 186 mg_u_long val; 187 187 FILE *transFile; 188 188 random_bitio_buffer rbs; 189 189 190 unsignedlong wordDictSize;191 unsignedlong tagDictSize;190 mg_u_long wordDictSize; 191 mg_u_long tagDictSize; 192 192 193 193 void SeekStart (); 194 unsigned long TranslateNum (unsignedlong num);194 mg_u_long TranslateNum (mg_u_long num); 195 195 196 196 public: … … 198 198 ~OccurToDictConverter (); 199 199 200 void Open (char *filename, unsignedlong _wordDictSize,201 unsignedlong _tagDictSize);200 void Open (char *filename, mg_u_long _wordDictSize, 201 mg_u_long _tagDictSize); 202 202 203 203 // Close frees all allocated memory 204 204 void Close (); 205 205 206 unsigned long TranslateWord (unsignedlong occurNum)206 mg_u_long TranslateWord (mg_u_long occurNum) 207 207 { return TranslateNum (occurNum); } 208 unsigned long TranslateTag (unsignedlong occurNum)208 mg_u_long TranslateTag (mg_u_long occurNum) 209 209 { return TranslateNum (occurNum+wordDictSize); } 210 210 }; … … 214 214 mg_ullong start; 215 215 mg_ullong here; 216 unsignedlong lastFragNum;217 unsignedlong B;216 mg_u_long lastFragNum; 217 mg_u_long B; 218 218 219 219 void Clear () { … … 230 230 protected: 231 231 InvfStateRec recCache [ISR_SIZE]; 232 unsignedlong startNum;232 mg_u_long startNum; 233 233 234 234 FILE *stateFile; … … 248 248 // previous references to state records may be 249 249 // invalidated calling GetRec 250 InvfStateRec &GetRec ( unsignedlong num);250 InvfStateRec &GetRec (mg_u_long num); 251 251 }; 252 252 … … 258 258 static stdio_bitio_buffer chunkBuf; 259 259 260 static unsignedlong ivfMemBufSize = 0;260 static mg_u_long ivfMemBufSize = 0; 261 261 static char *ivfMemBuf = NULL; 262 262 … … 290 290 } 291 291 292 void WordBitPtrs::SetSize ( unsignedlong _numWords,293 unsignedlong _numTags){292 void WordBitPtrs::SetSize (mg_u_long _numWords, 293 mg_u_long _numTags){ 294 294 Clear(); 295 295 numWords = _numWords; … … 302 302 void OccurToDictConverter::SeekStart () { 303 303 if (transFile == NULL) return; 304 rbs.SEEK_X (sizeof ( unsignedlong) * 8);304 rbs.SEEK_X (sizeof (mg_u_long) * 8); 305 305 pos = 0; 306 306 } 307 307 308 unsigned long OccurToDictConverter::TranslateNum (unsignedlong num) {308 mg_u_long OccurToDictConverter::TranslateNum (mg_u_long num) { 309 309 if (num < pos) SeekStart (); 310 310 while (pos <= num) { … … 330 330 } 331 331 332 void OccurToDictConverter::Open (char *filename, unsignedlong _wordDictSize,333 unsignedlong _tagDictSize) {332 void OccurToDictConverter::Open (char *filename, mg_u_long _wordDictSize, 333 mg_u_long _tagDictSize) { 334 334 if (transFile != NULL) Close (); 335 335 … … 374 374 // open the state file 375 375 char path[512]; 376 sprintf (path, FILE_NAME_FORMAT ".% ld", get_basepath (), filename,377 ".invf.state", ( long) getpid ());376 sprintf (path, FILE_NAME_FORMAT ".%d", get_basepath (), filename, 377 ".invf.state", (mg_s_long) getpid ()); 378 378 if (!(stateFile = fopen (path, "wb+"))) { 379 379 Message ("Unable to create \"%s\"", path); … … 393 393 } 394 394 395 InvfStateRec &InvfStateCache::GetRec ( unsignedlong num) {395 InvfStateRec &InvfStateCache::GetRec (mg_u_long num) { 396 396 // see if cached 397 397 if ((num >= startNum) && (num < startNum + ISR_SIZE)) … … 406 406 startNum = num - (num % ISR_SIZE); 407 407 fseek (stateFile, startNum*sizeof (InvfStateRec), SEEK_SET); 408 fread ((char *) recCache, sizeof (InvfStateRec), ISR_SIZE, stateFile); 408 size_t numbytes = fread ((char *) recCache, sizeof (InvfStateRec), ISR_SIZE, stateFile); 409 if (numbytes != ISR_SIZE){ 410 #ifdef DEBUG 411 fprintf(stderr, "[mgpp/text/ivf.pass2.cpp L410] number of bytes read by fread does not match the requested amount\n"); 412 #endif 413 } 409 414 410 415 return recCache[num-startNum]; … … 413 418 414 419 415 static void ClearCharBuf (char *buf, unsignedlong size) {420 static void ClearCharBuf (char *buf, mg_u_long size) { 416 421 char *end = buf + size; 417 422 while (buf != end) *buf++ = 0; … … 436 441 fseek (dictFile, _idh.tag_dict_start, SEEK_SET); 437 442 438 unsignedlong tagNum;443 mg_u_long tagNum; 439 444 dict_el thisEl; 440 445 for (tagNum = 0; tagNum < _idh.tag_dict_size; ++tagNum) { … … 456 461 void CheckIntOverflow (mg_ullong totalIBits, mg_ullong lastTotalIBits) { 457 462 if (totalIBits < lastTotalIBits) { 458 fprintf(stderr, "ERROR: The totalIBits counter (% dbyte unsigned integer) has overflowed.\n", sizeof (mg_ullong));463 fprintf(stderr, "ERROR: The totalIBits counter (%lu byte unsigned integer) has overflowed.\n", sizeof (mg_ullong)); 459 464 if (sizeof (mg_ullong) < 8) { 460 465 fprintf(stderr, " Try compiling with GCC to enable use of 8 bytes for this counter.\n"); … … 481 486 word_dict_el wordEl; 482 487 wordEl.SetNumLevels (_idh.num_levels); 483 unsignedlong dictWordNum, p;488 mg_u_long dictWordNum, p; 484 489 mg_ullong lastTotalIBits; 485 unsignedlong N = _idh.num_frags;490 mg_u_long N = _idh.num_frags; 486 491 for (dictWordNum=0; dictWordNum<_idh.word_dict_size; ++dictWordNum) { 487 492 // lastTotalIBits is used to detect integer overflow … … 521 526 // add the tag entries 522 527 dict_el tagEl; 523 unsignedlong dictTagNum;528 mg_u_long dictTagNum; 524 529 N = _idh.num_frags; 525 530 for (dictTagNum=0; dictTagNum<_idh.tag_dict_size; ++dictTagNum) { … … 556 561 /* 557 562 // assumes the chunk tag information has been placed in .first 558 static void PrintChunkInfo ( unsignedlong chunkMem,559 unsignedlong numChunkWords,560 unsignedlong numChunkTags) {561 static unsignedlong chunksRead = 0;563 static void PrintChunkInfo (mg_u_long chunkMem, 564 mg_u_long numChunkWords, 565 mg_u_long numChunkTags) { 566 static mg_u_long chunksRead = 0; 562 567 ++chunksRead; 563 568 cout << "Chunk Number: " << chunksRead << "\n"; … … 571 576 TagMapDict::iterator tagMapEnd = tagMapDict.end(); 572 577 while (tagMapHere != tagMapEnd) { 573 unsignedlong tagMapNum = (*tagMapHere).second.tagNum;578 mg_u_long tagMapNum = (*tagMapHere).second.tagNum; 574 579 cout << (*tagMapHere).first << " " << tagMapNum << " " 575 580 << bitPtrs.GetTagBitPtr(tagMapNum).here << "\n"; … … 590 595 591 596 numFragsInChunk = chunkBuf.gamma_decode (NULL) - 1; 592 unsignedlong chunkMem = chunkBuf.gamma_decode (NULL) - 1;597 mg_u_long chunkMem = chunkBuf.gamma_decode (NULL) - 1; 593 598 594 599 if (chunkMem > ivfMemBufSize) 595 600 FatalError (1, "Chunk memory size is greater than maximum"); 596 601 597 unsignedlong numChunkWords = chunkBuf.gamma_decode (NULL) - 1;598 unsignedlong numChunkTags = chunkBuf.gamma_decode (NULL) - 1;602 mg_u_long numChunkWords = chunkBuf.gamma_decode (NULL) - 1; 603 mg_u_long numChunkTags = chunkBuf.gamma_decode (NULL) - 1; 599 604 600 605 … … 606 611 // "chunkWordCount" in "start" and the "chunkFragCount" 607 612 // in "here" 608 unsignedlong numOccur;609 unsignedlong wordNum;613 mg_u_long numOccur; 614 mg_u_long wordNum; 610 615 for (numOccur=0; numOccur<numChunkWords; ++numOccur) { 611 616 wordNum = occurConvert.TranslateWord (numOccur); … … 616 621 else wordPtr.here = wordPtr.start; 617 622 } 618 unsignedlong tagNum;623 mg_u_long tagNum; 619 624 for (numOccur=0; numOccur<numChunkTags; ++numOccur) { 620 625 tagNum = occurConvert.TranslateTag (numOccur); … … 628 633 629 634 // create the bit ptrs in dictionary order 630 unsignedlong totalIBits = 0; // only dealing with memory631 unsignedlong chunkWordCount, chunkFragCount;635 mg_u_long totalIBits = 0; // only dealing with memory 636 mg_u_long chunkWordCount, chunkFragCount; 632 637 for (wordNum=0; wordNum<_idh.word_dict_size; ++wordNum) { 633 638 BitPtr &wordPtr = bitPtrs.GetWordBitPtr (wordNum); … … 656 661 tagPtr.lgB = 0; 657 662 if (chunkFragCount > 0) { 658 unsignedlong pTag = chunkFragCount*2;663 mg_u_long pTag = chunkFragCount*2; 659 664 tagPtr.lgB = floorlog_2 (BIO_Bblock_Init_W (numFragsInChunk+pTag, 660 665 pTag)); 661 unsignedlong bLen = BIO_Bblock_Bound (numFragsInChunk+pTag,666 mg_u_long bLen = BIO_Bblock_Bound (numFragsInChunk+pTag, 662 667 pTag); 663 668 // cout << tagNum + _idh.word_dict_size << " "; … … 732 737 FILE *invfFile = create_file (filename, INVF_SUFFIX, "wb", 733 738 MAGIC_INVF, MG_ABORT); 734 totalIBits += sizeof ( unsignedlong) * 8; // magic number739 totalIBits += sizeof (mg_u_long) * 8; // magic number 735 740 totalIBits += 8 * 200; // 200 byte gap -- why?????? 736 741 fclose (invfFile); … … 748 753 // add this tag to the inverted list 749 754 BitPtr &tagBitPtr = bitPtrs.GetTagBitPtr (tInfo.tagNum); 750 unsignedlong endFrag = numFrags;755 mg_u_long endFrag = numFrags; 751 756 int b = 1 << tagBitPtr.lgB; 752 757 … … 822 827 if (wordLevelIndex) ++numFrags; 823 828 824 unsignedlong wordNum = perf_hash (wordHashDict, mgWord);829 mg_u_long wordNum = perf_hash (wordHashDict, mgWord); 825 830 826 831 /* … … 832 837 // add this word to the inverted list 833 838 BitPtr &wordBitPtr = bitPtrs.GetWordBitPtr (wordNum); 834 unsignedlong fragNum = numFrags;839 mg_u_long fragNum = numFrags; 835 840 int b = 1 << wordBitPtr.lgB; 836 841 … … 881 886 882 887 // write out the word information 883 unsignedlong wordNum;888 mg_u_long wordNum; 884 889 int b; 885 unsignedlong currFragNum;886 unsignedlong delta;887 unsignedlong currFreq;890 mg_u_long currFragNum; 891 mg_u_long delta; 892 mg_u_long currFreq; 888 893 for (wordNum=0; wordNum<idh.word_dict_size; ++wordNum) { 889 894 // go to the end of the last inverted file entry … … 916 921 917 922 // write out the tag information 918 unsignedlong tagNum;919 unsignedlong currTagStart;920 unsignedlong currTagEnd;923 mg_u_long tagNum; 924 mg_u_long currTagStart; 925 mg_u_long currTagEnd; 921 926 for (tagNum=0; tagNum<idh.tag_dict_size; ++tagNum) { 922 927 // go to the end of the last inverted file entry … … 998 1003 999 1004 1000 static void CondenseInvfFile (char *filename, unsignedlong &bytesOutput) {1005 static void CondenseInvfFile (char *filename, mg_u_long &bytesOutput) { 1001 1006 FILE *inInvfFile = open_file (filename, INVF_SUFFIX, "rb", 1002 1007 MAGIC_INVF, MG_ABORT); … … 1005 1010 1006 1011 // skip the magic number 1007 fseek (outInvfFile, sizeof ( unsignedlong), SEEK_SET);1012 fseek (outInvfFile, sizeof (mg_u_long), SEEK_SET); 1008 1013 1009 1014 // write the inverted file header -- use defaults for most things … … 1017 1022 1018 1023 // process each meaningful byte in the file 1019 unsignedlong numEntries = ifh.no_of_words + ifh.no_of_tags;1020 unsignedlong entryNum;1024 mg_u_long numEntries = ifh.no_of_words + ifh.no_of_tags; 1025 mg_u_long entryNum; 1021 1026 mg_ullong lastStart = 0; 1022 1027 for (entryNum = 0; entryNum < numEntries; ++entryNum) { … … 1028 1033 lastStart = stateRec.start; 1029 1034 1030 unsignedlong oldEntryStart = stateRec.start >> 3;1031 unsignedlong oldEntryStartOver = stateRec.start & 7; // should be 01032 unsignedlong oldEntryEnd = (stateRec.here + 7) >> 3; // byte after end1033 unsignedlong oldEntryEndOver = stateRec.here & 7;1035 mg_u_long oldEntryStart = stateRec.start >> 3; 1036 mg_u_long oldEntryStartOver = stateRec.start & 7; // should be 0 1037 mg_u_long oldEntryEnd = (stateRec.here + 7) >> 3; // byte after end 1038 mg_u_long oldEntryEndOver = stateRec.here & 7; 1034 1039 1035 1040 fseek (inInvfFile, oldEntryStart, SEEK_SET); … … 1057 1062 Message ("Could not truncate invf."); 1058 1063 #else 1059 ftruncate (fileno (outInvfFile), bytesOutput); 1064 if(ftruncate (fileno (outInvfFile), bytesOutput) != 0) 1065 { 1066 fprintf(stderr, "Could not truncate invf"); 1067 } 1060 1068 #endif 1061 1069 … … 1063 1071 } 1064 1072 1065 static void OutputInvfIdx (char *filename, unsignedlong invfNumBytes) {1073 static void OutputInvfIdx (char *filename, mg_u_long invfNumBytes) { 1066 1074 FILE *invfIdxFile = create_file (filename, INVF_IDX_SUFFIX, "wb", 1067 1075 MAGIC_INVI, MG_ABORT); 1068 1076 1069 1077 // process each meaningful byte in the file 1070 unsignedlong numEntries = idh.word_dict_size + idh.tag_dict_size;1071 unsignedlong entryNum;1078 mg_u_long numEntries = idh.word_dict_size + idh.tag_dict_size; 1079 mg_u_long entryNum; 1072 1080 for (entryNum = 0; entryNum < numEntries; ++entryNum) { 1073 1081 InvfStateRec &stateRec = invfState.GetRec (entryNum); … … 1101 1109 // condense the inverted file and truncate it 1102 1110 // this function also writes out the inverted header 1103 unsignedlong invfNumBytes = 0;1111 mg_u_long invfNumBytes = 0; 1104 1112 CondenseInvfFile (filename, invfNumBytes); 1105 1113 -
main/trunk/greenstone2/common-src/indexers/mgpp/text/locallib.cpp
r16583 r25147 75 75 76 76 int 77 huffcodebits ( unsignedlong *A, int n)77 huffcodebits (mg_u_long *A, int n) 78 78 { 79 79 int i, j, tot = 0, bits = 0, v1, v2, *B; … … 111 111 112 112 int 113 modelbits ( unsignedlong *A, int n)113 modelbits (mg_u_long *A, int n) 114 114 { 115 115 int i, bits = 0, last, N = 0; … … 159 159 160 160 161 int Read_cdh (FILE * f, compression_dict_header * cdh, u_long * /*mem*/,162 u_long * disk) {161 int Read_cdh (FILE * f, compression_dict_header * cdh, mg_u_long * /*mem*/, 162 mg_u_long * disk) { 163 163 if (disk) 164 164 (*disk) += sizeof (*cdh); … … 185 185 186 186 int 187 Read_cfh (FILE * f, comp_frags_header * cfh, u_long * mem,u_long * disk)187 Read_cfh (FILE * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk) 188 188 { 189 189 int i; /* [RPAP - Jan 97: Endian Ordering] */ -
main/trunk/greenstone2/common-src/indexers/mgpp/text/locallib.h
r16583 r25147 31 31 int vecentropy (int *A, int n); 32 32 33 int huffcodebits ( unsignedlong *A, int n);33 int huffcodebits (mg_u_long *A, int n); 34 34 35 int modelbits ( unsignedlong *A, int n);35 int modelbits (mg_u_long *A, int n); 36 36 37 37 int prime (int p); 38 38 39 39 40 int Read_cdh (FILE * f, compression_dict_header * cdh, u_long * mem,u_long * disk);40 int Read_cdh (FILE * f, compression_dict_header * cdh, mg_u_long * mem, mg_u_long * disk); 41 41 42 int Read_cfh (FILE * f, comp_frags_header * cfh, u_long * mem,u_long * disk);42 int Read_cfh (FILE * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk); 43 43 44 44 -
main/trunk/greenstone2/common-src/indexers/mgpp/text/mg_errors.cpp
r19822 r25147 33 33 char *mg_errorstrs[] = 34 34 { 35 "No error",36 "Out of memory",37 "File \"%s\" not found",38 "Bad magic number in \"%s\"",39 "Error reading \"%s\"",40 "MG_BUFTOOSMALL",41 "Files required for level 2 and 3 inversion are missing"};35 (char*)"No error", 36 (char*)"Out of memory", 37 (char*)"File \"%s\" not found", 38 (char*)"Bad magic number in \"%s\"", 39 (char*)"Error reading \"%s\"", 40 (char*)"MG_BUFTOOSMALL", 41 (char*)"Files required for level 2 and 3 inversion are missing"}; 42 42 43 43 -
main/trunk/greenstone2/common-src/indexers/mgpp/text/mg_files.cpp
r22291 r25147 125 125 FILE * 126 126 open_named_file (const char *name, const char *mode, 127 u_long magic_num, int err_mode)128 { 129 unsignedlong magic;127 mg_u_long magic_num, int err_mode) 128 { 129 mg_u_long magic; 130 130 FILE *f = NULL; 131 131 char *err; … … 134 134 if (!f) 135 135 { 136 err = "Unable to open \"%s\"";136 err = (char*)"Unable to open \"%s\""; 137 137 goto error; 138 138 } … … 142 142 if (fread (&magic, sizeof (magic), 1, f) != 1) 143 143 { 144 err = "No magic number \"%s\"";144 err = (char*)"No magic number \"%s\""; 145 145 goto error; 146 146 } … … 150 150 if (!IS_MAGIC (magic)) 151 151 { 152 err = "No MG magic number \"%s\"";152 err = (char*)"No MG magic number \"%s\""; 153 153 goto error; 154 154 } … … 156 156 if (magic != magic_num) 157 157 { 158 err = "Wrong MG magic number \"%s\"";158 err = (char*)"Wrong MG magic number \"%s\""; 159 159 goto error; 160 160 } … … 187 187 FILE * 188 188 open_file (const char *name, const char *suffix, const char *mode, 189 u_long magic_num, int err_mode)189 mg_u_long magic_num, int err_mode) 190 190 { 191 191 char path[512]; … … 215 215 FILE * 216 216 create_named_file (const char *name, const char *mode, 217 u_long magic_num, int err_mode)217 mg_u_long magic_num, int err_mode) 218 218 { 219 219 FILE *f = NULL; … … 223 223 if (!f) 224 224 { 225 err = "Unable to open \"%s\"";225 err = (char*)"Unable to open \"%s\""; 226 226 goto error; 227 227 } … … 231 231 if (fwrite (&magic_num, sizeof (magic_num), 1, f) != 1) 232 232 { 233 err = "Couldn't write magic number \"%s\"";233 err = (char*)"Couldn't write magic number \"%s\""; 234 234 goto error; 235 235 } … … 267 267 FILE * 268 268 create_file (const char *name, const char *suffix, const char *mode, 269 u_long magic_num, int err_mode)269 mg_u_long magic_num, int err_mode) 270 270 { 271 271 char path[512]; -
main/trunk/greenstone2/common-src/indexers/mgpp/text/mg_files.h
r16583 r25147 27 27 /* Magic numbers for the different types of files */ 28 28 29 #define GEN_MAGIC(a,b,c,d) (( unsignedlong)(((a)<<24) + ((b)<<16) + \29 #define GEN_MAGIC(a,b,c,d) ((mg_u_long)(((a)<<24) + ((b)<<16) + \ 30 30 ((c)<<8) + (d))) 31 31 … … 51 51 #define MAGIC_PARAGRAPH GEN_MAGIC('M','G','P', 0 ) 52 52 #define MAGIC_STEM_GEN(x) GEN_MAGIC('M', 'G', 's', x) 53 #define IS_MAGIC(a) (((( u_long)(a)) & 0xffff0000) == MAGIC_XXXX)53 #define IS_MAGIC(a) ((((mg_u_long)(a)) & 0xffff0000) == MAGIC_XXXX) 54 54 55 55 … … 268 268 an error message. */ 269 269 FILE *open_named_file (const char *name, const char *mode, 270 u_long magic_num, int err_mode);270 mg_u_long magic_num, int err_mode); 271 271 272 272 … … 286 286 an error message. */ 287 287 FILE *open_file (const char *name, const char *suffix, const char *mode, 288 u_long magic_num, int err_mode);288 mg_u_long magic_num, int err_mode); 289 289 290 290 … … 305 305 an error message. */ 306 306 FILE *create_named_file (const char *name, const char *mode, 307 u_long magic_num, int err_mode);307 mg_u_long magic_num, int err_mode); 308 308 309 309 … … 322 322 an error message. */ 323 323 FILE *create_file (const char *name, const char *suffix, const char *mode, 324 u_long magic_num, int err_mode);325 326 327 328 329 #endif 324 mg_u_long magic_num, int err_mode); 325 326 327 328 329 #endif -
main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_compression_dict.cpp
r19822 r25147 53 53 #include "WordData.h" 54 54 55 #define MAXBITS (sizeof( unsignedlong) * 8)55 #define MAXBITS (sizeof(mg_u_long) * 8) 56 56 57 57 #define is_power_of_two(a) ((a) != 0 && (((a) & ((a)-1)) == 0)) … … 63 63 float saving; 64 64 float char_bit_cost; 65 u_long num_trans;65 mg_u_long num_trans; 66 66 u_char *word; 67 67 } … … 69 69 70 70 static DictWordData *Words[2]; 71 static u_long Num[2];72 static u_long chars[2];71 static mg_u_long Num[2]; 72 static mg_u_long chars[2]; 73 73 74 74 #define KIND(p) (((p) >= Words[0] && (p) < Words[0] + Num[0]) ? 0 : 1) … … 80 80 { 81 81 DictWordData **wd; 82 u_long num_wds;83 u_long chars;82 mg_u_long num_wds; 83 mg_u_long chars; 84 84 } 85 85 DictData; … … 90 90 static compression_stats_header csh; 91 91 92 static char *file_name = "";93 static u_long novel_method = MG_NOVEL_HUFFMAN_CHARS;92 static char *file_name = (char*)""; 93 static mg_u_long novel_method = MG_NOVEL_HUFFMAN_CHARS; 94 94 95 95 … … 98 98 static void Method3 (int k); 99 99 static void Select_all (void); 100 static u_long WriteOutWords (char *,u_long, int);100 static mg_u_long WriteOutWords (char *, mg_u_long, int); 101 101 static int DecFreqIncWL (void *a, void *b); 102 102 static int OccuranceOrder (void *a, void *b); … … 111 111 int lookback = 2; 112 112 double k = 0; 113 u_long mem_reqd;113 mg_u_long mem_reqd; 114 114 opterr = 0; 115 115 msg_prefix = argv[0]; … … 224 224 { 225 225 FILE *f; 226 unsignedlong i;226 mg_u_long i; 227 227 f = open_file (filename, TEXT_STATS_DICT_SUFFIX, "rb", 228 228 MAGIC_STATS_DICT, MG_ABORT); /* [RPAP - Feb 97: WIN32 Port] */ … … 429 429 CalcCharCounts (DictWordData ** wd, int num, 430 430 char *char_lens[2], char *len_lens[2], 431 u_long escape[2])432 { 433 long char_freqs[2][256];434 long len_freqs[2][16];431 mg_u_long escape[2]) 432 { 433 mg_s_long char_freqs[2][256]; 434 mg_s_long len_freqs[2][16]; 435 435 huff_data hd; 436 436 int i; … … 441 441 for (i = 0; i < num; ++i, ++wd) 442 442 { 443 u_long freq = (*wd)->documents();443 mg_u_long freq = (*wd)->documents(); 444 444 u_char *buf = (*wd)->word; 445 445 int len = *buf++; … … 448 448 escape[idx] += freq; 449 449 for (; len; --len, ++buf) 450 char_freqs[idx][( u_long) (*buf)] += freq;450 char_freqs[idx][(mg_u_long) (*buf)] += freq; 451 451 } 452 452 Generate_Huffman_Data (256, char_freqs[0], &hd, NULL); … … 466 466 467 467 inline void CalcBitCostForWordData(DictWordData **word, int num, 468 double freqs_trans[2], u_long escape[2],468 double freqs_trans[2], mg_u_long escape[2], 469 469 char * char_lens[2], char *len_lens[2], 470 470 double esc[2], int num_trans) … … 477 477 u_char *buf = (*word)->word; 478 478 int len = *buf++; 479 u_long freq = (*word)->documents();479 mg_u_long freq = (*word)->documents(); 480 480 int idx = KIND (*word); 481 481 482 482 cbc = len_lens[idx][len]; 483 483 for (; len; --len, ++buf) 484 cbc += char_lens[idx][( u_long) (*buf)];484 cbc += char_lens[idx][(mg_u_long) (*buf)]; 485 485 486 486 (*word)->char_bit_cost = (cbc + esc[idx]) * freq; … … 500 500 CalcBitCost (DictWordData ** discard_word, int discard_num, 501 501 DictWordData ** keep_word, int keep_num, double freqs_trans[2], 502 u_long escape[2], int num_trans)502 mg_u_long escape[2], int num_trans) 503 503 { 504 504 char *char_lens[2]; … … 544 544 545 545 inline void m3_storeWord(DictWordData **wordHeap, int wordNum, int num_trans, 546 double freqs_trans[], u_long escape[], heap_comp hc)546 double freqs_trans[], mg_u_long escape[], heap_comp hc) 547 547 { 548 548 DictWordData *word = wordHeap[0]; … … 573 573 int recalcs = 0; 574 574 double freqs_trans[2], total; 575 u_long escape[2];575 mg_u_long escape[2]; 576 576 DictWordData **keep_heap, **discard_heap; 577 577 … … 769 769 770 770 771 static u_long771 static mg_u_long 772 772 Write_data (FILE * f, DictData * dd, int lookback) 773 773 { 774 u_long mem_reqd;774 mg_u_long mem_reqd; 775 775 huff_data *hd; 776 776 int i; 777 u_long us = dd->num_wds;778 long *freqs;779 u_long huff_words_size[MAX_HUFFCODE_LEN + 1];780 u_long lencounts[MAX_HUFFCODE_LEN + 1];777 mg_u_long us = dd->num_wds; 778 mg_s_long *freqs; 779 mg_u_long huff_words_size[MAX_HUFFCODE_LEN + 1]; 780 mg_u_long lencounts[MAX_HUFFCODE_LEN + 1]; 781 781 u_char *lastword[MAX_HUFFCODE_LEN + 1]; 782 782 783 if (!(freqs = new long [dd->num_wds]))783 if (!(freqs = new mg_s_long [dd->num_wds])) 784 784 FatalError (1, "Unable to allocate memory for freqs"); 785 785 … … 871 871 { 872 872 unsigned int j; 873 long freqs[256];873 mg_s_long freqs[256]; 874 874 DictWordData **wd = dd->wd; 875 875 huff_data *hd; … … 882 882 int len = *buf++; 883 883 for (; len; --len, ++buf) 884 freqs[( u_long) (*buf)] += (*wd)->documents();884 freqs[(mg_u_long) (*buf)] += (*wd)->documents(); 885 885 } 886 886 … … 907 907 { 908 908 unsigned int j; 909 long freqs[16];909 mg_s_long freqs[16]; 910 910 DictWordData **wd = dd->wd; 911 911 huff_data *hd; … … 934 934 935 935 936 static u_long937 WriteOutWords (char *file_name, u_long type, int lookback)936 static mg_u_long 937 WriteOutWords (char *file_name, mg_u_long type, int lookback) 938 938 { 939 939 FILE *f; 940 940 int i; 941 u_long mem_reqd = 0;941 mg_u_long mem_reqd = 0; 942 942 943 943 compression_dict_header cdh; -
main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_decompress_text.cpp
r19822 r25147 39 39 int main (int argc, char **argv) { 40 40 int ch; 41 char *filename = "";42 char *basePath = "";41 char *filename = (char*)""; 42 char *basePath = (char*)""; 43 43 UCArray level; 44 44 SetCStr (level, "Document", 8); … … 78 78 79 79 TextLevelInfo levelInfo = td.levels.levelInfo[level]; 80 unsignedlong docNum = 1;80 mg_u_long docNum = 1; 81 81 UCArray docText; 82 82 while (docNum <= levelInfo.numEntries) { -
main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_fast_comp_dict.cpp
r19822 r25147 67 67 68 68 69 static u_long mem_for_comp_dict (char *filename);69 static mg_u_long mem_for_comp_dict (char *filename); 70 70 static void load_comp_dict (char *filename); 71 71 static void save_fast_dict (char *filename); … … 76 76 static void *cur; 77 77 static u_char *fixup; 78 static u_long mem, fixup_mem;78 static mg_u_long mem, fixup_mem; 79 79 80 80 int main (int argc, char **argv) 81 81 { 82 82 int ch; 83 char *filename = "";83 char *filename = (char*)""; 84 84 opterr = 0; 85 85 msg_prefix = argv[0]; … … 120 120 #endif 121 121 122 if ((u _long) cur > (u_long) buffer + mem)122 if ((uintptr_t) cur > (uintptr_t) buffer + mem) 123 123 FatalError (1, "The buffer was not big enough for the dictionary"); 124 124 … … 186 186 unfixup_buffer () 187 187 { 188 u _long*p;189 for (p = (u _long *) buffer; (u_long) p < (u_long) cur; ++p)188 uintptr_t *p; 189 for (p = (uintptr_t *) buffer; (uintptr_t) p < (uintptr_t) cur; ++p) 190 190 { 191 191 if (IS_FIXUP (p)) 192 *p = *p - (u _long) buffer;193 } 194 } 195 196 197 198 199 static u_long192 *p = *p - (uintptr_t) buffer; 193 } 194 } 195 196 197 198 199 static mg_u_long 200 200 mem_for_aux_dict (compression_dict_header * /*cdh*/, char *filename) 201 201 { 202 202 int i; 203 u_long mem = sizeof (auxiliary_dict);203 mg_u_long mem = sizeof (auxiliary_dict); 204 204 FILE *aux; 205 205 … … 224 224 225 225 226 static u_long226 static mg_u_long 227 227 mem_for_words (FILE * dict, compression_dict_header * cdh, 228 228 comp_frags_header * cfh) 229 229 { 230 u_long mem = 0;231 long i, lookback;230 mg_u_long mem = 0; 231 mg_s_long i, lookback; 232 232 int ptrs_reqd = 0; 233 233 int mem_reqd = 0; … … 254 254 } 255 255 256 static u_long mem_skip_hd(FILE *dict,u_long mem)256 static mg_u_long mem_skip_hd(FILE *dict, mg_u_long mem) 257 257 { huff_data hd; 258 258 … … 261 261 if (hd.clens) 262 262 delete []hd.clens; 263 mem += hd.num_codes * sizeof ( unsignedlong);264 mem += (MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *);263 mem += hd.num_codes * sizeof (mg_u_long); 264 mem += (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *); 265 265 return mem; 266 266 } 267 267 268 static u_long mem_read_cfh(FILE *dict, compression_dict_header *cdh, comp_frags_header *cfh,269 u_long mem)268 static mg_u_long mem_read_cfh(FILE *dict, compression_dict_header *cdh, comp_frags_header *cfh, 269 mg_u_long mem) 270 270 { 271 271 mem += sizeof (comp_frags_header); … … 282 282 283 283 284 static u_long284 static mg_u_long 285 285 mem_for_comp_dict (char *filename) 286 286 { 287 u_long mem = sizeof (compression_dict);287 mg_u_long mem = sizeof (compression_dict); 288 288 compression_dict_header cdh; 289 289 comp_frags_header cfh; … … 360 360 361 361 void * 362 getmem ( u_long size, int align)362 getmem (mg_u_long size, int align) 363 363 { 364 364 void *res; 365 cur = (void *) (((u _long) cur + (align - 1)) & (~(align - 1)));365 cur = (void *) (((uintptr_t) cur + (align - 1)) & (~(align - 1))); 366 366 res = cur; 367 367 cur = (char *) cur + size; 368 if ((u _long) cur > (u_long)buffer + mem)368 if ((uintptr_t) cur > (uintptr_t)buffer + mem) 369 369 FatalError (1, "The buffer was not big enough for the dictionary"); 370 370 return res; … … 538 538 539 539 540 static unsignedlong **541 Generate_Fast_Huffman_Vals (huff_data * data, u_long * mem)540 static mg_u_long ** 541 Generate_Fast_Huffman_Vals (huff_data * data, mg_u_long * mem) 542 542 { 543 543 int i; 544 unsignedlong *fcode[MAX_HUFFCODE_LEN + 1];545 unsignedlong **values;546 unsignedlong *vals;544 mg_u_long *fcode[MAX_HUFFCODE_LEN + 1]; 545 mg_u_long **values; 546 mg_u_long *vals; 547 547 548 548 if (!data) 549 549 return (NULL); 550 vals = ( unsigned long *) getmem (data->num_codes * sizeof (*vals), sizeof (long *));551 values = ( unsigned long **) getmem ((MAX_HUFFCODE_LEN + 1) * sizeof (unsignedlong *),552 sizeof ( long *));553 554 memset (values, '\0', (MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *));550 vals = (mg_u_long *) getmem (data->num_codes * sizeof (*vals), sizeof (mg_s_long *)); 551 values = (mg_u_long **) getmem ((MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *), 552 sizeof (mg_s_long *)); 553 554 memset (values, '\0', (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *)); 555 555 556 556 if (mem) 557 557 *mem += data->num_codes * sizeof (*vals) + 558 (MAX_HUFFCODE_LEN + 1) * sizeof ( unsignedlong *);558 (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *); 559 559 560 560 fcode[0] = values[0] = &vals[0]; … … 576 576 { 577 577 huff_data *hd; 578 u_long **vals;578 mg_u_long **vals; 579 579 580 580 hd = (huff_data *) getmem (sizeof (huff_data), sizeof (char *)); … … 683 683 684 684 { 685 u _long*p;686 for (p = (u _long *) buffer; (u_long) p < (u_long) cur; ++p)685 uintptr_t *p; 686 for (p = (uintptr_t *) buffer; (uintptr_t) p < (uintptr_t) cur; ++p) 687 687 { 688 688 if (IS_FIXUP (p)) -
main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_invf_dict.cpp
r19822 r25147 41 41 #include "invf.h" 42 42 43 static void process_files (char *filename, unsignedlong entriesPerBlock) {43 static void process_files (char *filename, mg_u_long entriesPerBlock) { 44 44 // open the dictionary 45 45 FILE *dictFile = open_file (filename, INVF_DICT_SUFFIX, "rb", … … 83 83 84 84 85 unsignedlong wordNum;86 unsignedlong wordInvfPtr;85 mg_u_long wordNum; 86 mg_u_long wordInvfPtr; 87 87 UCArray lastEl; 88 88 word_dict_el wordEl; … … 102 102 // see if this block is the longest so far 103 103 if (wordIdx.size() > 0) { 104 unsignedlong blockLen = elIdx.block_ptr -104 mg_u_long blockLen = elIdx.block_ptr - 105 105 (*(wordIdx.end()-1)).block_ptr; 106 106 if (blockLen > bdh.max_wblk_size) bdh.max_wblk_size = blockLen; … … 116 116 wordBlockEl.freq = wordEl.freq; 117 117 wordBlockEl.invf_ptr = wordInvfPtr; 118 unsignedlong tempI;118 mg_u_long tempI; 119 119 for (tempI=0; tempI<idh.num_levels; ++tempI) 120 120 wordBlockEl.levelFreqs[tempI] = wordEl.levelFreqs[tempI]; … … 138 138 block_dict_el tagBlockEl; 139 139 140 unsignedlong tagNum;141 unsignedlong tagInvfPtr;140 mg_u_long tagNum; 141 mg_u_long tagInvfPtr; 142 142 dict_el tagEl; 143 143 lastEl.erase (lastEl.begin(), lastEl.end()); … … 156 156 // see if this block is the longest so far 157 157 if (tagIdx.size() > 0) { 158 unsignedlong blockLen = elIdx.block_ptr -158 mg_u_long blockLen = elIdx.block_ptr - 159 159 (*(tagIdx.end()-1)).block_ptr; 160 160 if (blockLen > bdh.max_tblk_size) bdh.max_tblk_size = blockLen; … … 188 188 189 189 // write out the blocked dictionary header 190 fseek (blockDictFile, sizeof( unsignedlong), SEEK_SET);190 fseek (blockDictFile, sizeof(mg_u_long), SEEK_SET); 191 191 bdh.Write (blockDictFile); 192 192 … … 208 208 209 209 int main (int argc, char **argv) { 210 unsignedlong entriesPerBlock = 16;211 char *filename = "";210 mg_u_long entriesPerBlock = 16; 211 char *filename = (char*)""; 212 212 int ch; 213 213 msg_prefix = argv[0]; -
main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_invf_dict_dump.cpp
r19822 r25147 72 72 fseek (dictFile, idh.word_dict_start, SEEK_SET); 73 73 74 unsignedlong wordNum;74 mg_u_long wordNum; 75 75 word_dict_el wordEl; 76 76 wordEl.SetNumLevels (idh.num_levels); … … 87 87 fseek (dictFile, idh.tag_dict_start, SEEK_SET); 88 88 89 unsignedlong tagNum;89 mg_u_long tagNum; 90 90 dict_el tagEl; 91 91 for (tagNum=0; tagNum<idh.tag_dict_size; ++tagNum) { … … 103 103 104 104 int main (int argc, char **argv) { 105 char *filename = "";105 char *filename = (char*)""; 106 106 int ch; 107 107 msg_prefix = argv[0]; -
main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_invf_dump.cpp
r19822 r25147 52 52 invf_file_header &ifh, 53 53 word_dict_el &wordEl, 54 unsignedlong wordStart,54 mg_u_long wordStart, 55 55 bool printFrags) { 56 56 cout << wordEl.frag_occur << " \"" << wordEl.el << "\"\n"; … … 62 62 stdio_bitio_buffer buffer(invfFile); 63 63 64 unsignedlong B = BIO_Bblock_Init (idh.num_frags, wordEl.frag_occur);65 unsignedlong fragNum = 0;66 unsignedlong i;64 mg_u_long B = BIO_Bblock_Init (idh.num_frags, wordEl.frag_occur); 65 mg_u_long fragNum = 0; 66 mg_u_long i; 67 67 for (i=0; i<wordEl.frag_occur; ++i) { 68 unsignedlong delta = buffer.bblock_decode (B, NULL);68 mg_u_long delta = buffer.bblock_decode (B, NULL); 69 69 fragNum += delta; 70 70 cout << " " << fragNum; 71 71 72 72 if (!ifh.word_level_index ) { 73 unsignedlong count = buffer.gamma_decode (NULL);73 mg_u_long count = buffer.gamma_decode (NULL); 74 74 cout << "(" << count << ")"; 75 75 } else { … … 88 88 invf_file_header &/*ifh*/, 89 89 dict_el &tagEl, 90 unsignedlong tagStart,90 mg_u_long tagStart, 91 91 bool printFrags) { 92 92 cout << tagEl.frag_occur << " \"<" << tagEl.el << ">\"\n"; … … 98 98 stdio_bitio_buffer buffer(invfFile); 99 99 100 unsignedlong pTag = tagEl.frag_occur*2;101 unsignedlong B = BIO_Bblock_Init (idh.num_frags+pTag, pTag);102 unsignedlong fragNum = 0;103 unsignedlong i;100 mg_u_long pTag = tagEl.frag_occur*2; 101 mg_u_long B = BIO_Bblock_Init (idh.num_frags+pTag, pTag); 102 mg_u_long fragNum = 0; 103 mg_u_long i; 104 104 for (i=0; i<tagEl.frag_occur; ++i) { 105 unsignedlong delta = buffer.bblock_decode (B, NULL)-1;105 mg_u_long delta = buffer.bblock_decode (B, NULL)-1; 106 106 fragNum += delta; 107 107 cout << " " << fragNum; … … 169 169 // process all the words 170 170 if (printWords) { 171 unsignedlong wordNum;172 unsignedlong wordStart;171 mg_u_long wordNum; 172 mg_u_long wordStart; 173 173 word_dict_el wordEl; 174 174 wordEl.SetNumLevels (idh.num_levels); … … 182 182 // process all the tags 183 183 if (printTags) { 184 unsignedlong tagNum;185 unsignedlong tagStart;184 mg_u_long tagNum; 185 mg_u_long tagStart; 186 186 dict_el tagEl; 187 187 for (tagNum=0; tagNum<idh.tag_dict_size; ++tagNum) { … … 199 199 200 200 int main (int argc, char **argv) { 201 char *dir_name, *filename = "";201 char *dir_name, *filename = (char*)""; 202 202 int ch; 203 203 msg_prefix = argv[0]; -
main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_passes.cpp
r19822 r25147 74 74 75 75 76 unsignedlong invf_buffer_size = 5 * 1024 * 1024; /* 5Mb */76 mg_u_long invf_buffer_size = 5 * 1024 * 1024; /* 5Mb */ 77 77 78 78 static char Passes = 0; … … 90 90 91 91 static pass_data PassData[MAX_PASSES] = { 92 { "special", init_special, process_special, done_special},93 { "text.pass1", init_text_1, process_text_1, done_text_1},94 { "text.pass2", init_text_2, process_text_2, done_text_2},95 { "ivf.pass1", init_ivf_1, process_ivf_1, done_ivf_1},96 { "ivf.pass2", init_ivf_2, process_ivf_2, done_ivf_2},92 {(char*)"special", init_special, process_special, done_special}, 93 {(char*)"text.pass1", init_text_1, process_text_1, done_text_1}, 94 {(char*)"text.pass2", init_text_2, process_text_2, done_text_2}, 95 {(char*)"ivf.pass1", init_ivf_1, process_ivf_1, done_ivf_1}, 96 {(char*)"ivf.pass2", init_ivf_2, process_ivf_2, done_ivf_2}, 97 97 }; 98 98 99 static char *usage_str = "\nUSAGE:\n"99 static char *usage_str = (char*)"\nUSAGE:\n" 100 100 " %s [-J doc-tag] [-K level-tag] [-L index-level]\n" 101 101 " %*s [-m invf-memory] [-T1] [-T2] [-I1] [-I2] [-S]\n" … … 131 131 int pass; 132 132 133 unsignedlong numBytes = 0;134 unsignedlong numDocs = 0;133 mg_u_long numBytes = 0; 134 mg_u_long numDocs = 0; 135 135 136 136 // initialise all the passes … … 146 146 FileBuf buf; 147 147 TextElArray doc; 148 unsignedlong docLen = 0;148 mg_u_long docLen = 0; 149 149 150 150 // read and process each file (start with an open file) … … 222 222 Passes |= IVF_PASS_2; 223 223 else 224 Usage ( "Invalid pass number");224 Usage ((char*)"Invalid pass number"); 225 225 break; 226 226 case 'T': … … 230 230 Passes |= TEXT_PASS_2; 231 231 else 232 Usage ( "Invalid pass number");232 Usage ((char*)"Invalid pass number"); 233 233 break; 234 234 case 'S': -
main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_passes_4jni.cpp
r19822 r25147 76 76 77 77 78 unsignedlong invf_buffer_size = 5 * 1024 * 1024; /* 5Mb */78 mg_u_long invf_buffer_size = 5 * 1024 * 1024; /* 5Mb */ 79 79 80 80 static char Passes = 0; … … 85 85 char *filename = NULL; 86 86 87 unsignedlong numBytes = 0;88 unsignedlong numDocs = 0;87 mg_u_long numBytes = 0; 88 mg_u_long numDocs = 0; 89 89 int mgpp_passes_exit_value = 0; 90 90 … … 98 98 99 99 static pass_data PassData[MAX_PASSES] = { 100 { "special", init_special, process_special, done_special},101 { "text.pass1", init_text_1, process_text_1, done_text_1},102 { "text.pass2", init_text_2, process_text_2, done_text_2},103 { "ivf.pass1", init_ivf_1, process_ivf_1, done_ivf_1},104 { "ivf.pass2", init_ivf_2, process_ivf_2, done_ivf_2},100 {(char*)"special", init_special, process_special, done_special}, 101 {(char*)"text.pass1", init_text_1, process_text_1, done_text_1}, 102 {(char*)"text.pass2", init_text_2, process_text_2, done_text_2}, 103 {(char*)"ivf.pass1", init_ivf_1, process_ivf_1, done_ivf_1}, 104 {(char*)"ivf.pass2", init_ivf_2, process_ivf_2, done_ivf_2}, 105 105 }; 106 106 … … 223 223 224 224 TextElArray doc; 225 unsignedlong doc_len = 0;225 mg_u_long doc_len = 0; 226 226 227 227 while(ReadDoc(&buffer, tagInfo.docTag, doc, doc_len, false)) { … … 266 266 int pass; 267 267 268 unsignedlong numBytes = 0;269 unsignedlong numDocs = 0;268 mg_u_long numBytes = 0; 269 mg_u_long numDocs = 0; 270 270 271 271 // initialise all the passes … … 281 281 FileBuf buf; 282 282 TextElArray doc; 283 unsignedlong docLen = 0;283 mg_u_long docLen = 0; 284 284 285 285 // read and process each file (start with an open file) -
main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_perf_hash_build.cpp
r19822 r25147 53 53 static void ProcessFiles (char *filename, int r) { 54 54 FILE *dictFile, *hashFile; 55 unsignedlong i;55 mg_u_long i; 56 56 invf_dict_header idh; 57 57 perf_hash_data *phd; 58 58 u_char *pool; 59 unsignedlong pool_left;59 mg_u_long pool_left; 60 60 u_char **starts; 61 61 … … 86 86 87 87 // push string onto pool data 88 register unsignedlong l;88 register mg_u_long l; 89 89 l = wordEl.el.size() + 1; 90 90 if (pool_left < l) { … … 119 119 int main (int argc, char **argv) { 120 120 int r = -1; 121 char *filename = "";121 char *filename = (char*)""; 122 122 int ch; 123 123 msg_prefix = argv[0]; -
main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_stem_idx.cpp
r19822 r25147 50 50 #endif 51 51 52 typedef vector< unsignedlong> WordNumList;52 typedef vector<mg_u_long> WordNumList; 53 53 typedef map<UCArray, WordNumList, DictLTUCArray> StemMapDict; 54 54 … … 67 67 fseek (dictFile, idh.word_dict_start, SEEK_SET); 68 68 69 unsignedlong wordNum;69 mg_u_long wordNum; 70 70 u_char mgWord[MAXSTEMLEN + 1]; 71 71 word_dict_el wordEl; … … 101 101 int stemMethod, 102 102 int stemmerNum, 103 unsignedlong entriesPerBlock) {103 mg_u_long entriesPerBlock) { 104 104 105 105 /* [JFG - Mar 06: Accent folding patch] */ … … 130 130 131 131 block_idx stemIdx; 132 unsignedlong stemNum = 0;132 mg_u_long stemNum = 0; 133 133 stem_block_dict_el stemEl; 134 134 UCArray lastEl; … … 146 146 // see if this block is the longest so far 147 147 if (stemIdx.size() > 0) { 148 unsignedlong blockLen = elIdx.block_ptr -148 mg_u_long blockLen = elIdx.block_ptr - 149 149 (*(stemIdx.end()-1)).block_ptr; 150 150 if (blockLen > sih.max_block_size) sih.max_block_size = blockLen; … … 172 172 173 173 // write out the stem dictionary header 174 fseek (stemDictFile, sizeof( unsignedlong), SEEK_SET);174 fseek (stemDictFile, sizeof(mg_u_long), SEEK_SET); 175 175 sih.Write (stemDictFile); 176 176 … … 189 189 190 190 int main (int argc, char **argv) { 191 unsignedlong entriesPerBlock = 16;192 char *filename = "";191 mg_u_long entriesPerBlock = 16; 192 char *filename = (char*)""; 193 193 int ch; 194 194 int stemMethod = 0; // illegal value (no translation) -
main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_weights_build.cpp
r19822 r25147 52 52 #endif 53 53 54 #define MAXBITS (sizeof( unsignedlong) * 8)54 #define MAXBITS (sizeof(mg_u_long) * 8) 55 55 56 56 struct WBTagPtr { 57 unsignedlong tagNum;58 unsignedlong tagPtr;59 unsignedlong fragOccur;57 mg_u_long tagNum; 58 mg_u_long tagPtr; 59 mg_u_long fragOccur; 60 60 61 61 WBTagPtr () { … … 80 80 // seek to the start of the tag information 81 81 fseek (dictFile, idh.tag_dict_start, SEEK_SET); 82 fseek (invfIdxFile, sizeof( unsignedlong) +83 idh.word_dict_size*sizeof( unsignedlong), SEEK_SET);84 85 unsignedlong tagNum;86 unsignedlong tagPtr;82 fseek (invfIdxFile, sizeof(mg_u_long) + 83 idh.word_dict_size*sizeof(mg_u_long), SEEK_SET); 84 85 mg_u_long tagNum; 86 mg_u_long tagPtr; 87 87 dict_el thisEl; 88 88 for (tagNum = 0; tagNum < idh.tag_dict_size; ++tagNum) { … … 96 96 97 97 static void AddWeight (Weights &w, 98 unsignedlong levelDocNum,99 unsignedlong termFreq,98 mg_u_long levelDocNum, 99 mg_u_long termFreq, 100 100 float idf) { 101 101 double weight = termFreq * idf; … … 105 105 static void GenerateLevelWeights (const invf_dict_header &idh, 106 106 const invf_file_header &ifh, 107 unsignedlong numLevelDocs,108 unsignedlong levelNum,107 mg_u_long numLevelDocs, 108 mg_u_long levelNum, 109 109 FILE *dictFile, 110 110 FILE *invfFile, … … 120 120 // reset the files 121 121 fseek (dictFile, idh.word_dict_start, SEEK_SET); 122 fseek (invfIdxFile, sizeof ( unsignedlong), SEEK_SET);122 fseek (invfIdxFile, sizeof (mg_u_long), SEEK_SET); 123 123 124 124 // process each word adding its contributions to the document weights 125 unsignedlong wordNum;126 unsignedlong wordStart;125 mg_u_long wordNum; 126 mg_u_long wordStart; 127 127 word_dict_el wordEl; 128 128 wordEl.SetNumLevels (idh.num_levels); … … 142 142 stdio_bitio_buffer buffer (invfFile); 143 143 144 unsignedlong B = BIO_Bblock_Init (idh.num_frags, wordEl.frag_occur);145 unsignedlong fragNum = 0;146 unsignedlong levelDocNum = 0;147 unsignedlong lastLevelDocNum = 0;148 unsignedlong termFreq = 0;149 unsignedlong checkLevelFreq = 0;150 151 unsignedlong count, i;144 mg_u_long B = BIO_Bblock_Init (idh.num_frags, wordEl.frag_occur); 145 mg_u_long fragNum = 0; 146 mg_u_long levelDocNum = 0; 147 mg_u_long lastLevelDocNum = 0; 148 mg_u_long termFreq = 0; 149 mg_u_long checkLevelFreq = 0; 150 151 mg_u_long count, i; 152 152 for (i=0; i<wordEl.frag_occur; ++i) { 153 153 fragNum += buffer.bblock_decode (B, NULL); … … 201 201 202 202 static void WriteExactWeights (FILE *weightsFile, 203 unsignedlong &diskPtr,203 mg_u_long &diskPtr, 204 204 const Weights &w) { 205 205 diskPtr = ftell(weightsFile); … … 215 215 216 216 static void WriteApproxWeights (FILE *approxWeightsFile, 217 unsignedlong &diskPtr,217 mg_u_long &diskPtr, 218 218 const Weights &w, 219 219 unsigned char bits) { … … 246 246 247 247 248 unsignedlong max = (bits == 32) ? 0xffffffff : (1 << bits) - 1;;249 unsignedlong i=0, buf=0, pos=0;248 mg_u_long max = (bits == 32) ? 0xffffffff : (1 << bits) - 1;; 249 mg_u_long i=0, buf=0, pos=0; 250 250 here = w.begin(); 251 251 end = w.end(); 252 252 while (here != end) { 253 unsignedlong fx;253 mg_u_long fx; 254 254 wgt = sqrt (*here); 255 255 if (wgt == 0) { … … 259 259 #endif 260 260 } 261 fx = ( unsignedlong) floor (log (wgt / L) / log (B));261 fx = (mg_u_long) floor (log (wgt / L) / log (B)); 262 262 263 263 if (fx > max) fx = max; … … 281 281 int main (int argc, char **argv) { 282 282 unsigned char bits = 8; 283 char *filename = "";283 char *filename = (char*)""; 284 284 int ch; 285 285 opterr = 0; … … 354 354 IvfLevelInfoMap::iterator levelHere = ivfLevel.levelInfo.begin(); 355 355 IvfLevelInfoMap::iterator levelEnd = ivfLevel.levelInfo.end(); 356 unsignedlong levelNum = 0;356 mg_u_long levelNum = 0; 357 357 while (levelHere != levelEnd) { 358 358 const UCArray &levelName = (*levelHere).first; -
main/trunk/greenstone2/common-src/indexers/mgpp/text/text.h
r16583 r25147 109 109 110 110 struct compression_dict_header { 111 u_long dict_type;112 u_long novel_method;113 u_long params[TEXT_PARAMS];114 u_long num_words[2];115 u_long num_word_chars[2];116 u_long lookback;111 mg_u_long dict_type; 112 mg_u_long novel_method; 113 mg_u_long params[TEXT_PARAMS]; 114 mg_u_long num_words[2]; 115 mg_u_long num_word_chars[2]; 116 mg_u_long lookback; 117 117 }; 118 118 … … 120 120 struct comp_frags_header { 121 121 huff_data hd; 122 u_long uncompressed_size;123 u_long huff_words_size[MAX_HUFFCODE_LEN + 1];122 mg_u_long uncompressed_size; 123 mg_u_long huff_words_size[MAX_HUFFCODE_LEN + 1]; 124 124 }; 125 125 … … 130 130 131 131 struct compressed_text_header { 132 u_long num_of_docs;133 u_long num_of_words; // number of words in collection132 mg_u_long num_of_docs; 133 mg_u_long num_of_words; // number of words in collection 134 134 double num_of_bytes; 135 135 … … 145 145 146 146 struct compression_stats_header { 147 u_long num_docs;148 u_long dummy; // alignment147 mg_u_long num_docs; 148 mg_u_long dummy; // alignment 149 149 double num_bytes; 150 150 }; … … 152 152 153 153 struct frags_stats_header { 154 u_long num_frags;155 u_long mem_for_frags;154 mg_u_long num_frags; 155 mg_u_long mem_for_frags; 156 156 }; 157 157 158 158 159 159 struct aux_frags_header { 160 u_long num_frags;161 u_long mem_for_frags;160 mg_u_long num_frags; 161 mg_u_long mem_for_frags; 162 162 }; 163 163 … … 180 180 compression_dict_header cdh; 181 181 comp_frags_header *cfh[2]; 182 unsignedlong MemForCompDict;182 mg_u_long MemForCompDict; 183 183 u_char ***values[2]; 184 184 u_char *escape[2]; 185 185 huff_data *chars_huff[2]; 186 u_long **chars_vals[2];186 mg_u_long **chars_vals[2]; 187 187 huff_data *lens_huff[2]; 188 u_long **lens_vals[2];188 mg_u_long **lens_vals[2]; 189 189 auxiliary_dict *ad; 190 190 int fast_loaded; -
main/trunk/greenstone2/common-src/indexers/mgpp/text/text.pass1.cpp
r16583 r25147 54 54 typedef struct hash_rec 55 55 { 56 unsignedlong wcnt; /* word frequency */57 unsignedlong occurance_num;56 mg_u_long wcnt; /* word frequency */ 57 mg_u_long occurance_num; 58 58 u_char *word; 59 59 } … … 63 63 { 64 64 hash_rec *HashTable; 65 unsignedlong HashSize;66 unsignedlong HashUsed;67 unsignedlong wordnum;68 unsignedlong words_read;69 unsignedlong bytes_diff;65 mg_u_long HashSize; 66 mg_u_long HashUsed; 67 mg_u_long wordnum; 68 mg_u_long words_read; 69 mg_u_long bytes_diff; 70 70 huff_data hd; 71 71 } … … 74 74 75 75 76 static unsignedlong longestDoc = 0;77 static unsignedlong occurance_num = 0;76 static mg_u_long longestDoc = 0; 77 static mg_u_long occurance_num = 0; 78 78 static dict_data DictData[2]; 79 79 … … 81 81 static int PoolLeft; 82 82 static double inputbytes = 0; /* [RJM 07/97: 4G limit] */ 83 static unsignedlong MaxMemInUse = 0;84 static unsignedlong MemInUse = 0;83 static mg_u_long MaxMemInUse = 0; 84 static mg_u_long MemInUse = 0; 85 85 static compression_stats_header csh = {0, 0, 0.0}; /* [RJM 07/97: 4G limit] */ 86 86 … … 126 126 register u_char *wptr; 127 127 register int hsize = dd->HashSize; 128 register unsignedlong hashval, step;128 register mg_u_long hashval, step; 129 129 130 130 HASH (hashval, step, word, hsize); … … 132 132 while (wptr) { 133 133 hashval += step; 134 if (hashval >= ( unsignedlong)hsize)134 if (hashval >= (mg_u_long)hsize) 135 135 hashval -= hsize; 136 136 wptr = (dd->HashTable + hashval)->word; … … 171 171 /* Search the hash table for Word */ 172 172 { 173 register unsignedlong hashval, step;173 register mg_u_long hashval, step; 174 174 register int hsize = dd->HashSize; 175 175 HASH (hashval, step, Word, hsize); … … 210 210 if (len) { 211 211 hashval = (hashval + step); 212 if (hashval >= ( unsignedlong)hsize) hashval -= hsize;212 if (hashval >= (mg_u_long)hsize) hashval -= hsize; 213 213 } else { 214 214 ++ent->wcnt; … … 221 221 if (dd->HashUsed >= dd->HashSize >> 1) { 222 222 hash_rec *ht; 223 unsignedlong size;224 unsignedlong i;223 mg_u_long size; 224 mg_u_long i; 225 225 size = prime (dd->HashSize * 2); 226 226 if (!(ht = (hash_rec *) Xmalloc (sizeof (hash_rec) * size))) { … … 234 234 if (dd->HashTable[i].word) { 235 235 register u_char *wptr; 236 register unsignedlong hashval, step;236 register mg_u_long hashval, step; 237 237 238 238 wptr = dd->HashTable[i].word; … … 258 258 259 259 int process_text_1 (const TagInfo &/*tagInfo*/, const TextElArray &doc) { 260 unsignedlong textLen = 0;261 unsignedlong docLen = 0;260 mg_u_long textLen = 0; 261 mg_u_long docLen = 0; 262 262 int retValue; 263 263 … … 312 312 static void WriteHashTable (FILE * fp, dict_data * dd) { 313 313 frags_stats_header fsh; 314 u_long j = 0;314 mg_u_long j = 0; 315 315 u_char *curr; 316 316 … … 369 369 370 370 temp_str = msg_prefix; 371 msg_prefix = "text.pass1";371 msg_prefix = (char*)"text.pass1"; 372 372 373 373 /* [RPAP - Jan 97: Endian Ordering] */ -
main/trunk/greenstone2/common-src/indexers/mgpp/text/text.pass2.cpp
r16583 r25147 57 57 struct char_pool { 58 58 struct char_pool *next; 59 u_long left;59 mg_u_long left; 60 60 u_char *ptr; 61 61 u_char pool[POOL_SIZE]; … … 63 63 64 64 struct novel_hash_rec { 65 u_long ordinal_num;65 mg_u_long ordinal_num; 66 66 u_char *word; 67 67 }; … … 72 72 struct novel_hash_table { 73 73 novel_hash_rec *HashTable; 74 u_long HashSize, HashUsed;74 mg_u_long HashSize, HashUsed; 75 75 char_pool *first_pool; 76 76 char_pool *pool; 77 u_long next_num, binary_start;77 mg_u_long next_num, binary_start; 78 78 novel_hash_rec **code_to_nhr; 79 79 }; … … 82 82 static FILE *text; 83 83 static stdio_bitio_buffer textOutBuf; 84 static u_long headLen;84 static mg_u_long headLen; 85 85 86 86 static novel_hash_table nht[2]; … … 128 128 // the length of the compressed header is the size of the 129 129 // magic number plus the size of the compressed text header 130 headLen = sizeof ( u_long) + sizeof (cth);130 headLen = sizeof (mg_u_long) + sizeof (cth); 131 131 132 132 // start off with non-word … … 173 173 static int compress_text (bitio_buffer &buffer, const u_char *s_in, 174 174 int l_in, unsigned char &which, 175 unsignedlong &numWords) {175 mg_u_long &numWords) { 176 176 const u_char *end = s_in + l_in - 1; 177 177 … … 188 188 /* Search the hash table for Word */ 189 189 if (ht[which]) { 190 register unsignedlong hashval, step;190 register mg_u_long hashval, step; 191 191 register int tsize = ht[which]->size; 192 192 register u_char **wptr; … … 211 211 if (len) { 212 212 hashval += step; 213 if (hashval >= ( unsignedlong)tsize) hashval -= tsize;213 if (hashval >= (mg_u_long)tsize) hashval -= tsize; 214 214 215 215 } else { … … 231 231 if (cdh.dict_type == MG_PARTIAL_DICTIONARY) 232 232 { 233 u_long i;233 mg_u_long i; 234 234 if (ht[which]) 235 235 { … … 253 253 case MG_NOVEL_HUFFMAN_CHARS: 254 254 { 255 u_long i;255 mg_u_long i; 256 256 buffer.huff_encode (Word[0], lens_codes[which], 257 257 lens_huff[which].clens, NULL); … … 264 264 case MG_NOVEL_HYBRID: 265 265 { 266 register unsignedlong hashval, step;266 register mg_u_long hashval, step; 267 267 register novel_hash_table *h = &nht[which]; 268 268 register int hsize = h->HashSize; … … 325 325 { 326 326 novel_hash_rec *ht; 327 unsignedlong size;328 unsignedlong i;327 mg_u_long size; 328 mg_u_long i; 329 329 size = prime (h->HashSize * 2); 330 330 if (!(ht = (novel_hash_rec *) Xmalloc (sizeof (novel_hash_rec) * size))) … … 339 339 { 340 340 register u_char *wptr; 341 register unsignedlong hashval, step;341 register mg_u_long hashval, step; 342 342 343 343 wptr = h->HashTable[i].word; … … 375 375 // we need to remember where the last text element ends 376 376 unsigned char endBit = textOutBuf.GetBtg (); // 8=high bit, 1=low bit 377 unsignedlong endPos = textOutBuf.GetBytesWritten () + headLen;377 mg_u_long endPos = textOutBuf.GetBytesWritten () + headLen; 378 378 379 379 // process each text element … … 384 384 unsigned char startWhich = whichWordType; 385 385 unsigned char startBit = textOutBuf.GetBtg (); // 8=high bit, 1=low bit 386 unsignedlong startPos = textOutBuf.GetBytesWritten () + headLen;386 mg_u_long startPos = textOutBuf.GetBytesWritten () + headLen; 387 387 388 388 // compress the text … … 464 464 static void estimate_compressed_aux_dict (void) { 465 465 int i; 466 u_long aux_compressed = 0, total_uncomp = 0;466 mg_u_long aux_compressed = 0, total_uncomp = 0; 467 467 for (i = 0; i <= 1; ++i) 468 468 { 469 469 int j; 470 long chars[256], fchars[256];471 long lens[16], flens[16];470 mg_s_long chars[256], fchars[256]; 471 mg_s_long lens[16], flens[16]; 472 472 char_pool *cp; 473 473 memset (chars, '\0', sizeof (chars)); … … 496 496 flens[j] = lens[j]; 497 497 498 aux_compressed += ( long unsigned int) ((Calculate_Huffman_Size (16, flens, lens) +498 aux_compressed += (mg_u_long) ((Calculate_Huffman_Size (16, flens, lens) + 499 499 Calculate_Huffman_Size (256, fchars, chars)) / 8); 500 500 … … 560 560 561 561 // write out the compressed text header (with updated statistics) 562 if (fseek (text, sizeof ( u_long), SEEK_SET) == -1 || !cth.Write (text))562 if (fseek (text, sizeof (mg_u_long), SEEK_SET) == -1 || !cth.Write (text)) 563 563 return COMPERROR; 564 564 fclose (text);
Note:
See TracChangeset
for help on using the changeset viewer.