Changeset 25147 for main/trunk


Ignore:
Timestamp:
2012-02-28T13:59:00+13:00 (12 years ago)
Author:
kjdon
Message:

merged 64_bit_Greenstone branch into trunk, rev 25139

Location:
main/trunk/greenstone2/common-src/indexers
Files:
201 edited
2 copied

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/common-src/indexers/mg/Makefile.in

    r22058 r25147  
    2828
    2929CC = @CC@
    30 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic
     30CFLAGS = @CFLAGS@ -fpic
    3131INSTALL = @INSTALL@
    3232INSTALL_DATA = @INSTALL_DATA@
    3333INSTALL_PROGRAM = @INSTALL_PROGRAM@
    34 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     34LDFLAGS = @LDFLAGS@
    3535LIBS = @LIBS@ 
    3636TOUCH = echo timestamp >

  • main/trunk/greenstone2/common-src/indexers/mg/configure

    r23356 r25147  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.67.
     3# Generated by GNU Autoconf 2.65.
    44#
    55#
    66# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
    8 # Foundation, Inc.
     7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
     8# Inc.
    99#
    1010#
    … …  
    317317    done
    318318    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"
    320320
    321321
    … …  
    357357
    358358
    359 # as_fn_error STATUS ERROR [LINENO LOG_FD]
    360 # ----------------------------------------
     359# as_fn_error ERROR [LINENO LOG_FD]
     360# ---------------------------------
    361361# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    362362# 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.
    364364as_fn_error ()
    365365{
    366   as_status=$1; test $as_status -eq 0 && as_status=1
    367   if test "$4"; then
    368     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    369     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     366  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
    370370  fi
    371   $as_echo "$as_me: error: $2" >&2
     371  $as_echo "$as_me: error: $1" >&2
    372372  as_fn_exit $as_status
    373373} # as_fn_error
    … …  
    531531
    532532# 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,
    534534# so uname gets run too.
    535535ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
    … …  
    626626CXXFLAGS
    627627CXX
    628 COMPAT32BITFLAGS
    629628ENABLE_JAVA
    630629VERSION
    … …  
    763762
    764763  case $ac_option in
    765   *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
    766   *=)   ac_optarg= ;;
    767   *)    ac_optarg=yes ;;
     764  *=*)  ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
     765  *)    ac_optarg=yes ;;
    768766  esac
    769767
    … …  
    810808    # Reject names that are not valid shell variable names.
    811809    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    812       as_fn_error $? "invalid feature name: $ac_useropt"
     810      as_fn_error "invalid feature name: $ac_useropt"
    813811    ac_useropt_orig=$ac_useropt
    814812    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    836834    # Reject names that are not valid shell variable names.
    837835    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    838       as_fn_error $? "invalid feature name: $ac_useropt"
     836      as_fn_error "invalid feature name: $ac_useropt"
    839837    ac_useropt_orig=$ac_useropt
    840838    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10401038    # Reject names that are not valid shell variable names.
    10411039    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    1042       as_fn_error $? "invalid package name: $ac_useropt"
     1040      as_fn_error "invalid package name: $ac_useropt"
    10431041    ac_useropt_orig=$ac_useropt
    10441042    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10561054    # Reject names that are not valid shell variable names.
    10571055    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
    1058       as_fn_error $? "invalid package name: $ac_useropt"
     1056      as_fn_error "invalid package name: $ac_useropt"
    10591057    ac_useropt_orig=$ac_useropt
    10601058    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10861084    x_libraries=$ac_optarg ;;
    10871085
    1088   -*) as_fn_error $? "unrecognized option: \`$ac_option'
    1089 Try \`$0 --help' for more information"
     1086  -*) as_fn_error "unrecognized option: \`$ac_option'
     1087Try \`$0 --help' for more information."
    10901088    ;;
    10911089
    … …  
    10951093    case $ac_envvar in #(
    10961094      '' | [0-9]* | *[!_$as_cr_alnum]* )
    1097       as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     1095      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
    10981096    esac
    10991097    eval $ac_envvar=\$ac_optarg
    … …  
    11131111if test -n "$ac_prev"; then
    11141112  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
    1115   as_fn_error $? "missing argument to $ac_option"
     1113  as_fn_error "missing argument to $ac_option"
    11161114fi
    11171115
    … …  
    11191117  case $enable_option_checking in
    11201118    no) ;;
    1121     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     1119    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
    11221120    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    11231121  esac
    … …  
    11421140    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    11431141  esac
    1144   as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
     1142  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
    11451143done
    11461144
    … …  
    11561154  if test "x$build_alias" = x; then
    11571155    cross_compiling=maybe
    1158     $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
    1159     If a cross compiler is detected then cross compile mode will be used" >&2
     1156    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     1157    If a cross compiler is detected then cross compile mode will be used." >&2
    11601158  elif test "x$build_alias" != "x$host_alias"; then
    11611159    cross_compiling=yes
    … …  
    11721170ac_ls_di=`ls -di .` &&
    11731171ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
    1174   as_fn_error $? "working directory cannot be determined"
     1172  as_fn_error "working directory cannot be determined"
    11751173test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
    1176   as_fn_error $? "pwd does not report name of working directory"
     1174  as_fn_error "pwd does not report name of working directory"
    11771175
    11781176
    … …  
    12131211if test ! -r "$srcdir/$ac_unique_file"; then
    12141212  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
    1215   as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
     1213  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
    12161214fi
    12171215ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
    12181216ac_abs_confdir=`(
    1219     cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
     1217    cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
    12201218    pwd)`
    12211219# When building in place, set srcdir=.
    … …  
    12571255      --help=recursive    display the short help of all the included packages
    12581256  -V, --version           display version information and exit
    1259   -q, --quiet, --silent   do not print \`checking ...' messages
     1257  -q, --quiet, --silent   do not print \`checking...' messages
    12601258      --cache-file=FILE   cache test results in FILE [disabled]
    12611259  -C, --config-cache      alias for \`--cache-file=config.cache'
    … …  
    14131411  cat <<\_ACEOF
    14141412configure
    1415 generated by GNU Autoconf 2.67
    1416 
    1417 Copyright (C) 2010 Free Software Foundation, Inc.
     1413generated by GNU Autoconf 2.65
     1414
     1415Copyright (C) 2009 Free Software Foundation, Inc.
    14181416This configure script is free software; the Free Software Foundation
    14191417gives unlimited permission to copy, distribute and modify it.
    … …  
    15231521  fi
    15241522  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1525   test $ac_status = 0; } > conftest.i && {
     1523  test $ac_status = 0; } >/dev/null && {
    15261524     test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
    15271525     test ! -s conftest.err
    … …  
    15471545{
    15481546  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    1549   if eval "test \"\${$3+set}\"" = set; then :
     1547  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    15501548  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    15511549$as_echo_n "checking for $2... " >&6; }
    1552 if eval "test \"\${$3+set}\"" = set; then :
     1550if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    15531551  $as_echo_n "(cached) " >&6
    15541552fi
    … …  
    15861584  ac_header_preproc=no
    15871585fi
    1588 rm -f conftest.err conftest.i conftest.$ac_ext
     1586rm -f conftest.err conftest.$ac_ext
    15891587{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
    15901588$as_echo "$ac_header_preproc" >&6; }
    … …  
    16131611  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    16141612$as_echo_n "checking for $2... " >&6; }
    1615 if eval "test \"\${$3+set}\"" = set; then :
     1613if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    16161614  $as_echo_n "(cached) " >&6
    16171615else
    … …  
    16771675  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    16781676$as_echo_n "checking for $2... " >&6; }
    1679 if eval "test \"\${$3+set}\"" = set; then :
     1677if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    16801678  $as_echo_n "(cached) " >&6
    16811679else
    … …  
    17541752  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    17551753$as_echo_n "checking for $2... " >&6; }
    1756 if eval "test \"\${$3+set}\"" = set; then :
     1754if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    17571755  $as_echo_n "(cached) " >&6
    17581756else
    … …  
    18071805  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    18081806$as_echo_n "checking for $2... " >&6; }
    1809 if eval "test \"\${$3+set}\"" = set; then :
     1807if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    18101808  $as_echo_n "(cached) " >&6
    18111809else
    … …  
    18701868
    18711869It was created by $as_me, which was
    1872 generated by GNU Autoconf 2.67.  Invocation command line was
     1870generated by GNU Autoconf 2.65.  Invocation command line was
    18731871
    18741872  $ $0 $@
    … …  
    19801978    echo
    19811979
    1982     $as_echo "## ---------------- ##
     1980    cat <<\_ASBOX
     1981## ---------------- ##
    19831982## Cache variables. ##
    1984 ## ---------------- ##"
     1983## ---------------- ##
     1984_ASBOX
    19851985    echo
    19861986    # The following way of writing the cache mishandles newlines in values,
    … …  
    20162016    echo
    20172017
    2018     $as_echo "## ----------------- ##
     2018    cat <<\_ASBOX
     2019## ----------------- ##
    20192020## Output variables. ##
    2020 ## ----------------- ##"
     2021## ----------------- ##
     2022_ASBOX
    20212023    echo
    20222024    for ac_var in $ac_subst_vars
    … …  
    20312033
    20322034    if test -n "$ac_subst_files"; then
    2033       $as_echo "## ------------------- ##
     2035      cat <<\_ASBOX
     2036## ------------------- ##
    20342037## File substitutions. ##
    2035 ## ------------------- ##"
     2038## ------------------- ##
     2039_ASBOX
    20362040      echo
    20372041      for ac_var in $ac_subst_files
    … …  
    20472051
    20482052    if test -s confdefs.h; then
    2049       $as_echo "## ----------- ##
     2053      cat <<\_ASBOX
     2054## ----------- ##
    20502055## confdefs.h. ##
    2051 ## ----------- ##"
     2056## ----------- ##
     2057_ASBOX
    20522058      echo
    20532059      cat confdefs.h
    … …  
    21042110ac_site_file2=NONE
    21052111if test -n "$CONFIG_SITE"; then
    2106   # We do not want a PATH search for config.site.
    2107   case $CONFIG_SITE in #((
    2108     -*)  ac_site_file1=./$CONFIG_SITE;;
    2109     */*) ac_site_file1=$CONFIG_SITE;;
    2110     *)   ac_site_file1=./$CONFIG_SITE;;
    2111   esac
     2112  ac_site_file1=$CONFIG_SITE
    21122113elif test "x$prefix" != xNONE; then
    21132114  ac_site_file1=$prefix/share/config.site
    … …  
    21242125$as_echo "$as_me: loading site script $ac_site_file" >&6;}
    21252126    sed 's/^/| /' "$ac_site_file" >&5
    2126     . "$ac_site_file" \
    2127       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    2128 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2129 as_fn_error $? "failed to load site script $ac_site_file
    2130 See \`config.log' for more details" "$LINENO" 5 ; }
     2127    . "$ac_site_file"
    21312128  fi
    21322129done
    … …  
    22042201  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
    22052202$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
    2206   as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
     2203  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
    22072204fi
    22082205## -------------------- ##
    … …  
    22222219ac_aux_dir=
    22232220for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
    2224   if test -f "$ac_dir/install-sh"; then
    2225     ac_aux_dir=$ac_dir
    2226     ac_install_sh="$ac_aux_dir/install-sh -c"
    2227     break
    2228   elif test -f "$ac_dir/install.sh"; then
    2229     ac_aux_dir=$ac_dir
    2230     ac_install_sh="$ac_aux_dir/install.sh -c"
    2231     break
    2232   elif test -f "$ac_dir/shtool"; then
    2233     ac_aux_dir=$ac_dir
    2234     ac_install_sh="$ac_aux_dir/shtool install -c"
    2235     break
    2236   fi
     2221  for ac_t in install-sh install.sh shtool; do
     2222    if test -f "$ac_dir/$ac_t"; then
     2223      ac_aux_dir=$ac_dir
     2224      ac_install_sh="$ac_aux_dir/$ac_t -c"
     2225      break 2
     2226    fi
     2227  done
    22372228done
    22382229if test -z "$ac_aux_dir"; then
    2239   as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
     2230  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
    22402231fi
    22412232
    … …  
    22512242# Make sure we can run config.sub.
    22522243$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
    2253   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
     2244  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
    22542245
    22552246{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
    … …  
    22622253  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
    22632254test "x$ac_build_alias" = x &&
    2264   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
     2255  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
    22652256ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
    2266   as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
     2257  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
    22672258
    22682259fi
    … …  
    22712262case $ac_cv_build in
    22722263*-*-*) ;;
    2273 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
     2264*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
    22742265esac
    22752266build=$ac_cv_build
    … …  
    22962287else
    22972288  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
    2298     as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
     2289    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
    22992290fi
    23002291
    … …  
    23042295case $ac_cv_host in
    23052296*-*-*) ;;
    2306 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
     2297*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
    23072298esac
    23082299host=$ac_cv_host
    … …  
    23292320else
    23302321  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
    2331     as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
     2322    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
    23322323fi
    23332324
    … …  
    23372328case $ac_cv_target in
    23382329*-*-*) ;;
    2339 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
     2330*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
    23402331esac
    23412332target=$ac_cv_target
    … …  
    24022393else
    24032394  ENABLE_JAVA=0
    2404 fi
    2405 
    2406 
    2407 { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if architecture is 64-bit" >&5
    2408 $as_echo_n "checking to see if architecture is 64-bit... " >&6; }
    2409 arch_64bit=no
    2410 case "$host_cpu" in
    2411 x86_64) arch_64bit=yes ;;
    2412 esac
    2413 
    2414 if test "$arch_64bit" = yes; then
    2415   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    2416 $as_echo "yes" >&6; }
    2417   if test -z "$COMPAT32BITFLAGS" ; then
    2418     COMPAT32BITFLAGS="-m32"
    2419   fi
    2420 else
    2421   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    2422 $as_echo "no" >&6; }
    2423   if test -z "$COMPAT32BITFLAGS" ; then
    2424     COMPAT32BITFLAGS=
    2425   fi
    24262395fi
    24272396
    … …  
    26512620{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    26522621$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2653 as_fn_error 77 "C++ compiler cannot create executables
    2654 See \`config.log' for more details" "$LINENO" 5 ; }
     2622{ as_fn_set_status 77
     2623as_fn_error "C++ compiler cannot create executables
     2624See \`config.log' for more details." "$LINENO" 5; }; }
    26552625else
    26562626  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    … …  
    26942664  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    26952665$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2696 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
    2697 See \`config.log' for more details" "$LINENO" 5 ; }
     2666as_fn_error "cannot compute suffix of executables: cannot compile and link
     2667See \`config.log' for more details." "$LINENO" 5; }
    26982668fi
    26992669rm -f conftest conftest$ac_cv_exeext
    … …  
    27522722    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    27532723$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2754 as_fn_error $? "cannot run C++ compiled programs.
     2724as_fn_error "cannot run C++ compiled programs.
    27552725If you meant to cross compile, use \`--host'.
    2756 See \`config.log' for more details" "$LINENO" 5 ; }
     2726See \`config.log' for more details." "$LINENO" 5; }
    27572727    fi
    27582728  fi
    … …  
    28052775{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    28062776$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2807 as_fn_error $? "cannot compute suffix of object files: cannot compile
    2808 See \`config.log' for more details" "$LINENO" 5 ; }
     2777as_fn_error "cannot compute suffix of object files: cannot compile
     2778See \`config.log' for more details." "$LINENO" 5; }
    28092779fi
    28102780rm -f conftest.$ac_cv_objext conftest.$ac_ext
    … …  
    33203290test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    33213291$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3322 as_fn_error $? "no acceptable C compiler found in \$PATH
    3323 See \`config.log' for more details" "$LINENO" 5 ; }
     3292as_fn_error "no acceptable C compiler found in \$PATH
     3293See \`config.log' for more details." "$LINENO" 5; }
    33243294
    33253295# Provide some information about the compiler.
    … …  
    36683638set x ${MAKE-make}
    36693639ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
    3670 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
     3640if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
    36713641  $as_echo_n "(cached) " >&6
    36723642else
    … …  
    36763646    @echo '@@@%%%=$(MAKE)=@@@%%%'
    36773647_ACEOF
    3678 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
     3648# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
    36793649case `${MAKE-make} -f conftest.make 2>/dev/null` in
    36803650  *@@@%%%=?*=@@@%%%*)
    … …  
    38793849
    38803850    fi
    3881     test x$JAVA = x && as_fn_error $? "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5
     3851    test x$JAVA = x && as_fn_error "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5
    38823852fi
    38833853
    … …  
    39413911        ac_cv_prog_uudecode_base64=yes
    39423912else
    3943         echo "configure: 3943: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
     3913        echo "configure: 3913: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
    39443914        echo "configure: failed file was:" >&5
    39453915        cat Test.uue >&5
    … …  
    39563926$as_echo "$as_me: WARNING: I have to compile Test.class from scratch" >&2;}
    39573927        if test x$ac_cv_prog_javac_works = xno; then
    3958                 as_fn_error $? "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5
     3928                as_fn_error "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5
    39593929        fi
    39603930        if test x$ac_cv_prog_javac_works = x; then
    … …  
    40494019
    40504020  fi
    4051   test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5
     4021  test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5
    40524022else
    40534023  echo "Checking for javac... $JAVAC"
    … …  
    40644034CLASS_TEST=Test.class
    40654035cat << \EOF > $JAVA_TEST
    4066 /* #line 4066 "configure" */
     4036/* #line 4036 "configure" */
    40674037public class Test {
    40684038}
    … …  
    40764046  ac_cv_prog_javac_works=yes
    40774047else
    4078   as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4048  as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    40794049  echo "configure: failed program was:" >&5
    40804050  cat $JAVA_TEST >&5
    … …  
    41034073TEST=Test
    41044074cat << \EOF > $JAVA_TEST
    4105 /* [#]line 4105 "configure" */
     4075/* [#]line 4075 "configure" */
    41064076public class Test {
    41074077public static void main (String args[]) {
    … …  
    41204090          echo "configure: failed program was:" >&5
    41214091          cat $JAVA_TEST >&5
    4122           as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4092          as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    41234093        fi
    41244094fi
    … …  
    41334103  echo "configure: failed program was:" >&5
    41344104  cat $JAVA_TEST >&5
    4135   as_fn_error $? "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4105  as_fn_error "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    41364106fi
    41374107rm -fr $JAVA_TEST $CLASS_TEST Test.uue
    … …  
    42334203
    42344204  fi
    4235   test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5
     4205  test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5
    42364206else
    42374207  echo "Checking for javac... $JAVAC"
    … …  
    42484218CLASS_TEST=Test.class
    42494219cat << \EOF > $JAVA_TEST
    4250 /* #line 4250 "configure" */
     4220/* #line 4220 "configure" */
    42514221public class Test {
    42524222}
    … …  
    42604230  ac_cv_prog_javac_works=yes
    42614231else
    4262   as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4232  as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    42634233  echo "configure: failed program was:" >&5
    42644234  cat $JAVA_TEST >&5
    … …  
    43204290continue
    43214291fi
    4322 rm -f conftest.err conftest.i conftest.$ac_ext
     4292rm -f conftest.err conftest.$ac_ext
    43234293
    43244294  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    43364306break
    43374307fi
    4338 rm -f conftest.err conftest.i conftest.$ac_ext
     4308rm -f conftest.err conftest.$ac_ext
    43394309
    43404310done
    43414311# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    4342 rm -f conftest.i conftest.err conftest.$ac_ext
     4312rm -f conftest.err conftest.$ac_ext
    43434313if $ac_preproc_ok; then :
    43444314  break
    … …  
    43794349continue
    43804350fi
    4381 rm -f conftest.err conftest.i conftest.$ac_ext
     4351rm -f conftest.err conftest.$ac_ext
    43824352
    43834353  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    43954365break
    43964366fi
    4397 rm -f conftest.err conftest.i conftest.$ac_ext
     4367rm -f conftest.err conftest.$ac_ext
    43984368
    43994369done
    44004370# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    4401 rm -f conftest.i conftest.err conftest.$ac_ext
     4371rm -f conftest.err conftest.$ac_ext
    44024372if $ac_preproc_ok; then :
    44034373
    … …  
    44054375  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    44064376$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    4407 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
    4408 See \`config.log' for more details" "$LINENO" 5 ; }
     4377as_fn_error "C preprocessor \"$CPP\" fails sanity check
     4378See \`config.log' for more details." "$LINENO" 5; }
    44094379fi
    44104380
    … …  
    44674437IFS=$as_save_IFS
    44684438  if test -z "$ac_cv_path_GREP"; then
    4469     as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
     4439    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    44704440  fi
    44714441else
    … …  
    45334503IFS=$as_save_IFS
    45344504  if test -z "$ac_cv_path_EGREP"; then
    4535     as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
     4505    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    45364506  fi
    45374507else
    … …  
    46654635ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
    46664636"
    4667 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     4637eval as_val=\$$as_ac_Header
     4638   if test "x$as_val" = x""yes; then :
    46684639  cat >>confdefs.h <<_ACEOF
    46694640#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    50975068{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
    50985069$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
    5099 if eval "test \"\${$as_ac_Header+set}\"" = set; then :
     5070if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
    51005071  $as_echo_n "(cached) " >&6
    51015072else
    … …  
    51245095           { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
    51255096$as_echo "$ac_res" >&6; }
    5126 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     5097eval as_val=\$$as_ac_Header
     5098   if test "x$as_val" = x""yes; then :
    51275099  cat >>confdefs.h <<_ACEOF
    51285100#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
    … …  
    53665338  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
    53675339ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
    5368 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     5340eval as_val=\$$as_ac_Header
     5341   if test "x$as_val" = x""yes; then :
    53695342  cat >>confdefs.h <<_ACEOF
    53705343#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    55395512    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
    55405513ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
    5541 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
     5514eval as_val=\$$as_ac_var
     5515   if test "x$as_val" = x""yes; then :
    55425516
    55435517cat >>confdefs.h <<_ACEOF
    … …  
    56995673  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
    57005674ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
    5701 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
     5675eval as_val=\$$as_ac_var
     5676   if test "x$as_val" = x""yes; then :
    57025677  cat >>confdefs.h <<_ACEOF
    57035678#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
    … …  
    57075682done
    57085683
    5709 ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate"
    5710 if test "x$ac_cv_func_ftruncate" = x""yes; then :
    5711   $as_echo "#define HAVE_FTRUNCATE 1" >>confdefs.h
     5684for ac_func in ftruncate strstr strcasecmp
     5685do :
     5686  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
     5687ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
     5688eval as_val=\$$as_ac_var
     5689   if test "x$as_val" = x""yes; then :
     5690  cat >>confdefs.h <<_ACEOF
     5691#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
     5692_ACEOF
    57125693
    57135694else
    57145695  case " $LIBOBJS " in
    5715   *" ftruncate.$ac_objext "* ) ;;
    5716   *) LIBOBJS="$LIBOBJS ftruncate.$ac_objext"
     5696  *" $ac_func.$ac_objext "* ) ;;
     5697  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
    57175698 ;;
    57185699esac
    57195700
    57205701fi
    5721 
    5722 ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr"
    5723 if test "x$ac_cv_func_strstr" = x""yes; then :
    5724   $as_echo "#define HAVE_STRSTR 1" >>confdefs.h
    5725 
    5726 else
    5727   case " $LIBOBJS " in
    5728   *" strstr.$ac_objext "* ) ;;
    5729   *) LIBOBJS="$LIBOBJS strstr.$ac_objext"
    5730  ;;
    5731 esac
    5732 
    5733 fi
    5734 
    5735 ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
    5736 if test "x$ac_cv_func_strcasecmp" = x""yes; then :
    5737   $as_echo "#define HAVE_STRCASECMP 1" >>confdefs.h
    5738 
    5739 else
    5740   case " $LIBOBJS " in
    5741   *" strcasecmp.$ac_objext "* ) ;;
    5742   *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext"
    5743  ;;
    5744 esac
    5745 
    5746 fi
     5702done
    57475703
    57485704
    … …  
    60936049     ;; #(
    60946050   *)
    6095      as_fn_error $? "unknown endianness
    6096  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;;
     6051     as_fn_error "unknown endianness
     6052 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
    60976053 esac
    60986054
    … …  
    62046160ac_libobjs=
    62056161ac_ltlibobjs=
    6206 U=
    62076162for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    62086163  # 1. Remove the extension, and $U if already installed.
    … …  
    63676322
    63686323
    6369 # as_fn_error STATUS ERROR [LINENO LOG_FD]
    6370 # ----------------------------------------
     6324# as_fn_error ERROR [LINENO LOG_FD]
     6325# ---------------------------------
    63716326# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    63726327# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
    6373 # script with STATUS, using 1 if that was 0.
     6328# script with status $?, using 1 if that was 0.
    63746329as_fn_error ()
    63756330{
    6376   as_status=$1; test $as_status -eq 0 && as_status=1
    6377   if test "$4"; then
    6378     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    6379     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     6331  as_status=$?; test $as_status -eq 0 && as_status=1
     6332  if test "$3"; then
     6333    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     6334    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
    63806335  fi
    6381   $as_echo "$as_me: error: $2" >&2
     6336  $as_echo "$as_me: error: $1" >&2
    63826337  as_fn_exit $as_status
    63836338} # as_fn_error
    … …  
    65756530    done
    65766531    test -z "$as_dirs" || eval "mkdir $as_dirs"
    6577   } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
     6532  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
    65786533
    65796534
    … …  
    66296584ac_log="
    66306585This file was extended by $as_me, which was
    6631 generated by GNU Autoconf 2.67.  Invocation command line was
     6586generated by GNU Autoconf 2.65.  Invocation command line was
    66326587
    66336588  CONFIG_FILES    = $CONFIG_FILES
    … …  
    66956650ac_cs_version="\\
    66966651config.status
    6697 configured by $0, generated by GNU Autoconf 2.67,
     6652configured by $0, generated by GNU Autoconf 2.65,
    66986653  with options \\"\$ac_cs_config\\"
    66996654
    6700 Copyright (C) 2010 Free Software Foundation, Inc.
     6655Copyright (C) 2009 Free Software Foundation, Inc.
    67016656This config.status script is free software; the Free Software Foundation
    67026657gives unlimited permission to copy, distribute and modify it."
    … …  
    67156670do
    67166671  case $1 in
    6717   --*=?*)
     6672  --*=*)
    67186673    ac_option=`expr "X$1" : 'X\([^=]*\)='`
    67196674    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
    6720     ac_shift=:
    6721     ;;
    6722   --*=)
    6723     ac_option=`expr "X$1" : 'X\([^=]*\)='`
    6724     ac_optarg=
    67256675    ac_shift=:
    67266676    ;;
    … …  
    67466696    case $ac_optarg in
    67476697    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
    6748     '') as_fn_error $? "missing file argument" ;;
    67496698    esac
    67506699    as_fn_append CONFIG_FILES " '$ac_optarg'"
    … …  
    67596708  --he | --h)
    67606709    # Conflict between --help and --header
    6761     as_fn_error $? "ambiguous option: \`$1'
     6710    as_fn_error "ambiguous option: \`$1'
    67626711Try \`$0 --help' for more information.";;
    67636712  --help | --hel | -h )
    … …  
    67686717
    67696718  # This is an error.
    6770   -*) as_fn_error $? "unrecognized option: \`$1'
     6719  -*) as_fn_error "unrecognized option: \`$1'
    67716720Try \`$0 --help' for more information." ;;
    67726721
    … …  
    68256774    "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
    68266775
    6827   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
     6776  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
    68286777  esac
    68296778done
    … …  
    68636812  tmp=./conf$$-$RANDOM
    68646813  (umask 077 && mkdir "$tmp")
    6865 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
     6814} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
    68666815
    68676816# Set up the scripts for CONFIG_FILES section.
    … …  
    68806829ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
    68816830if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
    6882   ac_cs_awk_cr='\\r'
     6831  ac_cs_awk_cr='\r'
    68836832else
    68846833  ac_cs_awk_cr=$ac_cr
    … …  
    68946843  echo "_ACEOF"
    68956844} >conf$$subs.sh ||
    6896   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
    6897 ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
     6845  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
     6846ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
    68986847ac_delim='%!_!# '
    68996848for ac_last_try in false false false false false :; do
    69006849  . ./conf$$subs.sh ||
    6901     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     6850    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    69026851
    69036852  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
    … …  
    69056854    break
    69066855  elif $ac_last_try; then
    6907     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     6856    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    69086857  else
    69096858    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    … …  
    69946943  cat
    69956944fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
    6996   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
    6997 _ACEOF
    6998 
    6999 # VPATH may cause trouble with some makes, so we remove sole $(srcdir),
    7000 # ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
     6945  || as_fn_error "could not setup config files machinery" "$LINENO" 5
     6946_ACEOF
     6947
     6948# VPATH may cause trouble with some makes, so we remove $(srcdir),
     6949# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
    70016950# trailing colons and then remove the whole line if VPATH becomes empty
    70026951# (actually we leave an empty line to preserve line numbers).
    70036952if test "x$srcdir" = x.; then
    7004   ac_vpsub='/^[  ]*VPATH[    ]*=[    ]*/{
    7005 h
    7006 s///
    7007 s/^/:/
    7008 s/[  ]*$/:/
    7009 s/:\$(srcdir):/:/g
    7010 s/:\${srcdir}:/:/g
    7011 s/:@srcdir@:/:/g
    7012 s/^:*//
     6953  ac_vpsub='/^[  ]*VPATH[    ]*=/{
     6954s/:*\$(srcdir):*/:/
     6955s/:*\${srcdir}:*/:/
     6956s/:*@srcdir@:*/:/
     6957s/^\([^=]*=[     ]*\):*/\1/
    70136958s/:*$//
    7014 x
    7015 s/\(=[   ]*\).*/\1/
    7016 G
    7017 s/\n//
    70186959s/^[^=]*=[   ]*$//
    70196960}'
    … …  
    70436984    break
    70446985  elif $ac_last_try; then
    7045     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
     6986    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
    70466987  else
    70476988    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    … …  
    71287069_ACEOF
    71297070cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
    7130   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
     7071  as_fn_error "could not setup config headers machinery" "$LINENO" 5
    71317072fi # test -n "$CONFIG_HEADERS"
    71327073
    … …  
    71417082  case $ac_mode$ac_tag in
    71427083  :[FHL]*:*);;
    7143   :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
     7084  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
    71447085  :[FH]-) ac_tag=-:-;;
    71457086  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    … …  
    71697110       *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
    71707111       esac ||
    7171        as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
     7112       as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
    71727113      esac
    71737114      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
    … …  
    71967137    case $ac_tag in
    71977138    *:-:* | *:-) cat >"$tmp/stdin" \
    7198       || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     7139      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
    71997140    esac
    72007141    ;;
    … …  
    73277268"
    73287269eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
    7329   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7270  || as_fn_error "could not create $ac_file" "$LINENO" 5
    73307271
    73317272test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
    … …  
    73337274  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
    73347275  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
    7335 which seems to be undefined.  Please make sure it is defined" >&5
     7276which seems to be undefined.  Please make sure it is defined." >&5
    73367277$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
    7337 which seems to be undefined.  Please make sure it is defined" >&2;}
     7278which seems to be undefined.  Please make sure it is defined." >&2;}
    73387279
    73397280  rm -f "$tmp/stdin"
    … …  
    73427283  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    73437284  esac \
    7344   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7285  || as_fn_error "could not create $ac_file" "$LINENO" 5
    73457286 ;;
    73467287  :H)
    … …  
    73537294      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
    73547295    } >"$tmp/config.h" \
    7355       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7296      || as_fn_error "could not create $ac_file" "$LINENO" 5
    73567297    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
    73577298      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
    … …  
    73607301      rm -f "$ac_file"
    73617302      mv "$tmp/config.h" "$ac_file" \
    7362     || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7303    || as_fn_error "could not create $ac_file" "$LINENO" 5
    73637304    fi
    73647305  else
    73657306    $as_echo "/* $configure_input  */" \
    73667307      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
    7367       || as_fn_error $? "could not create -" "$LINENO" 5
     7308      || as_fn_error "could not create -" "$LINENO" 5
    73687309  fi
    73697310 ;;
    … …  
    73877328
    73887329test $ac_write_fail = 0 ||
    7389   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
     7330  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
    73907331
    73917332
    … …  
    74087349  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    74097350  # would make configure fail if this is the last instruction.
    7410   $ac_cs_success || as_fn_exit 1
     7351  $ac_cs_success || as_fn_exit $?
    74117352fi
    74127353if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then

  • main/trunk/greenstone2/common-src/indexers/mg/configure.in

    r23356 r25147  
    3434AC_SUBST(ENABLE_JAVA)
    3535
    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)
    54 
     36dnl AC_MSG_CHECKING(to see if architecture is 64-bit)
     37dnl arch_64bit=no
     38dnl case "$host_cpu" in
     39dnl x86_64) arch_64bit=yes ;;
     40dnl esac
    5541
    5642dnl Checks for programs.

  • main/trunk/greenstone2/common-src/indexers/mg/java/org/greenstone/mg/Makefile.in

    r23356 r25147  
    1717JAVAH = javah
    1818JAR = jar
    19 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX
    20 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -DSILENT -DSHORT_SUFFIX
     19CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX
     20CXXFLAGS = @CXXFLAGS@ -DSILENT -DSHORT_SUFFIX
    2121JAVACFLAGS = @JAVACFLAGS@
    2222DEFS = @DEFS@
    … …  
    2525INSTALL_DATA = @INSTALL_DATA@
    2626INSTALL_PROGRAM = @INSTALL_PROGRAM@
    27 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     27LDFLAGS = @LDFLAGS@
    2828LIBS =  -lstdc++ @LIBS@
    2929TOUCH = echo timestamp >

  • main/trunk/greenstone2/common-src/indexers/mg/jni/MGRetrieveWrapperImpl.c

    r16583 r25147  
    180180
    181181  /* Save the object on the Java side */
    182   (*j_env)->SetIntField(j_env, j_obj, FID_mg_data, (long) data);
     182  (*j_env)->SetIntField(j_env, j_obj, FID_mg_data, (mg_s_long) data);
    183183
    184184  /* Initialise MG environment variables */
    … …  
    250250  query_data* qd;
    251251
    252   u_long pos, len;
     252  mg_u_long pos, len;
    253253  u_char* c_buffer = NULL;
    254254  u_char* uc_buffer = NULL;
    … …  
    287287
    288288  /* Get the document position and length in the text file */
    289   printf("Fetching document number %ld...\n", (unsigned long) j_docnum);
    290   FetchDocStart(qd, (unsigned long) j_docnum, &pos, &len);
    291   printf("Fetched document start. Pos: %ld, Len: %ld\n", pos, len);
     289  printf("Fetching document number %d...\n", (mg_u_long) j_docnum);
     290  FetchDocStart(qd, (mg_u_long) j_docnum, &pos, &len);
     291  printf("Fetched document start. Pos: %d, Len: %d\n", pos, len);
    292292
    293293  /* Allocate memory for the document text (from mg/src/text/mgquery.c:RawDocOutput()) */

  • main/trunk/greenstone2/common-src/indexers/mg/jni/MGSearchWrapperImpl.c

    r16583 r25147  
    619619
    620620  /* Print the data to a character array */
    621   sprintf(result, "Query params:\nindex\t\t%s\ncasefold\t%d\nstem\t\t%d\nquery type\t%s\nmax docs\t%ld\n",
     621  sprintf(result, "Query params:\nindex\t\t%s\ncasefold\t%d\nstem\t\t%d\nquery type\t%s\nmax docs\t%d\n",
    622622      (data->queryInfo->index == NULL ? "<none loaded>" : data->queryInfo->index),
    623623      (data->defaultStemMethod & 1),

  • main/trunk/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.c

    r16583 r25147  
    168168
    169169  /* Save the object on the Java side */
    170   (*j_env)->SetIntField(j_env, j_obj, FID_mg_data, (long) data);
     170  (*j_env)->SetIntField(j_env, j_obj, FID_mg_data, (mg_s_long) data);
    171171
    172172  /* Initialise MG environment variables */
    … …  
    285285  query_data* qd;
    286286
    287   u_long pos, len;
     287  mg_u_long pos, len;
    288288  u_char* c_buffer = NULL;
    289289  u_char* uc_buffer = NULL;
    … …  
    322322
    323323  /* Get the document position and length in the text file */
    324   printf("Fetching document number %ld...\n", (unsigned long) j_docnum);
    325   FetchDocStart(qd, (unsigned long) j_docnum, &pos, &len);
    326   printf("Fetched document start. Pos: %ld, Len: %ld\n", pos, len);
     324  printf("Fetching document number %d...\n", (mg_u_long) j_docnum);
     325  FetchDocStart(qd, (mg_u_long) j_docnum, &pos, &len);
     326  printf("Fetched document start. Pos: %d, Len: %d\n", pos, len);
    327327
    328328  /* Allocate memory for the document text (from mg/src/text/mgquery.c:RawDocOutput()) */
    … …  
    730730
    731731  /* Print the data to a character array */
    732   sprintf(result, "Query params:\nindex\t\t%s\ncasefold\t%d\nstem\t\t%d\nquery type\t%s\nmax docs\t%ld\n",
     732  sprintf(result, "Query params:\nindex\t\t%s\ncasefold\t%d\nstem\t\t%d\nquery type\t%s\nmax docs\t%d\n",
    733733      (data->queryInfo->index == NULL ? "<none loaded>" : data->queryInfo->index),
    734734      (data->defaultStemMethod & 1),

  • main/trunk/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.h

    r16583 r25147  
    3636  char* index;
    3737  /* Maximum number of documents to retrieve */
    38   unsigned long maxDocs;
     38  mg_u_long maxDocs;
    3939  /* Whether term frequency information is desired (boolean value) */
    4040  int needTermFreqs;

  • main/trunk/greenstone2/common-src/indexers/mg/jni/Makefile.in

    r22070 r25147  
    1414AR = ar
    1515CC = @CC@
    16 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -fpic -DSILENT -DSHORT_SUFFIX -DNZDL -DQUIET -DPARADOCNUM
     16CFLAGS = @CFLAGS@ -ansi -fpic -DSILENT -DSHORT_SUFFIX -DNZDL -DQUIET -DPARADOCNUM
    1717DEFS = @DEFS@
    1818RANLIB = @RANLIB@
    … …  
    2020INSTALL_DATA = @INSTALL_DATA@
    2121INSTALL_PROGRAM = @INSTALL_PROGRAM@
    22 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     22LDFLAGS = @LDFLAGS@
    2323#NOTE: libmgtext.a needs to come before libmglib.a !!!
    2424QUERY_LIBS = ../src/text/libmgtext.a ../lib/libmglib.a @LIBS@

  • main/trunk/greenstone2/common-src/indexers/mg/lib/Makefile.in

    r22070 r25147  
    3434AR = ar
    3535CC = @CC@
    36 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic
     36CFLAGS = @CFLAGS@ -fpic
    3737DEFS = @DEFS@
    3838RANLIB = @RANLIB@
    … …  
    4141# Uncomment for compiling for the nzdl project
    4242#
    43 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -DQUIET -fpic
     43CFLAGS = @CFLAGS@ -DQUIET -fpic
    4444##########################################
    4545

  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_gen.c

    r16583 r25147  
    2828int fprintf (FILE *, const char *,...);
    2929
    30 unsigned long
    31 BIO_Unary_Length (unsigned long val)
     30mg_u_long
     31BIO_Unary_Length (mg_u_long val)
    3232{
    33   register unsigned long num;
     33  register mg_u_long num;
    3434  UNARY_LENGTH (val, num);
    3535  return (num);
    … …  
    3737
    3838
    39 unsigned long
    40 BIO_Binary_Length (unsigned long val, unsigned long b)
     39mg_u_long
     40BIO_Binary_Length (mg_u_long val, mg_u_long b)
    4141{
    42   register unsigned long num;
     42  register mg_u_long num;
    4343  BINARY_LENGTH (val, b, num);
    4444  return (num);
    … …  
    4646
    4747
    48 unsigned long
    49 BIO_Gamma_Length (unsigned long val)
     48mg_u_long
     49BIO_Gamma_Length (mg_u_long val)
    5050{
    51   register unsigned long num;
     51  register mg_u_long num;
    5252  GAMMA_LENGTH (val, num);
    5353  return (num);
    … …  
    5555
    5656
    57 unsigned long
    58 BIO_Delta_Length (unsigned long val)
     57mg_u_long
     58BIO_Delta_Length (mg_u_long val)
    5959{
    60   register unsigned long num;
     60  register mg_u_long num;
    6161  DELTA_LENGTH (val, num);
    6262  return (num);
    … …  
    6464
    6565
    66 unsigned long
    67 BIO_Elias_Length (unsigned long val, unsigned long b, double s)
     66mg_u_long
     67BIO_Elias_Length (mg_u_long val, mg_u_long b, double s)
    6868{
    69   register unsigned long num;
     69  register mg_u_long num;
    7070  ELIAS_LENGTH (val, b, s, num);
    7171  return (num);
    7272}
    7373
    74 unsigned long
    75 BIO_Bblock_Length (unsigned long val, unsigned long b)
     74mg_u_long
     75BIO_Bblock_Length (mg_u_long val, mg_u_long b)
    7676{
    77   register unsigned long num;
     77  register mg_u_long num;
    7878  BBLOCK_LENGTH (val, b, num);
    7979  return (num);

  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_gen.h

    r16583 r25147  
    3333#define H_BITIO_GEN
    3434
    35 unsigned long BIO_Unary_Length (unsigned long val);
     35mg_u_long BIO_Unary_Length (mg_u_long val);
    3636
    37 unsigned long BIO_Binary_Length (unsigned long val, unsigned long b);
     37mg_u_long BIO_Binary_Length (mg_u_long val, mg_u_long b);
    3838
    39 unsigned long BIO_Gamma_Length (unsigned long val);
     39mg_u_long BIO_Gamma_Length (mg_u_long val);
    4040
    41 unsigned long BIO_Delta_Length (unsigned long val);
     41mg_u_long BIO_Delta_Length (mg_u_long val);
    4242
    43 unsigned long BIO_Elias_Length (unsigned long val, unsigned long b, double s);
     43mg_u_long BIO_Elias_Length (mg_u_long val, mg_u_long b, double s);
    4444
    45 unsigned long BIO_Bblock_Length (unsigned long val, unsigned long b);
     45mg_u_long BIO_Bblock_Length (mg_u_long val, mg_u_long b);
    4646
    4747int BIO_Bblock_Init (int N, int p);

  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_m.h

    r16583 r25147  
    5050#define POSITIVE(f, x)                          \
    5151  if ((x)<=0)                               \
    52     fprintf(stderr,"Error: Cannot "#f" encode %lu\n",(unsigned long)x),exit(1);
     52    fprintf(stderr,"Error: Cannot "#f" encode %d\n",(mg_u_long)x),exit(1);
    5353
    5454
    … …  
    7575#define UNARY_ENCODE(x)                         \
    7676do {                                    \
    77   register unsigned long _B_x = (x);                    \
     77  register mg_u_long _B_x = (x);                    \
    7878  BIO_ENCODE_PROLOGUE;                          \
    7979  POSITIVE(unary, _B_x);                        \
    … …  
    8585#define UNARY_ENCODE_L(x, count)                    \
    8686do {                                    \
    87   register unsigned long _B_x = (x);                    \
     87  register mg_u_long _B_x = (x);                    \
    8888  BIO_ENCODE_PROLOGUE;                          \
    8989  POSITIVE(unary, _B_x);                        \
    … …  
    124124#define BINARY_ENCODE(x, b)                     \
    125125do {                                    \
    126   register unsigned long _B_x = (x);                    \
    127   register unsigned long _B_b = (b);                    \
     126  register mg_u_long _B_x = (x);                    \
     127  register mg_u_long _B_b = (b);                    \
    128128  register int _B_nbits, _B_logofb, _B_thresh;              \
    129129  BIO_ENCODE_PROLOGUE;                          \
    … …  
    145145#define BINARY_ENCODE_L(x, b, count)                    \
    146146do {                                    \
    147   register unsigned long _B_x = (x);                    \
    148   register unsigned long _B_b = (b);                    \
     147  register mg_u_long _B_x = (x);                    \
     148  register mg_u_long _B_b = (b);                    \
    149149  register int _B_nbits, _B_logofb, _B_thresh;              \
    150150  BIO_ENCODE_PROLOGUE;                          \
    … …  
    168168#define BINARY_DECODE(x, b)                     \
    169169do {                                    \
    170   register unsigned long _B_x = 0;                  \
    171   register unsigned long _B_b = (b);                    \
     170  register mg_u_long _B_x = 0;                  \
     171  register mg_u_long _B_b = (b);                    \
    172172  register int _B_i, _B_logofb, _B_thresh;              \
    173173  BIO_DECODE_PROLOGUE;                          \
    … …  
    193193#define BINARY_DECODE_L(x, b, count)                    \
    194194do {                                    \
    195   register unsigned long _B_x = 0;                  \
    196   register unsigned long _B_b = (b);                    \
     195  register mg_u_long _B_x = 0;                  \
     196  register mg_u_long _B_b = (b);                    \
    197197  register int _B_i, _B_logofb, _B_thresh;              \
    198198  BIO_DECODE_PROLOGUE;                          \
    … …  
    220220#define BINARY_LENGTH(x, b, count)                  \
    221221do {                                    \
    222   register unsigned long _B_x = (x);                    \
    223   register unsigned long _B_b = (b);                    \
     222  register mg_u_long _B_x = (x);                    \
     223  register mg_u_long _B_b = (b);                    \
    224224  register int _B_nbits, _B_logofb, _B_thresh;              \
    225225  POSITIVE(binary, _B_x);                       \
    … …  
    240240#define GAMMA_ENCODE(x)                         \
    241241do {                                    \
    242   register unsigned long _B_xx = (x);                   \
     242  register mg_u_long _B_xx = (x);                   \
    243243  register int _B_logofb;                       \
    244244  register int _B_nbits;                        \
    … …  
    255255#define GAMMA_ENCODE_L(x, count)                    \
    256256do {                                    \
    257   register unsigned long _B_xx = (x);                   \
     257  register mg_u_long _B_xx = (x);                   \
    258258  register int _B_logofb;                       \
    259259  register int _B_nbits;                        \
    … …  
    271271#define GAMMA_DECODE(x)                         \
    272272do {                                    \
    273   register unsigned long _B_xx = 1;                 \
     273  register mg_u_long _B_xx = 1;                 \
    274274  register int _B_nbits = 0;                        \
    275275  BIO_DECODE_PROLOGUE;                          \
    … …  
    283283#define GAMMA_DECODE_L(x, count)                    \
    284284do {                                    \
    285   register unsigned long _B_xx = 1;                 \
     285  register mg_u_long _B_xx = 1;                 \
    286286  register int _B_nbits = 0;                        \
    287287  BIO_DECODE_PROLOGUE;                          \
    … …  
    296296#define GAMMA_LENGTH(x, count)                      \
    297297do {                                    \
    298   register unsigned long _B_xx = (x);                   \
     298  register mg_u_long _B_xx = (x);                   \
    299299  register int _B_logofb;                       \
    300300  POSITIVE(gamma, _B_xx);                       \
    … …  
    310310#define DELTA_ENCODE(x)                         \
    311311do {                                    \
    312   register unsigned long _B_xxx = (x);                  \
     312  register mg_u_long _B_xxx = (x);                  \
    313313  register int _B_logx;                         \
    314314  FLOORLOG_2(_B_xxx, _B_logx);                      \
    … …  
    319319#define DELTA_ENCODE_L(x, count)                    \
    320320do {                                    \
    321   register unsigned long _B_xxx = (x);                  \
     321  register mg_u_long _B_xxx = (x);                  \
    322322  register int _B_logx;                         \
    323323  FLOORLOG_2(_B_xxx, _B_logx);                      \
    … …  
    329329#define DELTA_DECODE(x)                         \
    330330do {                                    \
    331   register unsigned long _B_xxx;                    \
     331  register mg_u_long _B_xxx;                    \
    332332  register int _B_logx;                         \
    333333  GAMMA_DECODE(_B_logx); --_B_logx;                 \
    … …  
    338338#define DELTA_DECODE_L(x, count)                    \
    339339do {                                    \
    340   register unsigned long _B_xxx;                    \
     340  register mg_u_long _B_xxx;                    \
    341341  register int _B_logx;                         \
    342342  GAMMA_DECODE_L(_B_logx, count); --_B_logx;                \
    … …  
    347347#define DELTA_LENGTH(x, count)                      \
    348348do {                                    \
    349   register unsigned long _B_xxx = (x);                  \
     349  register mg_u_long _B_xxx = (x);                  \
    350350  register int _B_logx, _B_dcount;                  \
    351351  FLOORLOG_2(_B_xxx, _B_logx);                      \
    … …  
    363363#define ELIAS_ENCODE(x, b, s)                       \
    364364do {                                    \
    365   register unsigned long _B_xx = (x);                   \
    366   register unsigned long _B_b = (b);                    \
     365  register mg_u_long _B_xx = (x);                   \
     366  register mg_u_long _B_b = (b);                    \
    367367  register double _B_s = (s);                       \
    368368  register int _B_lower=1, _B_upper=1;                  \
    … …  
    383383#define ELIAS_ENCODE_L(x, b, s, count)                  \
    384384do {                                    \
    385   register unsigned long _B_xx = (x);                   \
    386   register unsigned long _B_b = (b);                    \
     385  register mg_u_long _B_xx = (x);                   \
     386  register mg_u_long _B_b = (b);                    \
    387387  register double _B_s = (s);                       \
    388388  register int _B_lower=1, _B_upper=1;                  \
    … …  
    403403#define ELIAS_DECODE(x, b, s)                       \
    404404do {                                    \
    405   register unsigned long _B_xx;                     \
    406   register unsigned long _B_b = (b);                    \
     405  register mg_u_long _B_xx;                     \
     406  register mg_u_long _B_b = (b);                    \
    407407  register double _B_s = (s);                       \
    408408  register int _B_lower=1, _B_upper=1;                  \
    … …  
    423423#define ELIAS_DECODE_L(x, b, s, count)                  \
    424424do {                                    \
    425   register unsigned long _B_xx;                     \
    426   register unsigned long _B_b = (b);                    \
     425  register mg_u_long _B_xx;                     \
     426  register mg_u_long _B_b = (b);                    \
    427427  register double _B_s = (s);                       \
    428428  register int _B_lower=1, _B_upper=1;                  \
    … …  
    443443#define ELIAS_LENGTH(x, b, s, count)                    \
    444444do {                                    \
    445   register unsigned long _B_xx = (x);                   \
    446   register unsigned long _B_b = (b);                    \
     445  register mg_u_long _B_xx = (x);                   \
     446  register mg_u_long _B_b = (b);                    \
    447447  register double _B_s = (s);                       \
    448448  register int _B_lower=1, _B_upper=1;                  \
    … …  
    468468#define BBLOCK_ENCODE(x, b)                     \
    469469do {                                    \
    470   register unsigned long _B_xx = (x);                   \
    471   register unsigned long _B_bb = (b);                   \
     470  register mg_u_long _B_xx = (x);                   \
     471  register mg_u_long _B_bb = (b);                   \
    472472  register int _B_xdivb = 0;                        \
    473473  POSITIVE(bblock, _B_xx);                      \
    … …  
    484484#define BBLOCK_ENCODE_L(x, b, count)                    \
    485485do {                                    \
    486   register unsigned long _B_xx = (x);                   \
    487   register unsigned long _B_bb = (b);                   \
     486  register mg_u_long _B_xx = (x);                   \
     487  register mg_u_long _B_bb = (b);                   \
    488488  register int _B_xdivb = 0;                        \
    489489  POSITIVE(bblock, _B_xx);                      \
    … …  
    500500#define BBLOCK_DECODE(x, b)                     \
    501501do {                                    \
    502   register unsigned long _B_x1, _B_xx = 0;              \
    503   register unsigned long _B_bb = (b);                   \
     502  register mg_u_long _B_x1, _B_xx = 0;              \
     503  register mg_u_long _B_bb = (b);                   \
    504504  register int _B_xdivb;                        \
    505505  UNARY_DECODE(_B_xdivb); --_B_xdivb;                   \
    … …  
    512512#define BBLOCK_DECODE_L(x, b, count)                    \
    513513do {                                    \
    514   register unsigned long _B_x1, _B_xx = 0;              \
    515   register unsigned long _B_bb = (b);                   \
     514  register mg_u_long _B_x1, _B_xx = 0;              \
     515  register mg_u_long _B_bb = (b);                   \
    516516  register int _B_xdivb;                        \
    517517  UNARY_DECODE_L(_B_xdivb, count); --_B_xdivb;              \
    … …  
    524524#define BBLOCK_LENGTH(x, b, count)                  \
    525525do {                                    \
    526   register unsigned long _B_bcount, _B_xx = (x);            \
    527   register unsigned long _B_bb = (b);                   \
     526  register mg_u_long _B_bcount, _B_xx = (x);            \
     527  register mg_u_long _B_bb = (b);                   \
    528528  register int _B_xdivb = 0;                        \
    529529  POSITIVE(bblock, _B_xx);                      \

  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_m_mems.h

    r16583 r25147  
    3636  {
    3737    unsigned char *Base;
    38     unsigned long pos;
     38    mg_u_long pos;
    3939  }
    4040mems_bitio_state;
    … …  
    4444  {                                 \
    4545    register unsigned char *__base = b;                 \
    46     register unsigned long __pos = p;
     46    register mg_u_long __pos = p;
    4747
    4848#define ENCODE_CONTINUE(b)                      \
    4949  {                                 \
    5050    register unsigned char *__base = (b).Base;              \
    51     register unsigned long __pos = (b).pos;
     51    register mg_u_long __pos = (b).pos;
    5252
    5353#define ENCODE_BIT(b)                           \
    … …  
    7676  {                                 \
    7777    register unsigned char *__base = b;                 \
    78     register unsigned long __pos = p;
     78    register mg_u_long __pos = p;
    7979
    8080#define DECODE_CONTINUE(b)                      \
    8181  {                                 \
    8282    register unsigned char *__base = (b).Base;              \
    83     register unsigned long __pos = (b).pos;
     83    register mg_u_long __pos = (b).pos;
    8484
    8585#define DECODE_ADD_FF(b)                        \

  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_m_random.h

    r16583 r25147  
    3838    FILE *File;
    3939    unsigned char *Buf;
    40     unsigned long Base;
    41     unsigned long Used;
    42     unsigned long pos;
    43     unsigned long len;
    44     unsigned long sft;
     40    mg_u_long Base;
     41    mg_u_long Used;
     42    mg_u_long pos;
     43    mg_u_long len;
     44    mg_u_long sft;
    4545  }
    4646random_bitio_state;
    … …  
    5151    register FILE *__file = f;                      \
    5252    register unsigned char *__buf;                  \
    53     register unsigned long __pos = 0;                   \
    54     register unsigned long __base = 0;                  \
    55     register unsigned long __is_used = 0;                   \
    56     register unsigned long __len = (l)-1;               \
    57     register unsigned long __sft = 0;                   \
     53    register mg_u_long __pos = 0;                   \
     54    register mg_u_long __base = 0;                  \
     55    register mg_u_long __is_used = 0;                   \
     56    register mg_u_long __len = (l)-1;               \
     57    register mg_u_long __sft = 0;                   \
    5858    while (__len) { ++__sft; __len >>=1; }              \
    5959    __len = 1<<__sft;                           \
    … …  
    6666    register FILE *__file = (b).File;                   \
    6767    register unsigned char *__buf = (b).Buf;                \
    68     register unsigned long __pos = (b).pos;             \
    69     register unsigned long __base = (b).Base;               \
    70     register unsigned long __is_used = (b).Used;                \
    71     register unsigned long __len = (b).len;             \
    72     register unsigned long __sft = (b).sft;
     68    register mg_u_long __pos = (b).pos;             \
     69    register mg_u_long __base = (b).Base;               \
     70    register mg_u_long __is_used = (b).Used;                \
     71    register mg_u_long __len = (b).len;             \
     72    register mg_u_long __sft = (b).sft;
    7373
    7474#define SEEK fprintf(stderr, "Seek to %d\n",__base)

  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_mem.c

    r16583 r25147  
    5555
    5656void
    57 BIO_Mem_Unary_Encode (unsigned long val, mem_bitio_state * bs,
    58               unsigned long *bits)
     57BIO_Mem_Unary_Encode (mg_u_long val, mem_bitio_state * bs,
     58              mg_u_long *bits)
    5959{
    6060  ENCODE_CONTINUE (*bs)
    … …  
    6767
    6868
    69 unsigned long
     69mg_u_long
    7070BIO_Mem_Unary_Decode (mem_bitio_state * bs,
    71               unsigned long *bits)
    72 {
    73   register unsigned long val;
     71              mg_u_long *bits)
     72{
     73  register mg_u_long val;
    7474  DECODE_CONTINUE (*bs)
    7575    if (bits)
    … …  
    8888
    8989void
    90 BIO_Mem_Binary_Encode (unsigned long val, unsigned long b,
    91                mem_bitio_state * bs, unsigned long *bits)
     90BIO_Mem_Binary_Encode (mg_u_long val, mg_u_long b,
     91               mem_bitio_state * bs, mg_u_long *bits)
    9292{
    9393  ENCODE_CONTINUE (*bs)
    … …  
    100100
    101101
    102 unsigned long
    103 BIO_Mem_Binary_Decode (unsigned long b, mem_bitio_state * bs,
    104                unsigned long *bits)
    105 {
    106   register unsigned long val;
     102mg_u_long
     103BIO_Mem_Binary_Decode (mg_u_long b, mem_bitio_state * bs,
     104               mg_u_long *bits)
     105{
     106  register mg_u_long val;
    107107  DECODE_CONTINUE (*bs)
    108108    if (bits)
    … …  
    121121
    122122void
    123 BIO_Mem_Gamma_Encode (unsigned long val, mem_bitio_state * bs,
    124               unsigned long *bits)
     123BIO_Mem_Gamma_Encode (mg_u_long val, mem_bitio_state * bs,
     124              mg_u_long *bits)
    125125{
    126126  ENCODE_CONTINUE (*bs)
    … …  
    133133
    134134
    135 unsigned long
    136 BIO_Mem_Gamma_Decode (mem_bitio_state * bs, unsigned long *bits)
    137 {
    138   register unsigned long val;
     135mg_u_long
     136BIO_Mem_Gamma_Decode (mem_bitio_state * bs, mg_u_long *bits)
     137{
     138  register mg_u_long val;
    139139  DECODE_CONTINUE (*bs)
    140140    if (bits)
    … …  
    150150
    151151void
    152 BIO_Mem_Delta_Encode (unsigned long val, mem_bitio_state * bs,
    153               unsigned long *bits)
     152BIO_Mem_Delta_Encode (mg_u_long val, mem_bitio_state * bs,
     153              mg_u_long *bits)
    154154{
    155155  ENCODE_CONTINUE (*bs)
    … …  
    162162
    163163
    164 unsigned long
    165 BIO_Mem_Delta_Decode (mem_bitio_state * bs, unsigned long *bits)
    166 {
    167   register unsigned long val;
     164mg_u_long
     165BIO_Mem_Delta_Decode (mem_bitio_state * bs, mg_u_long *bits)
     166{
     167  register mg_u_long val;
    168168  DECODE_CONTINUE (*bs)
    169169    if (bits)
    … …  
    176176
    177177void
    178 BIO_Mem_Elias_Encode (unsigned long val, unsigned long b, double s,
    179               mem_bitio_state * bs, unsigned long *bits)
     178BIO_Mem_Elias_Encode (mg_u_long val, mg_u_long b, double s,
     179              mem_bitio_state * bs, mg_u_long *bits)
    180180{
    181181  ENCODE_CONTINUE (*bs)
    … …  
    188188
    189189
    190 unsigned long
    191 BIO_Mem_Elias_Decode (unsigned long b, double s,
    192               mem_bitio_state * bs, unsigned long *bits)
    193 {
    194   register unsigned long val;
     190mg_u_long
     191BIO_Mem_Elias_Decode (mg_u_long b, double s,
     192              mem_bitio_state * bs, mg_u_long *bits)
     193{
     194  register mg_u_long val;
    195195  DECODE_CONTINUE (*bs)
    196196    if (bits)
    … …  
    203203
    204204void
    205 BIO_Mem_Bblock_Encode (unsigned long val, unsigned long b,
    206                mem_bitio_state * bs, unsigned long *bits)
     205BIO_Mem_Bblock_Encode (mg_u_long val, mg_u_long b,
     206               mem_bitio_state * bs, mg_u_long *bits)
    207207{
    208208  ENCODE_CONTINUE (*bs)
    … …  
    215215
    216216
    217 unsigned long
    218 BIO_Mem_Bblock_Decode (unsigned long b, mem_bitio_state * bs,
    219                unsigned long *bits)
    220 {
    221   register unsigned long val;
     217mg_u_long
     218BIO_Mem_Bblock_Decode (mg_u_long b, mem_bitio_state * bs,
     219               mg_u_long *bits)
     220{
     221  register mg_u_long val;
    222222  DECODE_CONTINUE (*bs)
    223223    if (bits)
    … …  
    230230
    231231void
    232 BIO_Mem_Decode_Seek (unsigned long pos, mem_bitio_state * bs)
     232BIO_Mem_Decode_Seek (mg_u_long pos, mem_bitio_state * bs)
    233233{
    234234  DECODE_CONTINUE (*bs)

  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_mem.h

    r16583 r25147  
    6161
    6262
    63 void BIO_Mem_Unary_Encode (unsigned long val, mem_bitio_state * bs,
    64                unsigned long *bits);
    65 unsigned long BIO_Mem_Unary_Decode (mem_bitio_state * bs,
    66                     unsigned long *bits);
     63void BIO_Mem_Unary_Encode (mg_u_long val, mem_bitio_state * bs,
     64               mg_u_long *bits);
     65mg_u_long BIO_Mem_Unary_Decode (mem_bitio_state * bs,
     66                    mg_u_long *bits);
    6767
    6868
    6969
    70 void BIO_Mem_Binary_Encode (unsigned long val, unsigned long b,
    71                 mem_bitio_state * bs, unsigned long *bits);
    72 unsigned long BIO_Mem_Binary_Decode (unsigned long b, mem_bitio_state * bs,
    73                      unsigned long *bits);
     70void BIO_Mem_Binary_Encode (mg_u_long val, mg_u_long b,
     71                mem_bitio_state * bs, mg_u_long *bits);
     72mg_u_long BIO_Mem_Binary_Decode (mg_u_long b, mem_bitio_state * bs,
     73                     mg_u_long *bits);
    7474
    7575
    7676
    77 void BIO_Mem_Gamma_Encode (unsigned long val, mem_bitio_state * bs,
    78                unsigned long *bits);
    79 unsigned long BIO_Mem_Gamma_Decode (mem_bitio_state * bs, unsigned long *bits);
     77void BIO_Mem_Gamma_Encode (mg_u_long val, mem_bitio_state * bs,
     78               mg_u_long *bits);
     79mg_u_long BIO_Mem_Gamma_Decode (mem_bitio_state * bs, mg_u_long *bits);
    8080
    8181
    8282
    83 void BIO_Mem_Delta_Encode (unsigned long val, mem_bitio_state * bs,
    84                unsigned long *bits);
    85 unsigned long BIO_Mem_Delta_Decode (mem_bitio_state * bs, unsigned long *bits);
     83void BIO_Mem_Delta_Encode (mg_u_long val, mem_bitio_state * bs,
     84               mg_u_long *bits);
     85mg_u_long BIO_Mem_Delta_Decode (mem_bitio_state * bs, mg_u_long *bits);
    8686
    8787
    88 void BIO_Mem_Elias_Encode (unsigned long val, unsigned long b, double s,
    89                mem_bitio_state * bs, unsigned long *bits);
    90 unsigned long BIO_Mem_Elias_Decode (unsigned long b, double s,
    91                  mem_bitio_state * bs, unsigned long *bits);
     88void BIO_Mem_Elias_Encode (mg_u_long val, mg_u_long b, double s,
     89               mem_bitio_state * bs, mg_u_long *bits);
     90mg_u_long BIO_Mem_Elias_Decode (mg_u_long b, double s,
     91                 mem_bitio_state * bs, mg_u_long *bits);
    9292
    9393
    94 void BIO_Mem_Bblock_Encode (unsigned long val, unsigned long b,
    95                 mem_bitio_state * bs, unsigned long *bits);
    96 unsigned long BIO_Mem_Bblock_Decode (unsigned long b, mem_bitio_state * bs,
    97                      unsigned long *bits);
     94void BIO_Mem_Bblock_Encode (mg_u_long val, mg_u_long b,
     95                mem_bitio_state * bs, mg_u_long *bits);
     96mg_u_long BIO_Mem_Bblock_Decode (mg_u_long b, mem_bitio_state * bs,
     97                     mg_u_long *bits);
    9898
    9999
    100 void BIO_Mem_Decode_Seek (unsigned long pos, mem_bitio_state * bs);
     100void BIO_Mem_Decode_Seek (mg_u_long pos, mem_bitio_state * bs);
    101101
    102102

  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_mems.c

    r16583 r25147  
    3030
    3131void
    32 BIO_Mems_Encode_Start (unsigned char *buf, unsigned long pos,
     32BIO_Mems_Encode_Start (unsigned char *buf, mg_u_long pos,
    3333               mems_bitio_state * bs)
    3434{
    … …  
    4646
    4747void
    48 BIO_Mems_Decode_Start (unsigned char *buf, unsigned long pos,
     48BIO_Mems_Decode_Start (unsigned char *buf, mg_u_long pos,
    4949               mems_bitio_state * bs)
    5050{
    … …  
    5757
    5858void
    59 BIO_Mems_Unary_Encode (unsigned long val, mems_bitio_state * bs,
    60                unsigned long *bits)
     59BIO_Mems_Unary_Encode (mg_u_long val, mems_bitio_state * bs,
     60               mg_u_long *bits)
    6161{
    6262  ENCODE_CONTINUE (*bs)
    … …  
    6969
    7070
    71 unsigned long
     71mg_u_long
    7272BIO_Mems_Unary_Decode (mems_bitio_state * bs,
    73                unsigned long *bits)
    74 {
    75   register unsigned long val;
     73               mg_u_long *bits)
     74{
     75  register mg_u_long val;
    7676  DECODE_CONTINUE (*bs)
    7777    if (bits)
    … …  
    9090
    9191void
    92 BIO_Mems_Binary_Encode (unsigned long val, unsigned long b,
    93             mems_bitio_state * bs, unsigned long *bits)
     92BIO_Mems_Binary_Encode (mg_u_long val, mg_u_long b,
     93            mems_bitio_state * bs, mg_u_long *bits)
    9494{
    9595  ENCODE_CONTINUE (*bs)
    … …  
    102102
    103103
    104 unsigned long
    105 BIO_Mems_Binary_Decode (unsigned long b, mems_bitio_state * bs,
    106             unsigned long *bits)
    107 {
    108   register unsigned long val;
     104mg_u_long
     105BIO_Mems_Binary_Decode (mg_u_long b, mems_bitio_state * bs,
     106            mg_u_long *bits)
     107{
     108  register mg_u_long val;
    109109  DECODE_CONTINUE (*bs)
    110110    if (bits)
    … …  
    123123
    124124void
    125 BIO_Mems_Gamma_Encode (unsigned long val, mems_bitio_state * bs,
    126                unsigned long *bits)
     125BIO_Mems_Gamma_Encode (mg_u_long val, mems_bitio_state * bs,
     126               mg_u_long *bits)
    127127{
    128128  ENCODE_CONTINUE (*bs)
    … …  
    135135
    136136
    137 unsigned long
    138 BIO_Mems_Gamma_Decode (mems_bitio_state * bs, unsigned long *bits)
    139 {
    140   register unsigned long val;
     137mg_u_long
     138BIO_Mems_Gamma_Decode (mems_bitio_state * bs, mg_u_long *bits)
     139{
     140  register mg_u_long val;
    141141  DECODE_CONTINUE (*bs)
    142142    if (bits)
    … …  
    152152
    153153void
    154 BIO_Mems_Delta_Encode (unsigned long val, mems_bitio_state * bs,
    155                unsigned long *bits)
     154BIO_Mems_Delta_Encode (mg_u_long val, mems_bitio_state * bs,
     155               mg_u_long *bits)
    156156{
    157157  ENCODE_CONTINUE (*bs)
    … …  
    164164
    165165
    166 unsigned long
    167 BIO_Mems_Delta_Decode (mems_bitio_state * bs, unsigned long *bits)
    168 {
    169   register unsigned long val;
     166mg_u_long
     167BIO_Mems_Delta_Decode (mems_bitio_state * bs, mg_u_long *bits)
     168{
     169  register mg_u_long val;
    170170  DECODE_CONTINUE (*bs)
    171171    if (bits)
    … …  
    178178
    179179void
    180 BIO_Mems_Elias_Encode (unsigned long val, unsigned long b, double s,
    181                mems_bitio_state * bs, unsigned long *bits)
     180BIO_Mems_Elias_Encode (mg_u_long val, mg_u_long b, double s,
     181               mems_bitio_state * bs, mg_u_long *bits)
    182182{
    183183  ENCODE_CONTINUE (*bs)
    … …  
    190190
    191191
    192 unsigned long
    193 BIO_Mems_Elias_Decode (unsigned long b, double s,
    194                mems_bitio_state * bs, unsigned long *bits)
    195 {
    196   register unsigned long val;
     192mg_u_long
     193BIO_Mems_Elias_Decode (mg_u_long b, double s,
     194               mems_bitio_state * bs, mg_u_long *bits)
     195{
     196  register mg_u_long val;
    197197  DECODE_CONTINUE (*bs)
    198198    if (bits)
    … …  
    205205
    206206void
    207 BIO_Mems_Bblock_Encode (unsigned long val, unsigned long b,
    208             mems_bitio_state * bs, unsigned long *bits)
     207BIO_Mems_Bblock_Encode (mg_u_long val, mg_u_long b,
     208            mems_bitio_state * bs, mg_u_long *bits)
    209209{
    210210  ENCODE_CONTINUE (*bs)
    … …  
    217217
    218218
    219 unsigned long
    220 BIO_Mems_Bblock_Decode (unsigned long b, mems_bitio_state * bs,
    221             unsigned long *bits)
    222 {
    223   register unsigned long val;
     219mg_u_long
     220BIO_Mems_Bblock_Decode (mg_u_long b, mems_bitio_state * bs,
     221            mg_u_long *bits)
     222{
     223  register mg_u_long val;
    224224  DECODE_CONTINUE (*bs)
    225225    if (bits)
    … …  
    232232
    233233void
    234 BIO_Mems_Decode_Seek (unsigned long pos, mems_bitio_state * bs)
     234BIO_Mems_Decode_Seek (mg_u_long pos, mems_bitio_state * bs)
    235235{
    236236  DECODE_CONTINUE (*bs)
    … …  
    240240
    241241void
    242 BIO_Mems_Encode_Seek (unsigned long pos, mems_bitio_state * bs)
     242BIO_Mems_Encode_Seek (mg_u_long pos, mems_bitio_state * bs)
    243243{
    244244  ENCODE_CONTINUE (*bs)

  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_mems.h

    r16583 r25147  
    3838  {
    3939    unsigned char *Base;
    40     unsigned long pos;
     40    mg_u_long pos;
    4141  }
    4242mems_bitio_state;
    … …  
    4646
    4747
    48 void BIO_Mems_Encode_Start (char *buf, unsigned long pos, mems_bitio_state * bs);
     48void BIO_Mems_Encode_Start (char *buf, mg_u_long pos, mems_bitio_state * bs);
    4949void BIO_Mems_Encode_Done (mems_bitio_state * bs);
    5050
    5151
    5252
    53 void BIO_Mems_Decode_Start (void *buf, unsigned long pos, mems_bitio_state * bs);
     53void BIO_Mems_Decode_Start (void *buf, mg_u_long pos, mems_bitio_state * bs);
    5454
    5555
    5656
    57 void BIO_Mems_Unary_Encode (unsigned long val, mems_bitio_state * bs,
    58                 unsigned long *bits);
    59 unsigned long BIO_Mems_Unary_Decode (mems_bitio_state * bs,
    60                      unsigned long *bits);
     57void BIO_Mems_Unary_Encode (mg_u_long val, mems_bitio_state * bs,
     58                mg_u_long *bits);
     59mg_u_long BIO_Mems_Unary_Decode (mems_bitio_state * bs,
     60                     mg_u_long *bits);
    6161
    6262
    6363
    64 void BIO_Mems_Binary_Encode (unsigned long val, unsigned long b,
    65                  mems_bitio_state * bs, unsigned long *bits);
    66 unsigned long BIO_Mems_Binary_Decode (unsigned long b, mems_bitio_state * bs,
    67                       unsigned long *bits);
     64void BIO_Mems_Binary_Encode (mg_u_long val, mg_u_long b,
     65                 mems_bitio_state * bs, mg_u_long *bits);
     66mg_u_long BIO_Mems_Binary_Decode (mg_u_long b, mems_bitio_state * bs,
     67                      mg_u_long *bits);
    6868
    6969
    7070
    71 void BIO_Mems_Gamma_Encode (unsigned long val, mems_bitio_state * bs,
    72                 unsigned long *bits);
    73 unsigned long BIO_Mems_Gamma_Decode (mems_bitio_state * bs, unsigned long *bits);
     71void BIO_Mems_Gamma_Encode (mg_u_long val, mems_bitio_state * bs,
     72                mg_u_long *bits);
     73mg_u_long BIO_Mems_Gamma_Decode (mems_bitio_state * bs, mg_u_long *bits);
    7474
    7575
    7676
    77 void BIO_Mems_Delta_Encode (unsigned long val, mems_bitio_state * bs,
    78                 unsigned long *bits);
    79 unsigned long BIO_Mems_Delta_Decode (mems_bitio_state * bs, unsigned long *bits);
     77void BIO_Mems_Delta_Encode (mg_u_long val, mems_bitio_state * bs,
     78                mg_u_long *bits);
     79mg_u_long BIO_Mems_Delta_Decode (mems_bitio_state * bs, mg_u_long *bits);
    8080
    8181
    82 void BIO_Mems_Elias_Encode (unsigned long val, unsigned long b, double s,
    83                 mems_bitio_state * bs, unsigned long *bits);
    84 unsigned long BIO_Mems_Elias_Decode (unsigned long b, double s,
    85                 mems_bitio_state * bs, unsigned long *bits);
     82void BIO_Mems_Elias_Encode (mg_u_long val, mg_u_long b, double s,
     83                mems_bitio_state * bs, mg_u_long *bits);
     84mg_u_long BIO_Mems_Elias_Decode (mg_u_long b, double s,
     85                mems_bitio_state * bs, mg_u_long *bits);
    8686
    8787
    88 void BIO_Mems_Bblock_Encode (unsigned long val, unsigned long b,
    89                  mems_bitio_state * bs, unsigned long *bits);
    90 unsigned long BIO_Mems_Bblock_Decode (unsigned long b, mems_bitio_state * bs,
    91                       unsigned long *bits);
     88void BIO_Mems_Bblock_Encode (mg_u_long val, mg_u_long b,
     89                 mems_bitio_state * bs, mg_u_long *bits);
     90mg_u_long BIO_Mems_Bblock_Decode (mg_u_long b, mems_bitio_state * bs,
     91                      mg_u_long *bits);
    9292
    9393
    94 void BIO_Mems_Decode_Seek (unsigned long pos, mems_bitio_state * bs);
     94void BIO_Mems_Decode_Seek (mg_u_long pos, mems_bitio_state * bs);
    9595
    9696

  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_random.c

    r16583 r25147  
    3030
    3131void
    32 BIO_Random_Start (FILE * f, unsigned long len,
     32BIO_Random_Start (FILE * f, mg_u_long len,
    3333          random_bitio_state * bs)
    3434{
    … …  
    6464
    6565void
    66 BIO_Random_Unary_Encode (unsigned long val, random_bitio_state * bs,
    67              unsigned long *bits)
     66BIO_Random_Unary_Encode (mg_u_long val, random_bitio_state * bs,
     67             mg_u_long *bits)
    6868{
    6969  ENCODE_CONTINUE (*bs)
    … …  
    7676
    7777
    78 unsigned long
     78mg_u_long
    7979BIO_Random_Unary_Decode (random_bitio_state * bs,
    80              unsigned long *bits)
    81 {
    82   register unsigned long val;
     80             mg_u_long *bits)
     81{
     82  register mg_u_long val;
    8383  DECODE_CONTINUE (*bs)
    8484    if (bits)
    … …  
    9797
    9898void
    99 BIO_Random_Binary_Encode (unsigned long val, unsigned long b,
    100               random_bitio_state * bs, unsigned long *bits)
     99BIO_Random_Binary_Encode (mg_u_long val, mg_u_long b,
     100              random_bitio_state * bs, mg_u_long *bits)
    101101{
    102102  ENCODE_CONTINUE (*bs)
    … …  
    109109
    110110
    111 unsigned long
    112 BIO_Random_Binary_Decode (unsigned long b,
     111mg_u_long
     112BIO_Random_Binary_Decode (mg_u_long b,
    113113              random_bitio_state * bs,
    114               unsigned long *bits)
    115 {
    116   register unsigned long val;
     114              mg_u_long *bits)
     115{
     116  register mg_u_long val;
    117117  DECODE_CONTINUE (*bs)
    118118    if (bits)
    … …  
    131131
    132132void
    133 BIO_Random_Gamma_Encode (unsigned long val, random_bitio_state * bs,
    134              unsigned long *bits)
     133BIO_Random_Gamma_Encode (mg_u_long val, random_bitio_state * bs,
     134             mg_u_long *bits)
    135135{
    136136  ENCODE_CONTINUE (*bs)
    … …  
    143143
    144144
    145 unsigned long
     145mg_u_long
    146146BIO_Random_Gamma_Decode (random_bitio_state * bs,
    147              unsigned long *bits)
    148 {
    149   register unsigned long val;
     147             mg_u_long *bits)
     148{
     149  register mg_u_long val;
    150150  DECODE_CONTINUE (*bs)
    151151    if (bits)
    … …  
    161161
    162162void
    163 BIO_Random_Delta_Encode (unsigned long val, random_bitio_state * bs,
    164              unsigned long *bits)
     163BIO_Random_Delta_Encode (mg_u_long val, random_bitio_state * bs,
     164             mg_u_long *bits)
    165165{
    166166  ENCODE_CONTINUE (*bs)
    … …  
    173173
    174174
    175 unsigned long
     175mg_u_long
    176176BIO_Random_Delta_Decode (random_bitio_state * bs,
    177              unsigned long *bits)
    178 {
    179   register unsigned long val;
     177             mg_u_long *bits)
     178{
     179  register mg_u_long val;
    180180  DECODE_CONTINUE (*bs)
    181181    if (bits)
    … …  
    188188
    189189void
    190 BIO_Random_Elias_Encode (unsigned long val, unsigned long b, double s,
    191              random_bitio_state * bs, unsigned long *bits)
     190BIO_Random_Elias_Encode (mg_u_long val, mg_u_long b, double s,
     191             random_bitio_state * bs, mg_u_long *bits)
    192192{
    193193  ENCODE_CONTINUE (*bs)
    … …  
    200200
    201201
    202 unsigned long
    203 BIO_Random_Elias_Decode (unsigned long b, double s,
     202mg_u_long
     203BIO_Random_Elias_Decode (mg_u_long b, double s,
    204204             random_bitio_state * bs,
    205              unsigned long *bits)
    206 {
    207   register unsigned long val;
     205             mg_u_long *bits)
     206{
     207  register mg_u_long val;
    208208  DECODE_CONTINUE (*bs)
    209209    if (bits)
    … …  
    216216
    217217void
    218 BIO_Random_Bblock_Encode (unsigned long val, unsigned long b,
    219               random_bitio_state * bs, unsigned long *bits)
     218BIO_Random_Bblock_Encode (mg_u_long val, mg_u_long b,
     219              random_bitio_state * bs, mg_u_long *bits)
    220220{
    221221  ENCODE_CONTINUE (*bs)
    … …  
    228228
    229229
    230 unsigned long
    231 BIO_Random_Bblock_Decode (unsigned long b,
     230mg_u_long
     231BIO_Random_Bblock_Decode (mg_u_long b,
    232232              random_bitio_state * bs,
    233               unsigned long *bits)
    234 {
    235   register unsigned long val;
     233              mg_u_long *bits)
     234{
     235  register mg_u_long val;
    236236  DECODE_CONTINUE (*bs)
    237237    if (bits)
    … …  
    244244
    245245void
    246 BIO_Random_Seek (unsigned long pos, random_bitio_state * bs)
     246BIO_Random_Seek (mg_u_long pos, random_bitio_state * bs)
    247247{
    248248  ENCODE_CONTINUE (*bs)
    … …  
    258258}
    259259
    260 unsigned long
     260mg_u_long
    261261BIO_Random_Tell (random_bitio_state * bs)
    262262{
    263   register unsigned long t;
     263  register mg_u_long t;
    264264  ENCODE_CONTINUE (*bs)
    265265    t = ENCODE_TELL;
    … …  
    278278    ((((pos)+7) >> 3) < (mg_ullong)(__base + __len)))
    279279      {
    280     __pos = (long)((pos) - (mg_ullong)(__base << 3));
     280    __pos = (mg_s_long)((pos) - (mg_ullong)(__base << 3));
    281281      }
    282282    else
    283283      {
    284284        ENCODE_FLUSH;
    285     __base = (long)(((pos) >> (__sft+3)) << __sft);
     285    __base = (mg_s_long)(((pos) >> (__sft+3)) << __sft);
    286286   
    287287    fseek(__file,__base,0);
    288288    fread(__buf,1,__len,__file);
    289     __pos = (long)((pos) & ((8 << __sft)-1));
     289    __pos = (mg_s_long)((pos) & ((8 << __sft)-1));
    290290      }
    291291 

  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_random.h

    r16583 r25147  
    4343    FILE *File;
    4444    unsigned char *Buf;
    45     unsigned long Base;
    46     unsigned long Used;
    47     unsigned long pos;
    48     unsigned long len;
    49     unsigned long sft;
     45    mg_u_long Base;
     46    mg_u_long Used;
     47    mg_u_long pos;
     48    mg_u_long len;
     49    mg_u_long sft;
    5050  }
    5151random_bitio_state;
    … …  
    5555
    5656
    57 void BIO_Random_Start (FILE * f, unsigned long len,
     57void BIO_Random_Start (FILE * f, mg_u_long len,
    5858               random_bitio_state * bs);
    5959void BIO_Random_Done (random_bitio_state * bs);
    … …  
    6161
    6262
    63 void BIO_Random_Decode_Start (void *buf, unsigned long pos,
     63void BIO_Random_Decode_Start (void *buf, mg_u_long pos,
    6464                  random_bitio_state * bs);
    6565
    … …  
    6969
    7070
    71 void BIO_Random_Unary_Encode (unsigned long val, random_bitio_state * bs,
    72                   unsigned long *bits);
    73 unsigned long BIO_Random_Unary_Decode (random_bitio_state * bs,
    74                        unsigned long *bits);
     71void BIO_Random_Unary_Encode (mg_u_long val, random_bitio_state * bs,
     72                  mg_u_long *bits);
     73mg_u_long BIO_Random_Unary_Decode (random_bitio_state * bs,
     74                       mg_u_long *bits);
    7575
    7676
    7777
    78 void BIO_Random_Binary_Encode (unsigned long val, unsigned long b,
    79                    random_bitio_state * bs, unsigned long *bits);
    80 unsigned long BIO_Random_Binary_Decode (unsigned long b, random_bitio_state * bs,
    81                     unsigned long *bits);
     78void BIO_Random_Binary_Encode (mg_u_long val, mg_u_long b,
     79                   random_bitio_state * bs, mg_u_long *bits);
     80mg_u_long BIO_Random_Binary_Decode (mg_u_long b, random_bitio_state * bs,
     81                    mg_u_long *bits);
    8282
    8383
    8484
    85 void BIO_Random_Gamma_Encode (unsigned long val, random_bitio_state * bs,
    86                   unsigned long *bits);
    87 unsigned long BIO_Random_Gamma_Decode (random_bitio_state * bs,
    88                        unsigned long *bits);
     85void BIO_Random_Gamma_Encode (mg_u_long val, random_bitio_state * bs,
     86                  mg_u_long *bits);
     87mg_u_long BIO_Random_Gamma_Decode (random_bitio_state * bs,
     88                       mg_u_long *bits);
    8989
    9090
    9191
    92 void BIO_Random_Delta_Encode (unsigned long val, random_bitio_state * bs,
    93                   unsigned long *bits);
    94 unsigned long BIO_Random_Delta_Decode (random_bitio_state * bs,
    95                        unsigned long *bits);
     92void BIO_Random_Delta_Encode (mg_u_long val, random_bitio_state * bs,
     93                  mg_u_long *bits);
     94mg_u_long BIO_Random_Delta_Decode (random_bitio_state * bs,
     95                       mg_u_long *bits);
    9696
    9797
    98 void BIO_Random_Elias_Encode (unsigned long val, unsigned long b, double s,
    99                   random_bitio_state * bs, unsigned long *bits);
    100 unsigned long BIO_Random_Elias_Decode (unsigned long b, double s,
     98void BIO_Random_Elias_Encode (mg_u_long val, mg_u_long b, double s,
     99                  random_bitio_state * bs, mg_u_long *bits);
     100mg_u_long BIO_Random_Elias_Decode (mg_u_long b, double s,
    101101                       random_bitio_state * bs,
    102                        unsigned long *bits);
     102                       mg_u_long *bits);
    103103
    104104
    105 void BIO_Random_Bblock_Encode (unsigned long val, unsigned long b,
    106                    random_bitio_state * bs, unsigned long *bits);
    107 unsigned long BIO_Random_Bblock_Decode (unsigned long b,
     105void BIO_Random_Bblock_Encode (mg_u_long val, mg_u_long b,
     106                   random_bitio_state * bs, mg_u_long *bits);
     107mg_u_long BIO_Random_Bblock_Decode (mg_u_long b,
    108108                    random_bitio_state * bs,
    109                     unsigned long *bits);
     109                    mg_u_long *bits);
    110110
    111111
    112 void BIO_Random_Seek (unsigned long pos, random_bitio_state * bs);
     112void BIO_Random_Seek (mg_u_long pos, random_bitio_state * bs);
    113113
    114114void BIO_Random_Flush (random_bitio_state * bs);
    115115
    116 unsigned long BIO_Random_Tell (random_bitio_state * bs);
     116mg_u_long BIO_Random_Tell (random_bitio_state * bs);
    117117
    118118#ifdef USE_LONG_LONG

  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_stdio.c

    r16583 r25147  
    7272
    7373void
    74 BIO_Stdio_Unary_Encode (unsigned long val, stdio_bitio_state * bs,
    75             unsigned long *bits)
     74BIO_Stdio_Unary_Encode (mg_u_long val, stdio_bitio_state * bs,
     75            mg_u_long *bits)
    7676{
    7777  ENCODE_CONTINUE (*bs)
    … …  
    8484
    8585
    86 unsigned long
     86mg_u_long
    8787BIO_Stdio_Unary_Decode (stdio_bitio_state * bs,
    88             unsigned long *bits)
    89 {
    90   register unsigned long val;
     88            mg_u_long *bits)
     89{
     90  register mg_u_long val;
    9191  DECODE_CONTINUE (*bs)
    9292    if (bits)
    … …  
    105105
    106106void
    107 BIO_Stdio_Binary_Encode (unsigned long val, unsigned long b,
    108              stdio_bitio_state * bs, unsigned long *bits)
     107BIO_Stdio_Binary_Encode (mg_u_long val, mg_u_long b,
     108             stdio_bitio_state * bs, mg_u_long *bits)
    109109{
    110110  ENCODE_CONTINUE (*bs)
    … …  
    117117
    118118
    119 unsigned long
    120 BIO_Stdio_Binary_Decode (unsigned long b, stdio_bitio_state * bs,
    121              unsigned long *bits)
    122 {
    123   register unsigned long val;
     119mg_u_long
     120BIO_Stdio_Binary_Decode (mg_u_long b, stdio_bitio_state * bs,
     121             mg_u_long *bits)
     122{
     123  register mg_u_long val;
    124124  DECODE_CONTINUE (*bs)
    125125    if (bits)
    … …  
    138138
    139139void
    140 BIO_Stdio_Gamma_Encode (unsigned long val, stdio_bitio_state * bs,
    141             unsigned long *bits)
     140BIO_Stdio_Gamma_Encode (mg_u_long val, stdio_bitio_state * bs,
     141            mg_u_long *bits)
    142142{
    143143  ENCODE_CONTINUE (*bs)
    … …  
    150150
    151151
    152 unsigned long
     152mg_u_long
    153153BIO_Stdio_Gamma_Decode (stdio_bitio_state * bs,
    154             unsigned long *bits)
    155 {
    156   register unsigned long val;
     154            mg_u_long *bits)
     155{
     156  register mg_u_long val;
    157157  DECODE_CONTINUE (*bs)
    158158    if (bits)
    … …  
    168168
    169169void
    170 BIO_Stdio_Delta_Encode (unsigned long val, stdio_bitio_state * bs,
    171             unsigned long *bits)
     170BIO_Stdio_Delta_Encode (mg_u_long val, stdio_bitio_state * bs,
     171            mg_u_long *bits)
    172172{
    173173  ENCODE_CONTINUE (*bs)
    … …  
    180180
    181181
    182 unsigned long
     182mg_u_long
    183183BIO_Stdio_Delta_Decode (stdio_bitio_state * bs,
    184             unsigned long *bits)
    185 {
    186   register unsigned long val;
     184            mg_u_long *bits)
     185{
     186  register mg_u_long val;
    187187  DECODE_CONTINUE (*bs)
    188188    if (bits)
    … …  
    198198
    199199void
    200 BIO_Stdio_Elias_Encode (unsigned long val, unsigned long b, double s,
    201             stdio_bitio_state * bs, unsigned long *bits)
     200BIO_Stdio_Elias_Encode (mg_u_long val, mg_u_long b, double s,
     201            stdio_bitio_state * bs, mg_u_long *bits)
    202202{
    203203  ENCODE_CONTINUE (*bs)
    … …  
    210210
    211211
    212 unsigned long
    213 BIO_Stdio_Elias_Decode (unsigned long b, double s,
     212mg_u_long
     213BIO_Stdio_Elias_Decode (mg_u_long b, double s,
    214214            stdio_bitio_state * bs,
    215             unsigned long *bits)
    216 {
    217   register unsigned long val;
     215            mg_u_long *bits)
     216{
     217  register mg_u_long val;
    218218  DECODE_CONTINUE (*bs)
    219219    if (bits)
    … …  
    228228
    229229void
    230 BIO_Stdio_Bblock_Encode (unsigned long val, unsigned long b,
    231              stdio_bitio_state * bs, unsigned long *bits)
     230BIO_Stdio_Bblock_Encode (mg_u_long val, mg_u_long b,
     231             stdio_bitio_state * bs, mg_u_long *bits)
    232232{
    233233  ENCODE_CONTINUE (*bs)
    … …  
    240240
    241241
    242 unsigned long
    243 BIO_Stdio_Bblock_Decode (unsigned long b, stdio_bitio_state * bs,
    244              unsigned long *bits)
    245 {
    246   register unsigned long val;
     242mg_u_long
     243BIO_Stdio_Bblock_Decode (mg_u_long b, stdio_bitio_state * bs,
     244             mg_u_long *bits)
     245{
     246  register mg_u_long val;
    247247  DECODE_CONTINUE (*bs)
    248248    if (bits)
    … …  
    255255
    256256void
    257 BIO_Stdio_Decode_Seek (unsigned long pos, stdio_bitio_state * bs)
     257BIO_Stdio_Decode_Seek (mg_u_long pos, stdio_bitio_state * bs)
    258258{
    259259  DECODE_CONTINUE (*bs)

  • main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_stdio.h

    r16583 r25147  
    5959
    6060
    61 void BIO_Stdio_Unary_Encode (unsigned long val, stdio_bitio_state * bs,
    62                  unsigned long *bits);
    63 unsigned long BIO_Stdio_Unary_Decode (stdio_bitio_state * bs,
    64                       unsigned long *bits);
     61void BIO_Stdio_Unary_Encode (mg_u_long val, stdio_bitio_state * bs,
     62                 mg_u_long *bits);
     63mg_u_long BIO_Stdio_Unary_Decode (stdio_bitio_state * bs,
     64                      mg_u_long *bits);
    6565
    6666
    6767
    68 void BIO_Stdio_Binary_Encode (unsigned long val, unsigned long b,
    69                   stdio_bitio_state * bs, unsigned long *bits);
    70 unsigned long BIO_Stdio_Binary_Decode (unsigned long b, stdio_bitio_state * bs,
    71                        unsigned long *bits);
     68void BIO_Stdio_Binary_Encode (mg_u_long val, mg_u_long b,
     69                  stdio_bitio_state * bs, mg_u_long *bits);
     70mg_u_long BIO_Stdio_Binary_Decode (mg_u_long b, stdio_bitio_state * bs,
     71                       mg_u_long *bits);
    7272
    7373
    7474
    75 void BIO_Stdio_Gamma_Encode (unsigned long val, stdio_bitio_state * bs,
    76                  unsigned long *bits);
    77 unsigned long BIO_Stdio_Gamma_Decode (stdio_bitio_state * bs,
    78                       unsigned long *bits);
     75void BIO_Stdio_Gamma_Encode (mg_u_long val, stdio_bitio_state * bs,
     76                 mg_u_long *bits);
     77mg_u_long BIO_Stdio_Gamma_Decode (stdio_bitio_state * bs,
     78                      mg_u_long *bits);
    7979
    8080
    8181
    82 void BIO_Stdio_Delta_Encode (unsigned long val, stdio_bitio_state * bs,
    83                  unsigned long *bits);
    84 unsigned long BIO_Stdio_Delta_Decode (stdio_bitio_state * bs,
    85                       unsigned long *bits);
     82void BIO_Stdio_Delta_Encode (mg_u_long val, stdio_bitio_state * bs,
     83                 mg_u_long *bits);
     84mg_u_long BIO_Stdio_Delta_Decode (stdio_bitio_state * bs,
     85                      mg_u_long *bits);
    8686
    8787
    8888
    89 void BIO_Stdio_Elias_Encode (unsigned long val, unsigned long b, double s,
    90                  stdio_bitio_state * bs, unsigned long *bits);
    91 unsigned long BIO_Stdio_Elias_Decode (unsigned long b, double s,
     89void BIO_Stdio_Elias_Encode (mg_u_long val, mg_u_long b, double s,
     90                 stdio_bitio_state * bs, mg_u_long *bits);
     91mg_u_long BIO_Stdio_Elias_Decode (mg_u_long b, double s,
    9292                      stdio_bitio_state * bs,
    93                       unsigned long *bits);
     93                      mg_u_long *bits);
    9494
    9595
    96 void BIO_Stdio_Bblock_Encode (unsigned long val, unsigned long b,
    97                   stdio_bitio_state * bs, unsigned long *bits);
    98 unsigned long BIO_Stdio_Bblock_Decode (unsigned long b, stdio_bitio_state * bs,
    99                        unsigned long *bits);
     96void BIO_Stdio_Bblock_Encode (mg_u_long val, mg_u_long b,
     97                  stdio_bitio_state * bs, mg_u_long *bits);
     98mg_u_long BIO_Stdio_Bblock_Decode (mg_u_long b, stdio_bitio_state * bs,
     99                       mg_u_long *bits);
    100100
    101101
    102 void BIO_Stdio_Decode_Seek (unsigned long pos, stdio_bitio_state * bs);
     102void BIO_Stdio_Decode_Seek (mg_u_long pos, stdio_bitio_state * bs);
    103103
    104104#endif

  • main/trunk/greenstone2/common-src/indexers/mg/lib/filestats.c

    r16583 r25147  
    2828
    2929File *
    30 Fopen (char *name, char *mode, unsigned long magic)
     30Fopen (char *name, char *mode, mg_u_long magic)
    3131{
    3232  FILE *f;
    3333  File *F;
    34   unsigned long m;
     34  mg_u_long m;
    3535  if (!(f = fopen (name, mode)))
    3636    return (NULL);
    … …  
    9090
    9191int
    92 Fseek (File * F, long offset, int ptrname)
     92Fseek (File * F, mg_s_long offset, int ptrname)
    9393{
    9494  int num;

  • main/trunk/greenstone2/common-src/indexers/mg/lib/filestats.h

    r16583 r25147  
    2323#define H_FILESTATS
    2424
     25#include "mglong.h"
    2526
    2627typedef struct FileStats
    2728  {
    28     unsigned long NumSeeks;
    29     unsigned long NumReads;
    30     unsigned long NumBytes;
     29    mg_u_long NumSeeks;
     30    mg_u_long NumReads;
     31    mg_u_long NumBytes;
    3132  }
    3233FileStats;
    … …  
    4546
    4647/* if magic is 0 no magic number is read or written */
    47 File *Fopen (char *name, char *mode, unsigned long magic);
     48File *Fopen (char *name, char *mode, mg_u_long magic);
    4849
    4950size_t Fread (void *ptr, size_t size, size_t nitems, File * F);
    5051
    51 int Fseek (File * F, long offset, int ptrname);
     52int Fseek (File * F, mg_s_long offset, int ptrname);
    5253
    5354void Rewind (File * F);

  • main/trunk/greenstone2/common-src/indexers/mg/lib/gmalloc.c

    r16583 r25147  
    401401{
    402402  __ptr_t result;
    403   unsigned long int adj;
     403  mg_u_long adj;
    404404
    405405  result = (*__morecore) (size);
    406   adj = (unsigned long int) ((unsigned long int) ((char *) result -
     406  adj = (mg_u_long) ((mg_u_long) ((char *) result -
    407407                          (char *) NULL)) % BLOCKSIZE;
    408408  if (adj != 0)
    … …  
    549549      block = BLOCK (result);
    550550      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)
    553553           % BLOCKSIZE) >> log;
    554554
    … …  
    872872      prev = (struct list *) ptr;
    873873      _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)
    876876         % BLOCKSIZE >> type);
    877877      prev->next = _fraghead[type].next;
    … …  
    12841284{
    12851285  __ptr_t result;
    1286   unsigned long int adj;
     1286  mg_u_long int adj;
    12871287
    12881288  size = ((size + alignment - 1) / alignment) * alignment;
    … …  
    12911291  if (result == NULL)
    12921292    return NULL;
    1293   adj = (unsigned long int) ((unsigned long int) ((char *) result -
     1293  adj = (mg_u_long) ((mg_u_long) ((char *) result -
    12941294                          (char *) NULL)) % alignment;
    12951295  if (adj != 0)

  • main/trunk/greenstone2/common-src/indexers/mg/lib/huffman.c

    r16583 r25147  
    3030 */
    3131huff_data *
    32 Generate_Huffman_Data (int num, long *freqs, huff_data * data,
    33                u_long * mem)
     32Generate_Huffman_Data (int num, mg_s_long *freqs, huff_data * data,
     33               mg_u_long * mem)
    3434{
    3535  int HNum, i, count;
    36   unsigned long *heap;
     36  mg_u_long *heap;
    3737  huff_data *hd = data;
    3838  if (!hd)
    … …  
    7373      if (heap[heap[curr - 1]] > heap[heap[child - 1]])
    7474        {
    75           register u_long temp;
     75          register mg_u_long temp;
    7676          temp = heap[child - 1];
    7777          heap[child - 1] = heap[curr - 1];
    … …  
    141141
    142142  /* Calculate the code lens */
    143   heap[0] = -1UL;
     143  heap[0] = -1;
    144144  heap[1] = 0;
    145145  for (i = 2; i < num * 2; i++)
    … …  
    154154  for (i = 0; i < num; i++)
    155155    {
    156       register u_long codelen = heap[i + num];
     156      register mg_u_long codelen = heap[i + num];
    157157      hd->clens[i] = (char) codelen;
    158158      if (!codelen)
    … …  
    190190}
    191191
    192 unsigned long *
    193 Generate_Huffman_Codes (huff_data * data, u_long * mem)
     192mg_u_long *
     193Generate_Huffman_Codes (huff_data * data, mg_u_long * mem)
    194194{
    195195  int i;
    196   unsigned long *codes;
    197   unsigned long mc[MAX_HUFFCODE_LEN + 1];
     196  mg_u_long *codes;
     197  mg_u_long mc[MAX_HUFFCODE_LEN + 1];
    198198
    199199  if (!data)
    … …  
    212212
    213213
    214 unsigned long **
    215 Generate_Huffman_Vals (huff_data * data, u_long * mem)
     214mg_u_long **
     215Generate_Huffman_Vals (huff_data * data, mg_u_long * mem)
    216216{
    217217  int i;
    218   unsigned long *fcode[MAX_HUFFCODE_LEN + 1];
    219   unsigned long **values;
    220   unsigned long *vals;
     218  mg_u_long *fcode[MAX_HUFFCODE_LEN + 1];
     219  mg_u_long **values;
     220  mg_u_long *vals;
    221221
    222222  if (!data)
    … …  
    224224  if (!(vals = Xmalloc (data->num_codes * sizeof (*vals))))
    225225    return (NULL);
    226   if (!(values = Xmalloc ((MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *))))
     226  if (!(values = Xmalloc ((MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *))))
    227227    {
    228228      free (vals);
    … …  
    230230    }
    231231
    232   bzero ((char *) values, (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *));
     232  bzero ((char *) values, (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *));
    233233
    234234  if (mem)
    235235    *mem += data->num_codes * sizeof (*vals) +
    236       (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *);
     236      (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *);
    237237
    238238  fcode[0] = values[0] = &vals[0];
    … …  
    249249
    250250double
    251 Calculate_Huffman_Size (int num, long *freqs, long *counts)
     251Calculate_Huffman_Size (int num, mg_s_long *freqs, mg_s_long *counts)
    252252{
    253253  double size = 0;
    … …  
    321321static int
    322322General_Read_Huffman_Data (size_t (*rd) (), void *f,
    323                huff_data * hd, u_long * mem, u_long * disk)
     323               huff_data * hd, mg_u_long * mem, mg_u_long * disk)
    324324{
    325325  if (rd (&hd->num_codes, sizeof (hd->num_codes), 1, f) != 1)
    … …  
    392392
    393393int
    394 Read_Huffman_Data (FILE * f, huff_data * hd, u_long * mem, u_long * disk)
     394Read_Huffman_Data (FILE * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk)
    395395{
    396396  return General_Read_Huffman_Data (fread, f, hd, mem, disk);
    … …  
    401401
    402402int
    403 F_Read_Huffman_Data (File * f, huff_data * hd, u_long * mem, u_long * disk)
     403F_Read_Huffman_Data (File * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk)
    404404{
    405405  return General_Read_Huffman_Data (Fread, f, hd, mem, disk);

  • main/trunk/greenstone2/common-src/indexers/mg/lib/huffman.h

    r16583 r25147  
    3737    int maxcodelen;
    3838    int lencount[MAX_HUFFCODE_LEN + 1];
    39     unsigned long min_code[MAX_HUFFCODE_LEN + 1];
     39    mg_u_long min_code[MAX_HUFFCODE_LEN + 1];
    4040    char *clens;
    4141  }
    … …  
    4343
    4444
    45 huff_data *Generate_Huffman_Data (int num, long *freqs, huff_data * data,
    46                   u_long * mem);
     45huff_data *Generate_Huffman_Data (int num, mg_s_long *freqs, huff_data * data,
     46                  mg_u_long * mem);
    4747
    48 unsigned long *Generate_Huffman_Codes (huff_data * data, u_long * mem);
     48mg_u_long *Generate_Huffman_Codes (huff_data * data, mg_u_long * mem);
    4949
    50 unsigned long **Generate_Huffman_Vals (huff_data * data, u_long * mem);
     50mg_u_long **Generate_Huffman_Vals (huff_data * data, mg_u_long * mem);
    5151
    5252int Write_Huffman_Data (FILE * f, huff_data * hd);
    5353
    54 int Read_Huffman_Data (FILE * f, huff_data * hd, u_long * mem, u_long * disk);
     54int Read_Huffman_Data (FILE * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk);
    5555
    56 int F_Read_Huffman_Data (File * f, huff_data * hd, u_long * mem, u_long * disk);
     56int F_Read_Huffman_Data (File * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk);
    5757
    5858/* Calculate the number of bits required to code the data with the
    5959   specified frequencies. Normally freqs and counts should point to
    6060   the same array. */
    61 double Calculate_Huffman_Size (int num, long *freqs, long *counts);
     61double Calculate_Huffman_Size (int num, mg_s_long *freqs, mg_s_long *counts);
    6262
    6363
    … …  
    6767    register int __i;                           \
    6868    register int __clen = (lens)[x];                    \
    69     register unsigned long __code = (codes)[x];             \
     69    register mg_u_long __code = (codes)[x];             \
    7070    for (__i=__clen-1; __i>=0; --__i)                   \
    7171      ENCODE_BIT((__code >> __i) & 1);                  \
    … …  
    8181#define HUFF_DECODE(x, mcodes, values)                  \
    8282  do {                                  \
    83     register unsigned long *__min_code = (mcodes);          \
    84     register unsigned long *__mclen = __min_code;           \
    85     register unsigned long **__values = (values);           \
    86     register unsigned long __code = 0;                  \
     83    register mg_u_long *__min_code = (mcodes);          \
     84    register mg_u_long *__mclen = __min_code;           \
     85    register mg_u_long **__values = (values);           \
     86    register mg_u_long __code = 0;                  \
    8787    do                                  \
    8888      {                                 \
    … …  
    9696#define HUFF_DECODE_L(x, mcodes, values, count)             \
    9797  do {                                  \
    98     register unsigned long *__min_code = (mcodes);          \
    99     register unsigned long *__mclen = __min_code;           \
    100     register unsigned long **__values = (values);           \
    101     register unsigned long __code = 0;                  \
     98    register mg_u_long *__min_code = (mcodes);          \
     99    register mg_u_long *__mclen = __min_code;           \
     100    register mg_u_long **__values = (values);           \
     101    register mg_u_long __code = 0;                  \
    102102    do                                  \
    103103      {                                 \

  • main/trunk/greenstone2/common-src/indexers/mg/lib/huffman_mem.c

    r16583 r25147  
    3030
    3131void
    32 BIO_Mem_Huff_Encode (unsigned long val, unsigned long *codes,
     32BIO_Mem_Huff_Encode (mg_u_long val, mg_u_long *codes,
    3333             char *clens, mem_bitio_state * bs)
    3434{
    … …  
    3838}
    3939
    40 unsigned long
    41 BIO_Mem_Huff_Decode (unsigned long *mincodes,
    42              unsigned long **values, mem_bitio_state * bs)
     40mg_u_long
     41BIO_Mem_Huff_Decode (mg_u_long *mincodes,
     42             mg_u_long **values, mem_bitio_state * bs)
    4343{
    44   unsigned long val;
     44  mg_u_long val;
    4545  DECODE_CONTINUE (*bs)
    4646    HUFF_DECODE (val, mincodes, values);

  • main/trunk/greenstone2/common-src/indexers/mg/lib/huffman_mem.h

    r16583 r25147  
    2525
    2626
    27 void BIO_Mem_Huff_Encode (unsigned long val, unsigned long *codes,
     27void BIO_Mem_Huff_Encode (mg_u_long val, mg_u_long *codes,
    2828              char *clens, mem_bitio_state * bs);
    2929
    30 unsigned long BIO_Mem_Huff_Decode (unsigned long *mincodes,
    31                   unsigned long **values, mem_bitio_state * bs);
     30mg_u_long BIO_Mem_Huff_Decode (mg_u_long *mincodes,
     31                  mg_u_long **values, mem_bitio_state * bs);
    3232
    3333

  • main/trunk/greenstone2/common-src/indexers/mg/lib/huffman_stdio.c

    r16583 r25147  
    3333
    3434void
    35 BIO_Stdio_Huff_Encode (unsigned long val, unsigned long *codes,
     35BIO_Stdio_Huff_Encode (mg_u_long val, mg_u_long *codes,
    3636               char *clens, stdio_bitio_state * bs)
    3737{
    … …  
    4141}
    4242
    43 unsigned long
    44 BIO_Stdio_Huff_Decode (unsigned long *mincodes,
    45                unsigned long **values,
     43mg_u_long
     44BIO_Stdio_Huff_Decode (mg_u_long *mincodes,
     45               mg_u_long **values,
    4646               stdio_bitio_state * bs)
    4747{
    48   unsigned long val;
     48  mg_u_long val;
    4949  DECODE_CONTINUE (*bs)
    5050    HUFF_DECODE (val, mincodes, values);

  • main/trunk/greenstone2/common-src/indexers/mg/lib/huffman_stdio.h

    r16583 r25147  
    2525
    2626
    27 void BIO_Stdio_Huff_Encode (unsigned long val, unsigned long *codes,
     27void BIO_Stdio_Huff_Encode (mg_u_long val, mg_u_long *codes,
    2828                char *clens, stdio_bitio_state * bs);
    2929
    3030
    31 unsigned long BIO_Stdio_Huff_Decode (unsigned long *mincodes,
    32                      unsigned long **values,
     31mg_u_long BIO_Stdio_Huff_Decode (mg_u_long *mincodes,
     32                     mg_u_long **values,
    3333                     stdio_bitio_state * bs);
    3434

  • main/trunk/greenstone2/common-src/indexers/mg/lib/longlong.h

    r16583 r25147  
    2222#ifndef H_LONGLONG
    2323#define H_LONGLONG
     24
     25#include "mglong.h"
    2426
    2527#ifndef __WIN32__
    … …  
    7173
    7274/* Not using GCC, so fall back on plain "long" (32-bit) types */
    73 typedef unsigned long int mg_ullong;
    74 typedef long int mg_llong;
     75typedef uint32_t mg_ullong;
     76typedef int32_t mg_llong;
    7577
    76 #define ULL_FS "lu"
    77 #define LL_FS "ld"
     78#define ULL_FS "u"
     79#define LL_FS "d"
    7880
    7981#endif /* __GNUC__ */

  • main/trunk/greenstone2/common-src/indexers/mg/lib/messages.c

    r16583 r25147  
    2828
    2929
    30 void VOLATILE
     30void
    3131FatalError (int ExitCode, const char *fmt,...)
    3232{

  • main/trunk/greenstone2/common-src/indexers/mg/lib/messages.h

    r16583 r25147  
    3131extern char *msg_prefix;
    3232
    33 void VOLATILE FatalError (int ExitCode, const char *fmt,...);
     33void FatalError (int ExitCode, const char *fmt,...);
    3434
    3535void Message (const char *fmt,...);

  • main/trunk/greenstone2/common-src/indexers/mg/lib/netorder.h

    r22257 r25147  
    1717#define HTOND(d)                                                                                  \
    1818        do {                                                                                      \
    19              unsigned long tmph, tmpl;                                                            \
     19             mg_u_long tmph, tmpl;                                                            \
    2020         bcopy ((char *) &d, (char *) &tmph, sizeof(double) >> 1);                            \
    2121         bcopy ((char *) &d + (sizeof(double) >> 1), (char *) &tmpl, sizeof (double) >> 1);   \
    … …  
    2727#define NTOHD(d)                                                                                  \
    2828        do {                                                                                      \
    29              unsigned long tmph, tmpl;                                                            \
     29             mg_u_long tmph, tmpl;                                                            \
    3030         bcopy ((char *) &d, (char *) &tmph, sizeof(double) >> 1);                            \
    3131         bcopy ((char *) &d + (sizeof(double) >> 1), (char *) &tmpl, sizeof (double) >> 1);   \
    … …  
    3737#define HTOND2(hd, nd)                                                                            \
    3838        do {                                                                                      \
    39              unsigned long tmph, tmpl;                                                            \
     39             mg_u_long tmph, tmpl;                                                            \
    4040         bcopy ((char *) &hd, (char *) &tmph, sizeof(double) >> 1);                           \
    4141         bcopy ((char *) &hd + (sizeof(double) >> 1), (char *) &tmpl, sizeof (double) >> 1);  \
    … …  
    4747#define NTOHD2(nd, hd)                                                                            \
    4848        do {                                                                                      \
    49              unsigned long tmph, tmpl;                                                            \
     49             mg_u_long tmph, tmpl;                                                            \
    5050         bcopy ((char *) &nd, (char *) &tmph, sizeof(double) >> 1);                           \
    5151         bcopy ((char *) &nd + (sizeof(double) >> 1), (char *) &tmpl, sizeof (double) >> 1);  \
    … …  
    5959#define HTONF(f)                                                                   \
    6060        do {                                                                       \
    61              unsigned long tmp;                                                    \
     61             mg_u_long tmp;                                                    \
    6262             bcopy ((char *) &(f), (char *) &tmp, sizeof (float));                 \
    6363             HTONUL (tmp);                                                         \
    … …  
    6666#define NTOHF(f)                                                                   \
    6767        do {                                                                       \
    68              unsigned long tmp;                                                    \
     68             mg_u_long tmp;                                                    \
    6969             bcopy ((char *) &(f), (char *) &tmp, sizeof (float));                 \
    7070         NTOHUL (tmp);                                                         \
    … …  
    7373#define HTONF2(hf, nf)                                                             \
    7474        do {                                                                       \
    75              unsigned long tmp;                                                    \
     75             mg_u_long tmp;                                                    \
    7676             bcopy ((char *) &(hf), (char *) &tmp, sizeof (float));                \
    7777             HTONUL (tmp);                                                         \
    … …  
    8080#define NTOHF2(nf, hf)                                                             \
    8181        do {                                                                       \
    82              unsigned long tmp;                                                    \
     82             mg_u_long tmp;                                                    \
    8383             bcopy ((char *) &(nf), (char *) &tmp, sizeof (float));                \
    8484         NTOHUL (tmp);                                                         \
    … …  
    115115
    116116/* pointers */
    117 #define HTONP(p)          ((p) = (void *) htonl ((unsigned long) p))
    118 #define NTOHP(p)          ((p) = (void *) ntohl ((unsigned long) p))
    119 #define HTONP2(hp, np)    ((np) = (void *) htonl ((unsigned long) hp))
    120 #define NTOHP2(np, hp)    ((hp) = (void *) ntohl ((unsigned long) np))
     117#define HTONP(p)          ((p) = (void *) htonl ((mg_u_long) p))
     118#define NTOHP(p)          ((p) = (void *) ntohl ((mg_u_long) p))
     119#define HTONP2(hp, np)    ((np) = (void *) htonl ((mg_u_long) hp))
     120#define NTOHP2(np, hp)    ((hp) = (void *) ntohl ((mg_u_long) np))
    121121
    122122/* unsigned long */
    … …  
    127127
    128128/* signed long */
    129 #define HTONSL(l)         ((l) = (long) htonl ((unsigned long) (l)))
    130 #define NTOHSL(l)         ((l) = (long) ntohl ((unsigned long) (l)))
    131 #define HTONSL2(hl, nl)   ((nl) = (long) htonl ((unsigned long) (hl)))
    132 #define NTOHSL2(nl, hl)   ((hl) = (long) ntohl ((unsigned long) (nl)))
     129#define HTONSL(l)         ((l) = (mg_s_long) htonl ((mg_u_long) (l)))
     130#define NTOHSL(l)         ((l) = (mg_s_long) ntohl ((mg_u_long) (l)))
     131#define HTONSL2(hl, nl)   ((nl) = (mg_s_long) htonl ((mg_u_long) (hl)))
     132#define NTOHSL2(nl, hl)   ((hl) = (mg_s_long) ntohl ((mg_u_long) (nl)))
    133133
    134134/* unsigned int */
    135 #define HTONUI(i)         ((i) = (unsigned int) htonl ((unsigned long) (i)))
    136 #define NTOHUI(i)         ((i) = (unsigned int) ntohl ((unsigned long) (i)))
    137 #define HTONUI2(hi, ni)   ((ni) = (unsigned int) htonl ((unsigned long) (hi)))
    138 #define NTOHUI2(ni, hi)   ((hi) = (unsigned int) ntohl ((unsigned long) (ni)))
     135#define HTONUI(i)         ((i) = (unsigned int) htonl ((mg_u_long) (i)))
     136#define NTOHUI(i)         ((i) = (unsigned int) ntohl ((mg_u_long) (i)))
     137#define HTONUI2(hi, ni)   ((ni) = (unsigned int) htonl ((mg_u_long) (hi)))
     138#define NTOHUI2(ni, hi)   ((hi) = (unsigned int) ntohl ((mg_u_long) (ni)))
    139139
    140140/* signed int */
    141 #define HTONSI(i)         ((i) = (int) htonl ((unsigned long) (i)))
    142 #define NTOHSI(i)         ((i) = (int) ntohl ((unsigned long) (i)))
    143 #define HTONSI2(hi, ni)   ((ni) = (int) htonl ((unsigned long) (hi)))
    144 #define NTOHSI2(ni, hi)   ((hi) = (int) ntohl ((unsigned long) (ni)))
     141#define HTONSI(i)         ((i) = (int) htonl ((mg_u_long) (i)))
     142#define NTOHSI(i)         ((i) = (int) ntohl ((mg_u_long) (i)))
     143#define HTONSI2(hi, ni)   ((ni) = (int) htonl ((mg_u_long) (hi)))
     144#define NTOHSI2(ni, hi)   ((hi) = (int) ntohl ((mg_u_long) (ni)))
    145145
    146146/* unsigned short */

  • main/trunk/greenstone2/common-src/indexers/mg/lib/perf_hash.c

    r16583 r25147  
    4242
    4343/* Random Number stuff */
    44 static long seed[] = {0, 0};
     44static mg_s_long seed[] = {0, 0};
    4545#define RANDOM() irandm(seed)
    4646#define SEED_RANDOM(the_seed) do{ seed[0] = the_seed; }while(0)
    … …  
    105105
    106106#ifndef STRUCT
    107 static long **tb0, **tb1, **tb2;
     107static mg_s_long **tb0, **tb1, **tb2;
    108108#else
    109109struct tb_entry **tb;
    … …  
    128128{               /* deletes edge e from list of v */
    129129
    130   int b;
    131 
     130  int b, norm_b;
    132131  b = FIRST[v];
    133132  assert (norm (b) != 0);
    … …  
    700699    {
    701700      if (tb0)
    702     if (!(tb0[i] = Xmalloc (sizeof (long) * MAX_L)))
     701    if (!(tb0[i] = Xmalloc (sizeof (mg_s_long) * MAX_L)))
    703702        ok = 0;
    704703      if (tb1)
    705     if (!(tb1[i] = Xmalloc (sizeof (long) * MAX_L)))
     704    if (!(tb1[i] = Xmalloc (sizeof (mg_s_long) * MAX_L)))
    706705        ok = 0;
    707706      if (tb2)
    708     if (!(tb2[i] = Xmalloc (sizeof (long) * MAX_L)))
     707    if (!(tb2[i] = Xmalloc (sizeof (mg_s_long) * MAX_L)))
    709708        ok = 0;
    710709    }
    … …  
    744743
    745744  if (r <= 0)
    746     SEED_RANDOM ((long) time ((time_t *) NULL));
     745    SEED_RANDOM ((mg_s_long) time ((time_t *) NULL));
    747746  else
    748747    SEED_RANDOM (r);
    … …  
    907906    {
    908907      if (phd->tb0)
    909     if (!(phd->tb0[i] = Xmalloc (sizeof (long) * phd->MAX_L)))
     908    if (!(phd->tb0[i] = Xmalloc (sizeof (mg_s_long) * phd->MAX_L)))
    910909        ok = 0;
    911910      if (phd->tb1)
    912     if (!(phd->tb1[i] = Xmalloc (sizeof (long) * phd->MAX_L)))
     911    if (!(phd->tb1[i] = Xmalloc (sizeof (mg_s_long) * phd->MAX_L)))
    913912        ok = 0;
    914913      if (phd->tb2)
    915     if (!(phd->tb2[i] = Xmalloc (sizeof (long) * phd->MAX_L)))
     914    if (!(phd->tb2[i] = Xmalloc (sizeof (mg_s_long) * phd->MAX_L)))
    916915        ok = 0;
    917916    }
    … …  
    951950      int j;
    952951
    953       tot += fread ((char *) phd->tb0[i], sizeof (long), phd->MAX_L, f) *
     952      tot += fread ((char *) phd->tb0[i], sizeof (mg_s_long), phd->MAX_L, f) *
    954953        sizeof (int);
    955       tot += fread ((char *) phd->tb1[i], sizeof (long), phd->MAX_L, f) *
     954      tot += fread ((char *) phd->tb1[i], sizeof (mg_s_long), phd->MAX_L, f) *
    956955        sizeof (int);
    957       tot += fread ((char *) phd->tb2[i], sizeof (long), phd->MAX_L, f) *
     956      tot += fread ((char *) phd->tb2[i], sizeof (mg_s_long), phd->MAX_L, f) *
    958957        sizeof (int);
    959958

  • main/trunk/greenstone2/common-src/indexers/mg/lib/perf_hash.h

    r16583 r25147  
    2323#define H_PERF_HASH
    2424
    25 
    26 
     25#include "mglong.h"
    2726
    2827struct tb_entry
    2928  {
    30     long tb0, tb1, tb2;
     29    mg_s_long tb0, tb1, tb2;
    3130  };
    3231

  • main/trunk/greenstone2/common-src/indexers/mg/lib/random.c

    r16583 r25147  
    3333 *  The table mt[0:127] is defined by mt[i] = 69069 ** (128-i)
    3434 */
    35 
    36 #define MASK ((long) 593970775)
     35#include "random.h"
     36
     37#define MASK ((mg_s_long) 593970775)
    3738/*  or in hex, 23674657 */
    3839
    … …  
    4041/*  i.e. 2 to power -31 */
    4142
    42 static long mt [128] =   {
     43static mg_s_long mt [128] =   {
    4344      902906369,
    4445     2030498053,
    … …  
    172173
    173174double
    174 random (long is [2])
     175random (mg_s_long is [2])
    175176{
    176     long it, leh, nit;
     177    mg_s_long it, leh, nit;
    177178
    178179    it = is [0];
    … …  
    187188    is [0] = it;    is [1] = leh;
    188189    if (leh < 0) leh = ~leh;
    189     return (SCALE * ((long) (leh | 1)));
     190    return (SCALE * ((mg_s_long) (leh | 1)));
    190191}
    191192
    192193
    193194
    194 long
    195 irandm (long is [2])
     195mg_s_long
     196irandm (mg_s_long is [2])
    196197{
    197     long it, leh, nit;
     198    mg_s_long it, leh, nit;
    198199
    199200    it = is [0];

  • main/trunk/greenstone2/common-src/indexers/mg/lib/random.h

    r16583 r25147  
    3636 *  The table mt[0:127] is defined by mt[i] = 69069 ** (128-i)
    3737 */
     38#include "mglong.h"
    3839
    39 double random (long is [2]);
    40 long irandm (long is [2]);
     40double random (mg_s_long is [2]);
     41mg_s_long irandm (mg_s_long is [2]);
    4142
    4243#endif

  • main/trunk/greenstone2/common-src/indexers/mg/lib/regex.c

    r16583 r25147  
    28962896  register char *fastmap = bufp->fastmap;
    28972897  unsigned char *pattern = bufp->buffer;
    2898   unsigned long size = bufp->used;
     2898  mg_u_long size = bufp->used;
    28992899  unsigned char *p = pattern;
    29002900  register unsigned char *pend = pattern + size;

  • main/trunk/greenstone2/common-src/indexers/mg/lib/regex.h

    r16583 r25147  
    292292
    293293    /* Number of bytes to which `buffer' points.  */
    294   unsigned long allocated;
     294  mg_u_long allocated;
    295295
    296296    /* Number of bytes actually used in `buffer'.  */
    297   unsigned long used;   
     297  mg_u_long used;   
    298298
    299299        /* Syntax setting with which the pattern was compiled.  */

  • main/trunk/greenstone2/common-src/indexers/mg/lib/rx.c

    r16583 r25147  
    615615
    616616#ifdef __STDC__
    617 RX_DECL unsigned long
     617RX_DECL mg_u_long
    618618rx_bitset_hash (int size, rx_Bitset b)
    619619#else
    620 RX_DECL unsigned long
     620RX_DECL mg_u_long
    621621rx_bitset_hash (size, b)
    622622     int size;
    … …  
    625625{
    626626  int x;
    627   unsigned long hash = (unsigned long)rx_bitset_hash;
     627  uintptr_t hash = (uintptr_t)rx_bitset_hash;
    628628
    629629  for (x = rx_bitset_numb_subsets(size) - 1; x >= 0; --x)
    … …  
    701701
    702702
    703 static unsigned long rx_hash_masks[4] =
     703static mg_u_long rx_hash_masks[4] =
    704704{
    705705  0x12488421,
    … …  
    714714RX_DECL struct rx_hash_item *
    715715rx_hash_find (struct rx_hash * table,
    716           unsigned long hash,
     716          mg_u_long hash,
    717717          void * value,
    718718          struct rx_hash_rules * rules)
    … …  
    721721rx_hash_find (table, hash, value, rules)
    722722     struct rx_hash * table;
    723      unsigned long hash;
     723     mg_u_long hash;
    724724     void * value;
    725725     struct rx_hash_rules * rules;
    … …  
    728728  rx_hash_eq eq = rules->eq;
    729729  int maskc = 0;
    730   long mask = rx_hash_masks [0];
     730  mg_s_long mask = rx_hash_masks [0];
    731731  int bucket = (hash & mask) % 13;
    732732
    … …  
    755755RX_DECL struct rx_hash_item *
    756756rx_hash_store (struct rx_hash * table,
    757            unsigned long hash,
     757           mg_u_long hash,
    758758           void * value,
    759759           struct rx_hash_rules * rules)
    … …  
    762762rx_hash_store (table, hash, value, rules)
    763763     struct rx_hash * table;
    764      unsigned long hash;
     764     mg_u_long hash;
    765765     void * value;
    766766     struct rx_hash_rules * rules;
    … …  
    769769  rx_hash_eq eq = rules->eq;
    770770  int maskc = 0;
    771   long mask = rx_hash_masks[0];
     771  mg_s_long mask = rx_hash_masks[0];
    772772  int bucket = (hash & mask) % 13;
    773773  int depth = 0;
    … …  
    803803    {
    804804      struct rx_hash_item * them = table->buckets[bucket];
    805       unsigned long newmask = rx_hash_masks[maskc + 1];
     805      mg_u_long newmask = rx_hash_masks[maskc + 1];
    806806      while (them)
    807807        {
    … …  
    855855    {
    856856      struct rx_hash * table = it->table;
    857       unsigned long hash = it->hash;
     857      mg_u_long hash = it->hash;
    858858      int depth = (table->parent
    859859           ? (table->parent->parent
    … …  
    17751775         : (!vb
    17761776        ? 1
    1777         : ((long)a->car < (long)b->car
     1777        : ((intptr_t)a->car < (intptr_t)b->car
    17781778           ? 1
    1779            : ((long)a->car > (long)b->car
     1779           : ((intptr_t)a->car > (intptr_t)b->car
    17801780              ? -1
    17811781              : se_list_cmp ((void *)a->cdr, (void *)b->cdr))))));
    … …  
    18421842#endif
    18431843{
    1844   long hash = (long)car ^ (long)cdr;
     1844  intptr_t hash = (intptr_t)car ^ (intptr_t)cdr;
    18451845  struct rx_se_list template;
    18461846
    … …  
    19551955  template.cdr = set;
    19561956  node = rx_hash_store (memo,
    1957             (((long)state) >> 8) ^ (long)set,
     1957            (((intptr_t)state) >> 8) ^ (intptr_t)set,
    19581958            &template, &nfa_set_hash_rules);
    19591959  if (!node)
    … …  
    22642264RX_DECL int
    22652265rx_compactify_nfa (struct rx *rx,
    2266            void **mem, unsigned long *size)
     2266           void **mem, mg_u_long *size)
    22672267#else
    22682268RX_DECL int
    … …  
    22702270     struct rx *rx;
    22712271     void **mem;
    2272      unsigned long *size;
     2272     mg_u_long *size;
    22732273#endif
    22742274{
    … …  
    22792279  int se_list_consc = count_hash_nodes (&rx->se_list_memo);
    22802280  int nfa_setc = count_hash_nodes (&rx->set_list_memo);
    2281   unsigned long total_size;
     2281  mg_u_long total_size;
    22822282
    22832283  /* This takes place in two stages.   First, the total size of the
    … …  
    24072407          {
    24082408        sp = rx_hash_find (&rx->se_list_memo,
    2409                    (long)sesrc->car ^ (long)sesrc->cdr,
     2409                   (intptr_t)sesrc->car ^ (intptr_t)sesrc->cdr,
    24102410                   sesrc, &se_list_hash_rules);
    24112411        if (sp->binding)
    … …  
    24252425          {
    24262426        sp = rx_hash_find (&rx->set_list_memo,
    2427                    ((((long)destlst->car) >> 8)
    2428                     ^ (long)destlst->cdr),
     2427                   ((((intptr_t)destlst->car) >> 8)
     2428                    ^ (intptr_t)destlst->cdr),
    24292429                   destlst, &nfa_set_hash_rules);
    24302430        if (sp->binding)
    … …  
    27982798    (rx_hash_find
    27992799     (&cache->superset_table,
    2800       (unsigned long)set->car ^ set->id ^ (unsigned long)set->cdr,
     2800      (intptr_t)set->car ^ set->id ^ (intptr_t)set->cdr,
    28012801      (void *)set,
    28022802      &cache->superset_hash_rules),
    … …  
    30563056    = ((struct rx_cache *)
    30573057       ((char *)rules
    3058     - (unsigned long)(&((struct rx_cache *)0)->superset_hash_rules)));
     3058    - (intptr_t)(&((struct rx_cache *)0)->superset_hash_rules)));
    30593059  struct rx_superset * template = (struct rx_superset *)val;
    30603060  struct rx_superset * newset
    … …  
    30883088    = ((struct rx_cache *)
    30893089       ((char *)rules
    3090     - (unsigned long)(&((struct rx_cache *)0)->superset_hash_rules)));
     3090    - (intptr_t)(&((struct rx_cache *)0)->superset_hash_rules)));
    30913091  return ((struct rx_hash *)
    30923092      rx_cache_malloc_or_get (cache,
    … …  
    31073107  struct rx_cache * cache
    31083108    = ((struct rx_cache *)
    3109        (char *)rules - (long)(&((struct rx_cache *)0)->superset_hash_rules));
     3109       (char *)rules - (intptr_t)(&((struct rx_cache *)0)->superset_hash_rules));
    31103110  rx_cache_free (cache, &cache->free_hash, (char *)hash);
    31113111}
    … …  
    32643264    template.id = car->id;
    32653265    hit = rx_hash_store (&cache->superset_table,
    3266              (unsigned long)car ^ car->id ^ (unsigned long)cdr,
     3266             (intptr_t)car ^ car->id ^ (intptr_t)cdr,
    32673267             (void *)&template,
    32683268             &cache->superset_hash_rules);
    … …  
    43324332    return;
    43334333      case r_side_effect:
    4334     if (   ((long)rexp->params.side_effect >= 0)
    4335         && (params [(long)rexp->params.side_effect].se == re_se_backref))
    4336       out[ params [(long)rexp->params.side_effect].op1] = 1;
     4334    if (   ((intptr_t)rexp->params.side_effect >= 0)
     4335        && (params [(intptr_t)rexp->params.side_effect].se == re_se_backref))
     4336      out[ params [(intptr_t)rexp->params.side_effect].op1] = 1;
    43374337    return;
    43384338      }
    … …  
    45164516      case r_side_effect:
    45174517    {
    4518       int se = (long)rexp->params.side_effect;
     4518      int se = (intptr_t)rexp->params.side_effect;
    45194519      if (   (se >= 0)
    45204520          && (   ((enum re_side_effects)params[se].se == re_se_lparen)
    … …  
    45634563      return pointless_if_repeated (node->params.pair.left, params);
    45644564    case r_side_effect:
    4565       switch ((enum re_side_effects) (((long)node->params.side_effect < 0)
    4566           ? (enum re_side_effects) (long) node->params.side_effect
    4567           : (enum re_side_effects)params[(long)node->params.side_effect].se))
     4565      switch ((enum re_side_effects) (((intptr_t)node->params.side_effect < 0)
     4566          ? (enum re_side_effects) (intptr_t) node->params.side_effect
     4567          : (enum re_side_effects)params[(intptr_t)node->params.side_effect].se))
    45684568    {
    45694569    case re_se_try:
    … …  
    45884588    case re_se_backref:
    45894589      return 0;
     4590    case re_se_pushback:
     4591    case re_se_push0:
     4592    case re_se_pushpos:
     4593    case re_se_chkpos:
     4594    case re_se_poppos:
     4595    case re_se_tv:
     4596    case re_floogle_flap:
     4597      return -1;
    45904598    }
    45914599    case r_data:
    … …  
    46374645      case r_side_effect:
    46384646    {
    4639       int se = (long)rexp->params.side_effect;
     4647      int se = (intptr_t)rexp->params.side_effect;
    46404648      if (   in_danger
    46414649          && (se >= 0)
    … …  
    47574765    case r_side_effect:
    47584766      return
    4759     !((long)rexp->params.side_effect > 0
    4760       ? idempotent_complex_se [ params [(long)rexp->params.side_effect].se ]
    4761       : idempotent_se [-(long)rexp->params.side_effect]);
     4767    !((intptr_t)rexp->params.side_effect > 0
     4768      ? idempotent_complex_se [ params [(intptr_t)rexp->params.side_effect].se ]
     4769      : idempotent_se [-(intptr_t)rexp->params.side_effect]);
    47624770     
    47634771    case r_alternate:
    … …  
    48114819
    48124820    case r_side_effect:
    4813       return ((long)rexp->params.side_effect >= 0);
     4821      return ((intptr_t)rexp->params.side_effect >= 0);
    48144822     
    48154823    case r_alternate:
    … …  
    52045212          if (need_sync)
    52055213        {
    5206           int sync_se = paramc;
     5214          intptr_t sync_se = paramc;
    52075215          params = (params
    52085216                ? ((struct re_se_params *)
    … …  
    55525560            handle_close:
    55535561              /* See similar code for backslashed left paren above.  */
    5554               if (COMPILE_STACK_EMPTY)
    5555                 if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD)
     5562              if (COMPILE_STACK_EMPTY){
     5563                if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD){
    55565564                  goto normal_char;
    5557                 else
     5565        }
     5566                else{
    55585567                  return REG_ERPAREN;
     5568        }
     5569          }
    55595570
    55605571              /* Since we just checked for an empty stack above, this
    … …  
    55735584                this_group_regnum = COMPILE_STACK_TOP.regnum;
    55745585        {
    5575           int left_se = paramc;
    5576           int right_se = paramc + 1;
     5586          intptr_t left_se = paramc;
     5587          intptr_t right_se = paramc + 1;
    55775588
    55785589          params = (params
    … …  
    56255636        last_expression = &alt->params.pair.right;
    56265637        {
    5627           int sync_se = paramc;
     5638          intptr_t sync_se = paramc;
    56285639
    56295640          params = (params
    … …  
    57425753          /* Otherwise, we have a nontrivial interval. */
    57435754          {
    5744             int iter_se = paramc;
    5745             int end_se = paramc + 1;
     5755            intptr_t iter_se = paramc;
     5756            intptr_t end_se = paramc + 1;
    57465757            params = (params
    57475758                  ? ((struct re_se_params *)
    … …  
    59395950
    59405951          {
    5941         int backref_se = paramc;
     5952        intptr_t backref_se = paramc;
    59425953        params = (params
    59435954              ? ((struct re_se_params *)
    … …  
    60096020 
    60106021  {
    6011     int win_se = paramc;
     6022    intptr_t win_se = paramc;
    60126023    params = (params
    60136024          ? ((struct re_se_params *)
    … …  
    61496160      {
    61506161    void * mem = (void *)rxb->buffer;
    6151     unsigned long size = rxb->allocated;
     6162    mg_u_long size = rxb->allocated;
    61526163    int start_id;
    61536164    char * perm_mem;
    … …  
    67576768  while (list)
    67586769    {
    6759       if ((long)list->car >= 0)
     6770      if ((intptr_t)list->car >= 0)
    67606771    ++x;
    67616772      list = list->cdr;
    … …  
    68126823      for (ai = al - 1; ai >= 0; --ai)
    68136824    {
    6814       while ((long)ap->car < 0)
     6825      while ((intptr_t)ap->car < 0)
    68156826        ap = ap->cdr;
    68166827      av[ai] = ap->car;
    … …  
    68206831      for (bi = bl - 1; bi >= 0; --bi)
    68216832    {
    6822       while ((long)bp->car < 0)
     6833      while ((intptr_t)bp->car < 0)
    68236834        bp = bp->cdr;
    68246835      bv[bi] = bp->car;

  • main/trunk/greenstone2/common-src/indexers/mg/lib/rx.h

    r16583 r25147  
    2222/*  t. lord Wed Sep 23 18:20:57 1992    */
    2323
    24 
    25 
    26 
    27 
    28 
    29 
    30 
     24#include "mglong.h"
    3125
    3226#ifndef RX_WANT_SE_DEFS
    … …  
    9185  struct rx_hash_item * next_same_hash;
    9286  struct rx_hash * table;
    93   unsigned long hash;
     87  mg_u_long hash;
    9488  void * data;
    9589  void * binding;
    … …  
    273267   */
    274268  void * buffer;
    275   unsigned long allocated;
     269  mg_u_long allocated;
    276270
    277271  /* Clients of RX can ask for some extra storage in the space pointed
    … …  
    280274   * at (buffer + allocated - reserved)
    281275   */
    282   unsigned long reserved;
     276  mg_u_long reserved;
    283277
    284278  /* --------- The remaining fields are for internal use only. --------- */
    … …  
    12741268
    12751269  void * buffer;        /* Malloced memory for the nfa. */
    1276   unsigned long allocated;  /* Size of that memory. */
     1270  mg_u_long allocated;  /* Size of that memory. */
    12771271
    12781272  /* Pointer to a fastmap, if any, otherwise zero.  re_search uses
    … …  
    15801574                      rx_Bitset a, rx_Bitset b);
    15811575RX_DECL void rx_bitset_xor (int size, rx_Bitset a, rx_Bitset b);
    1582 RX_DECL unsigned long rx_bitset_hash (int size, rx_Bitset b);
     1576RX_DECL mg_u_long rx_bitset_hash (int size, rx_Bitset b);
    15831577RX_DECL struct rx_hash_item * rx_hash_find (struct rx_hash * table,
    1584                         unsigned long hash,
     1578                        mg_u_long hash,
    15851579                        void * value,
    15861580                        struct rx_hash_rules * rules);
    15871581RX_DECL struct rx_hash_item * rx_hash_store (struct rx_hash * table,
    1588                          unsigned long hash,
     1582                         mg_u_long hash,
    15891583                         void * value,
    15901584                         struct rx_hash_rules * rules);
    … …  
    16371631RX_DECL void rx_delete_epsilon_transitions (struct rx *rx);
    16381632RX_DECL int rx_compactify_nfa (struct rx *rx,
    1639                    void **mem, unsigned long *size);
     1633                   void **mem, mg_u_long *size);
    16401634RX_DECL void rx_release_superset (struct rx *rx,
    16411635                  struct rx_superset *set);
    … …  
    16651659RX_DECL void rx_bitset_revdifference ();
    16661660RX_DECL void rx_bitset_xor ();
    1667 RX_DECL unsigned long rx_bitset_hash ();
     1661RX_DECL mg_u_long rx_bitset_hash ();
    16681662RX_DECL struct rx_hash_item * rx_hash_find ();
    16691663RX_DECL struct rx_hash_item * rx_hash_store ();
    … …  
    22302224
    22312225
    2232 
    22332226/* How many characters in the character set.  */
    22342227#define CHAR_SET_SIZE (1 << CHARBITS)
    … …  
    23442337RX_DECL __inline__ int
    23452338rx_search  (struct re_pattern_buffer * rxb,
    2346         int startpos,
     2339        intptr_t startpos,
    23472340        int range,
    23482341        int stop,
    … …  
    23612354        app_closure, regs, resume_state, save_state)
    23622355     struct re_pattern_buffer * rxb;
    2363      int startpos;
     2356     intptr_t startpos;
    23642357     int range;
    23652358     int stop;
    … …  
    27392732  {
    27402733    enum rx_test_match_entry test_pc;
    2741     int inx;
     2734    intptr_t inx;
    27422735    test_pc = search_state.test_match_resume_pt;
    27432736    if (test_pc == rx_test_start)
    … …  
    28392832            ((struct rx_superstate *)
    28402833             ((char *)this_tr_table
    2841               - ((unsigned long)
     2834              - ((mg_u_long)
    28422835             ((struct rx_superstate *)0)->transitions)));
    28432836         
    … …  
    29042897        ((struct rx_superstate *)
    29052898         ((char *)this_tr_table
    2906           - ((unsigned long)
     2899          - ((uintptr_t)
    29072900         ((struct rx_superstate *)0)->transitions)));
    29082901    }
    … …  
    29112904     * Dispatch that instruction:
    29122905     */
    2913     inx = (int)search_state.ifr->inx;
     2906    inx = (intptr_t)search_state.ifr->inx;
    29142907#ifdef RX_DEBUG_0
    29152908    if (rx_debug_trace)
    … …  
    29492942          while (el)
    29502943        {
    2951           long effect;
    2952           effect = (long)el->car;
     2944          intptr_t effect;
     2945          effect = (intptr_t)el->car;
    29532946          if (effect < 0)
    29542947            {
    … …  
    29902983                = ((struct rx_superstate *)
    29912984                   ((char *)search_state.ifr->data
    2992                 - (long)(((struct rx_superstate *)0)
     2985                - (intptr_t)(((struct rx_superstate *)0)
    29932986                     ->transitions)));
    29942987              goto top_of_cycle;

  • main/trunk/greenstone2/common-src/indexers/mg/lib/sptree.c

    r16583 r25147  
    293293        q->par = p;             \
    294294        q->rght = p->left;          \
    295         if(q->rght)             \
    296             q->rght->par = q;       \
     295        if(q->rght){                \
     296          q->rght->par = q;         \
     297        }                                       \
    297298        p->left = q;                \
    298         if(p->par)              \
    299             if(q == p->par->left)       \
    300                 p->par->left = p;   \
    301             else                \
    302                 p->par->rght = p;   \
     299        if(p->par){             \
     300          if(q == p->par->left){        \
     301            p->par->left = p;           \
     302          }                                     \
     303          else{                 \
     304            p->par->rght = p;           \
     305          }                                     \
     306        }                                       \
    303307    }while(0)
    304308
    … …  
    308312        q->par = p;             \
    309313        q->left = p->rght;          \
    310         if(q->left)             \
    311             q->left->par = q;       \
     314        if(q->left){                \
     315          q->left->par = q;         \
     316        }                                       \
    312317        p->rght = q;                \
    313         if(p->par)              \
    314             if(q == p->par->left)       \
    315                 p->par->left = p;   \
    316             else                \
    317                 p->par->rght = p;   \
     318        if(p->par){             \
     319          if(q == p->par->left){        \
     320            p->par->left = p;           \
     321          }                                     \
     322          else{                             \
     323            p->par->rght = p;           \
     324          }                                     \
     325        }                                       \
    318326    }while(0)
    319327
    … …  
    341349      if (p == q->left)
    342350    {
    343       if (g == NNULL)
     351      if (g == NNULL){
    344352        ROTATER (p, q);
     353      }
    345354      else if (q == g->left)
    346355        {
    … …  
    356365      else
    357366    {
    358       if (g == NNULL)
     367      if (g == NNULL){
    359368        ROTATEL (p, q);
     369      }
    360370      else if (q == g->rght)
    361371        {

  • main/trunk/greenstone2/common-src/indexers/mg/lib/sptree.h

    r16583 r25147  
    2929  {
    3030    int no_of_items;
    31     unsigned long mem_in_use;
     31    mg_u_long mem_in_use;
    3232    int (*cmp) (void *, void *);
    3333    void *root;

  • main/trunk/greenstone2/common-src/indexers/mg/lib/unitool.c

    r23431 r25147  
    1515 * column
    1616 */
    17 unsigned long *unicode_cat_data=NULL;
     17mg_u_long *unicode_cat_data=NULL;
    1818
    1919
    … …  
    14641464 * column
    14651465 */
    1466 unsigned long *unicode_cat_data;
     1466mg_u_long *unicode_cat_data;
    14671467
    14681468void create_unicat_data () {
    … …  
    14701470  int min_start=0;
    14711471  int min_end=0;
    1472   register unsigned long min_value=0; /* filling the whole byte */
     1472  register mg_u_long min_value=0; /* filling the whole byte */
    14731473 
    14741474  const unirange *letter_here = letter_info;
    … …  
    15291529   
    15301530      } else {
    1531     register unsigned long mask = 3 << ((i % 16) * 2);
     1531    register mg_u_long mask = 3 << ((i % 16) * 2);
    15321532    unicode_cat_data[i/16] = (unicode_cat_data[i/16] & (~mask)) |
    15331533                  (min_value & mask);

  • main/trunk/greenstone2/common-src/indexers/mg/lib/win32in.c

    r16583 r25147  
    44/* unix systems. */
    55
    6 unsigned long htonl(unsigned long x) {
     6mg_u_long htonl(mg_u_long x) {
    77#if defined (LITTLE_ENDIAN) || defined (_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN)
    88    x = ((x >> 24) & 0x000000FF) | ((x >> 8) & 0x0000FF00) |
    … …  
    2525}
    2626
    27 unsigned long ntohl(unsigned long x) {
     27mg_u_long ntohl(mg_u_long x) {
    2828#if defined (LITTLE_ENDIAN) || defined (_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN)
    2929    x = ((x >> 24) & 0x000000FF) | ((x >> 8) & 0x0000FF00) |
    … …  
    5151
    5252main () {
    53     long x;
     53    mg_s_long x;
    5454    short sx;
    5555

  • main/trunk/greenstone2/common-src/indexers/mg/lib/win32in.h

    r16583 r25147  
    44#include "longlong.h"
    55
    6 unsigned long htonl(unsigned long x);
    7 unsigned long ntohl(unsigned long x);
     6mg_u_long htonl(mg_u_long x);
     7mg_u_long ntohl(mg_u_long x);
    88mg_ullong ntohll(mg_ullong x);
    99unsigned short htons(unsigned short x);

  • main/trunk/greenstone2/common-src/indexers/mg/src/images/Makefile.in

    r16583 r25147  
    3636 
    3737CC = @CC@
    38 CFLAGS = @CFLAGS@  @COMPAT32BITFLAGS@
     38CFLAGS = @CFLAGS@
    3939CPPFLAGS = @CPPFLAGS@
    4040DEFS = @DEFS@
    … …  
    4242INSTALL_DATA = @INSTALL_DATA@
    4343INSTALL_PROGRAM = @INSTALL_PROGRAM@
    44 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     44LDFLAGS = @LDFLAGS@
    4545LIBS = ../../lib/libmglib.a @LIBS@
    4646TOUCH = echo timestamp >

  • main/trunk/greenstone2/common-src/indexers/mg/src/images/mgfelics.c

    r16583 r25147  
    5555  FILE *fp_in = (stdin), *fp_out = (stdout);
    5656  int width, height, maxval;
    57   u_long magic;
     57  mg_u_long magic;
    5858  char *filename = NULL;
    5959  unsigned int *line;

  • main/trunk/greenstone2/common-src/indexers/mg/src/images/pbmtools.c

    r16583 r25147  
    6464pbm_isapbmfile (FILE * fp)
    6565{
    66   u_long magic;
     66  mg_u_long magic;
    6767
    6868  magic = getmagicno_short (fp);

  • main/trunk/greenstone2/common-src/indexers/mg/src/images/utils.c

    r16583 r25147  
    230230
    231231void
    232 magic_write (FILE * fp, u_long magic_num)
     232magic_write (FILE * fp, mg_u_long magic_num)
    233233{
    234234  HTONUL(magic_num);  /* [RPAP - Jan 97: Endian Ordering] */
    … …  
    239239
    240240void
    241 magic_check (FILE * fp, u_long magic_num)
    242 {
    243   u_long magic;
     241magic_check (FILE * fp, mg_u_long magic_num)
     242{
     243  mg_u_long magic;
    244244  if (fread (&magic, sizeof (magic), 1, fp) != 1 || NTOHUL(magic) != magic_num)  /* [RPAP - Jan 97: Endian Ordering] */
    245245    error_msg ("magic num", "Incorrect magic number.", "");
    … …  
    247247
    248248
    249 u_long
     249mg_u_long
    250250magic_read (FILE * fp)
    251251{
    252   u_long magic;
     252  mg_u_long magic;
    253253  if (fread (&magic, sizeof (magic), 1, fp) != 1)
    254254    error_msg ("magic num", "Couldn't read magic number.", "");

  • main/trunk/greenstone2/common-src/indexers/mg/src/images/utils.h

    r16583 r25147  
    4545#define MAGIC_BILEVEL           GEN_MAGIC('M','G','B','I')
    4646#define MAGIC_TIC               GEN_MAGIC('M','G','T','C')
    47 #define IS_MAGIC(a) ((((u_long)(a)) & 0xffff0000) == MAGIC_XXXX)
     47#define IS_MAGIC(a) ((((mg_u_long)(a)) & 0xffff0000) == MAGIC_XXXX)
    4848/* --------------------------------------- */
    4949
    … …  
    6868void readline (char str[], FILE * fp);
    6969
    70 void magic_write (FILE * fp, u_long magic_num);
    71 void magic_check (FILE * fp, u_long magic_num);
    72 u_long magic_read (FILE * fp);
     70void magic_write (FILE * fp, mg_u_long magic_num);
     71void magic_check (FILE * fp, mg_u_long magic_num);
     72mg_u_long magic_read (FILE * fp);
    7373/* kerry's code */
    7474

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/Makefile.in

    r22070 r25147  
    3838AR = ar
    3939CC = @CC@
    40 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic
     40CFLAGS = @CFLAGS@ -fpic
    4141DEFS = @DEFS@
    4242RANLIB = @RANLIB@
    … …  
    4444INSTALL_DATA = @INSTALL_DATA@
    4545INSTALL_PROGRAM = @INSTALL_PROGRAM@
    46 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     46LDFLAGS = @LDFLAGS@
    4747LIBS = ../../lib/libmglib.a @LIBS@
    4848TOUCH = echo timestamp >
    … …  
    5353# Uncomment for compiling for the nzdl project
    5454#
    55 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM
     55CFLAGS = @CFLAGS@ -fpic -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM
    5656##########################################
    5757

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/backend.c

    r16583 r25147  
    4747
    4848static File *
    49 OpenFile (char *base, char *suffix, unsigned long magic, int *ok)
     49OpenFile (char *base, char *suffix, mg_u_long magic, int *ok)
    5050{
    5151  char FileName[512];
    … …  
    6262  if (magic)
    6363    {
    64       unsigned long m;
     64      mg_u_long m;
    6565      if (fread ((char *) &m, sizeof (m), 1, F->f) == 0)
    6666    {
    … …  
    475475  if (qd->id->ifh.InvfLevel == 3)
    476476    {
    477       unsigned long magic;
     477      mg_u_long magic;
    478478      FILE *paragraph;
    479479      int i;
    … …  
    507507  {
    508508    extern char *trec_ids;
    509     extern long *trec_paras;
     509    extern mg_s_long *trec_paras;
    510510    int size;
    511511    char FileName[512];
    … …  
    533533      {
    534534    int i, d;
    535     unsigned long magic;
    536     trec_paras = Xmalloc (qd->sd->sdh.num_of_docs * sizeof (long));
     535    mg_u_long magic;
     536    trec_paras = Xmalloc (qd->sd->sdh.num_of_docs * sizeof (mg_s_long));
    537537    if (!trec_paras)
    538538      {
    … …  
    598598 */
    599599void
    600 ChangeMemInUse (query_data * qd, long delta)
     600ChangeMemInUse (query_data * qd, mg_s_long delta)
    601601{
    602602  qd->mem_in_use += delta;
    … …  
    775775}
    776776
    777 long
     777mg_s_long
    778778GetDocCompLength (query_data * qd)
    779779{
    … …  
    785785
    786786u_char *
    787 GetDocText (query_data * qd, unsigned long *len)
     787GetDocText (query_data * qd, mg_u_long *len)
    788788{
    789789  DocEntry *DE;

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/backend.h

    r16583 r25147  
    4040  {
    4141    File *InvfFile;
    42     unsigned long N;
    43     unsigned long Nstatic;  /* N parameter for decoding inverted file entries */
     42    mg_u_long N;
     43    mg_u_long Nstatic;  /* N parameter for decoding inverted file entries */
    4444    struct invf_file_header ifh;
    4545  }
    … …  
    5151    File *TextIdxFile;
    5252    File *TextIdxWgtFile;
    53     long current_pos;
     53    mg_s_long current_pos;
    5454    struct
    5555      {
    56     unsigned long Start;
     56    mg_u_long Start;
    5757    float Weight;
    5858      }
    … …  
    7878    compression_dict_header cdh;
    7979    comp_frags_header *cfh[2];
    80     unsigned long MemForCompDict;
     80    mg_u_long MemForCompDict;
    8181    u_char ***values[2];
    8282    u_char *escape[2];
    8383    huff_data *chars_huff[2];
    84     u_long **chars_vals[2];
     84    mg_u_long **chars_vals[2];
    8585    huff_data *lens_huff[2];
    86     u_long **lens_vals[2];
     86    mg_u_long **lens_vals[2];
    8787    auxiliary_dict *ad;
    8888    int fast_loaded;
    … …  
    9696    struct stem_idx_header sih;
    9797    u_char **index;
    98     unsigned long *pos;
     98    mg_u_long *pos;
    9999    int active;
    100100    u_char *buffer;
    101     unsigned long MemForStemIdx;
     101    mg_u_long MemForStemIdx;
    102102  }
    103103stemmed_idx;
    … …  
    109109    struct stem_dict_header sdh;
    110110    u_char **index;
    111     unsigned long *pos;
     111    mg_u_long *pos;
    112112    int active;
    113113    u_char *buffer;
    114     unsigned long MemForStemDict;
     114    mg_u_long MemForStemDict;
    115115
    116116    /* [RPAP - Jan 97: Stem Index Change] */
    … …  
    126126    double L;
    127127    double B;
    128     unsigned long *DocWeights;
     128    mg_u_long *DocWeights;
    129129    char bits;
    130130    float *table;
    131     unsigned long mask;
    132     unsigned long MemForWeights;
    133     unsigned long num_of_docs;
     131    mg_u_long mask;
     132    mg_u_long MemForWeights;
     133    mg_u_long num_of_docs;
    134134  }
    135135approx_weights_data;
    … …  
    140140    int QueryFreqs;
    141141    int Exact;           /* use exact weights for ranking or not */
    142     long MaxDocsToRetrieve; /* may be -1 for all */
    143     long MaxParasToRetrieve;
     142    mg_s_long MaxDocsToRetrieve;    /* may be -1 for all */
     143    mg_s_long MaxParasToRetrieve;
    144144    int Sort;       
    145145    char AccumMethod;       /* 'A' = array,  'S' = splay tree,  'H' = hash_table */
    146     long MaxAccums;     /* may be -1 for all */
    147     long MaxTerms;      /* may be -1 for all */
     146    mg_s_long MaxAccums;        /* may be -1 for all */
     147    mg_s_long MaxTerms;     /* may be -1 for all */
    148148    int StopAtMaxAccum; /* Stop at maximum accumulator or not */
    149     long HashTblSize;
     149    mg_s_long HashTblSize;
    150150    char *skip_dump;
    151151  }
    … …  
    156156typedef struct BooleanQueryInfo
    157157  {
    158     long MaxDocsToRetrieve;
     158    mg_s_long MaxDocsToRetrieve;
    159159  }
    160160BooleanQueryInfo;
    … …  
    191191    File *File_invf;
    192192    File *File_weight_approx;
    193     unsigned long mem_in_use, max_mem_in_use;
    194     unsigned long num_of_ptrs, tot_num_of_ptrs;
    195     unsigned long num_of_terms, tot_num_of_terms;
    196     unsigned long num_of_accum, tot_num_of_accum;
    197     unsigned long num_of_ans, tot_num_of_ans;
    198     unsigned long hops_taken, tot_hops_taken;
    199     unsigned long text_idx_lookups, tot_text_idx_lookups;
    200     unsigned long max_buffers;
     193    mg_u_long mem_in_use, max_mem_in_use;
     194    mg_u_long num_of_ptrs, tot_num_of_ptrs;
     195    mg_u_long num_of_terms, tot_num_of_terms;
     196    mg_u_long num_of_accum, tot_num_of_accum;
     197    mg_u_long num_of_ans, tot_num_of_ans;
     198    mg_u_long hops_taken, tot_hops_taken;
     199    mg_u_long text_idx_lookups, tot_text_idx_lookups;
     200    mg_u_long max_buffers;
    201201    unsigned doc_pos;
    202202    unsigned buf_in_use;
    … …  
    226226query_data *InitQuerySystem (char *dir, char *name, char *textname, InitQueryTimes * iqt);
    227227
    228 void ChangeMemInUse (query_data * qd, long delta);
     228void ChangeMemInUse (query_data * qd, mg_s_long delta);
    229229
    230230void FinishQuerySystem (query_data * qd);
    … …  
    251251float GetDocWeight (query_data * qd);
    252252
    253 long GetDocCompLength (query_data * qd);
    254 
    255 u_char *GetDocText (query_data * qd, unsigned long *len);
     253mg_s_long GetDocCompLength (query_data * qd);
     254
     255u_char *GetDocText (query_data * qd, mg_u_long *len);
    256256
    257257DocEntry *GetDocChain (query_data * qd);

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/bool_parser.c

    r16583 r25147  
    4444static QueryTermList **query_term_list;
    4545static int word_num;
    46 static u_long count;
    47 static u_long doc_count;
    48 static u_long invf_ptr;
    49 static u_long invf_len;
     46static mg_u_long count;
     47static mg_u_long doc_count;
     48static mg_u_long invf_ptr;
     49static mg_u_long invf_len;
    5050
    5151#line 66 "bool_parser.y"

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/bool_parser.y

    r16583 r25147  
    5757static QueryTermList **query_term_list;
    5858static int word_num;
    59 static u_long count;
    60 static u_long doc_count;
    61 static u_long invf_ptr;
    62 static u_long invf_len;
     59static mg_u_long count;
     60static mg_u_long doc_count;
     61static mg_u_long invf_ptr;
     62static mg_u_long invf_len;
    6363%}
    6464 

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/bool_tester.c

    r16583 r25147  
    151151          prompt (str);
    152152          te->WE.doc_count = atoi (line);
    153           printf ("doc_count = %ld\n", te->WE.doc_count);
     153          printf ("doc_count = %d\n", te->WE.doc_count);
    154154        }           /*for */
    155155    }           /*if */

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/bool_tree.c

    r16583 r25147  
    5656bool_tree_node *
    5757CreateBoolTermNode (TermList ** tl, char *text, int Count, int word_num,
    58             u_long count, u_long doc_count, u_long invf_ptr, u_long invf_len,  /* [RPAP - Feb 97: Term Frequency] */
     58            mg_u_long count, mg_u_long doc_count, mg_u_long invf_ptr, mg_u_long invf_len,  /* [RPAP - Feb 97: Term Frequency] */
    5959            int stemmer_num)
    6060{

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/bool_tree.h

    r16583 r25147  
    102102bool_tree_node *CopyBoolTree (bool_tree_node * tree);
    103103bool_tree_node *CreateBoolTermNode (TermList ** tl, char *text, int Count, int word_num,
    104                     u_long count, u_long doc_count, u_long invf_ptr,
    105                     u_long invf_len, int stemmer_num);
     104                    mg_u_long count, mg_u_long doc_count, mg_u_long invf_ptr,
     105                    mg_u_long invf_len, int stemmer_num);
    106106bool_tree_node *CreateBoolTreeNode (N_Tag tag,
    107107                 bool_tree_node * left, bool_tree_node * right);

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/build.h

    r16583 r25147  
    111111
    112112
    113 extern unsigned long buf_size;
     113extern mg_u_long buf_size;
    114114/*
    115115 * The size of the document input buffer.
    116116 */
    117117
    118 extern unsigned long ChunkLimit;
     118extern mg_u_long ChunkLimit;
    119119/*
    120120 * The maximum number of chunks that can be written to disk.
    121121 */
    122122
    123 extern unsigned long invf_buffer_size;
     123extern mg_u_long invf_buffer_size;
    124124/*
    125125 * The amount of memory to allocate to the invertion buffer.

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/comp_dict.c

    r16583 r25147  
    6666huff_data char_huff[2];
    6767huff_data lens_huff[2];
    68 u_long *char_codes[2], *lens_codes[2];
    69 u_long Words_disk = 0;
    70 u_long Chars_disk = 0;
     68mg_u_long *char_codes[2], *lens_codes[2];
     69mg_u_long Words_disk = 0;
     70mg_u_long Chars_disk = 0;
    7171
    7272
    … …  
    7979  dict_hash_table *ht;
    8080  u_char **words;
    81   u_long ht_size;
     81  mg_u_long ht_size;
    8282
    8383  ht_size = prime (cfh->hd.num_codes * HASH_RATIO);
    … …  
    133133      register u_char **wptr;
    134134      register int tsize = ht->size;
    135       register unsigned long hashval, step;
     135      register mg_u_long hashval, step;
    136136
    137137      HASH (hashval, step, allwords, tsize);
    … …  
    163163    return COMPERROR;
    164164
    165   Words_disk = sizeof (u_long);
     165  Words_disk = sizeof (mg_u_long);
    166166
    167167  if (Read_cdh (dict, &cdh, NULL, &Words_disk) == -1)

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/comp_dict.h

    r16583 r25147  
    3232typedef struct dict_hash_table
    3333  {
    34     u_long size;
     34    mg_u_long size;
    3535    huff_data *hd;
    36     u_long *codes;
     36    mg_u_long *codes;
    3737    u_char **words;
    3838    u_char **table[1];
    … …  
    5151extern huff_data char_huff[2];
    5252extern huff_data lens_huff[2];
    53 extern u_long *char_codes[2], *lens_codes[2];
    54 extern u_long Words_disk;
    55 extern u_long Chars_disk;
     53extern mg_u_long *char_codes[2], *lens_codes[2];
     54extern mg_u_long Words_disk;
     55extern mg_u_long Chars_disk;
    5656
    5757

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/environment.c

    r16583 r25147  
    347347 * or default on a error
    348348 */
    349 long
    350 IntEnv (char *data, long def)
    351 {
    352   long val;
     349mg_s_long
     350IntEnv (char *data, mg_s_long def)
     351{
     352  mg_s_long val;
    353353  char *ptr;
    354354  if (!data)

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/environment.h

    r16583 r25147  
    5454char *GetEnvName (int i);
    5555int BooleanEnv (char *data, int def);
    56 long IntEnv (char *data, long def);
     56mg_s_long IntEnv (char *data, mg_s_long def);
    5757
    5858void InitEnv (void);

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/hash.h

    r16583 r25147  
    3131    do {                        \
    3232        register u_char *p=wd;          \
    33         register long len = *p++;       \
    34         register unsigned long hval;        \
     33        register mg_s_long len = *p++;      \
     34        register mg_u_long hval;        \
    3535        if (len>25) len = 25;           \
    3636        for (hval=0; len; --len)        \

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/invf.h

    r16583 r25147  
    3030struct invf_dict_header
    3131  {
    32     unsigned long lookback;
    33     unsigned long dict_size;
    34     unsigned long total_bytes;
    35     unsigned long index_string_bytes;
     32    mg_u_long lookback;
     33    mg_u_long dict_size;
     34    mg_u_long total_bytes;
     35    mg_u_long index_string_bytes;
    3636    double input_bytes; /* [RJM 07/97: 4G limit] */
    37     unsigned long num_of_docs;
    38     unsigned long static_num_of_docs;
    39     unsigned long num_of_words;
    40     unsigned long stemmer_num;
    41     unsigned long stem_method;
     37    mg_u_long num_of_docs;
     38    mg_u_long static_num_of_docs;
     39    mg_u_long num_of_words;
     40    mg_u_long stemmer_num;
     41    mg_u_long stem_method;
    4242  };
    4343
    4444struct stem_dict_header
    4545  {
    46     unsigned long lookback;
    47     unsigned long block_size;
    48     unsigned long num_blocks;
    49     unsigned long blocks_start;
    50     unsigned long index_chars;
    51     unsigned long num_of_docs;
    52     unsigned long static_num_of_docs;
    53     unsigned long num_of_words;
    54     unsigned long stemmer_num;
    55     unsigned long stem_method;
    56     unsigned long indexed;       /* [RPAP - Jan 97: Stem Index Change] */
     46    mg_u_long lookback;
     47    mg_u_long block_size;
     48    mg_u_long num_blocks;
     49    mg_u_long blocks_start;
     50    mg_u_long index_chars;
     51    mg_u_long num_of_docs;
     52    mg_u_long static_num_of_docs;
     53    mg_u_long num_of_words;
     54    mg_u_long stemmer_num;
     55    mg_u_long stem_method;
     56    mg_u_long indexed;       /* [RPAP - Jan 97: Stem Index Change] */
    5757  };
    5858
    5959struct invf_file_header
    6060  {
    61     unsigned long no_of_words;
    62     unsigned long no_of_ptrs;
    63     unsigned long skip_mode;
    64     unsigned long params[16];
    65     unsigned long InvfLevel;
     61    mg_u_long no_of_words;
     62    mg_u_long no_of_ptrs;
     63    mg_u_long skip_mode;
     64    mg_u_long params[16];
     65    mg_u_long InvfLevel;
    6666  };
    6767
    … …  
    6969struct stem_idx_header
    7070  {
    71     unsigned long lookback;
    72     unsigned long block_size;
    73     unsigned long num_blocks;
    74     unsigned long blocks_start;
    75     unsigned long index_chars;
    76     unsigned long num_of_words;
     71    mg_u_long lookback;
     72    mg_u_long block_size;
     73    mg_u_long num_blocks;
     74    mg_u_long blocks_start;
     75    mg_u_long index_chars;
     76    mg_u_long num_of_words;
    7777  };
    7878

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/invf_get.c

    r16583 r25147  
    166166
    167167static void
    168 HT_Sup_Add (Hash_Table * HT, unsigned long DN, float Sum)
     168HT_Sup_Add (Hash_Table * HT, mg_u_long DN, float Sum)
    169169{
    170170  Invf_Doc_EntryH *IDEH;
    … …  
    176176
    177177Invf_Doc_Entry *
    178 HT_find (Hash_Table * HT, unsigned long DN)
     178HT_find (Hash_Table * HT, mg_u_long DN)
    179179{
    180180  Invf_Doc_EntryH *IDEH;
    … …  
    194194static int
    195195HT_insert (Hash_Table * HT,
    196        unsigned long DN, float Sum)
     196       mg_u_long DN, float Sum)
    197197{
    198198  Invf_Doc_EntryH **IDEH;
    … …  
    316316
    317317Invf_Doc_Entry *
    318 LT_find (List_Table * LT, unsigned long DN)
     318LT_find (List_Table * LT, mg_u_long DN)
    319319{
    320320  int l = 0;
    … …  
    337337static List_Table *
    338338LT_add (query_data * qd, List_Table * LT,
    339     unsigned long DN, float Sum)
     339    mg_u_long DN, float Sum)
    340340{
    341341  Invf_Doc_Entry *ide;
    … …  
    472472    case 1:
    473473      {
    474     unsigned long len;
     474    mg_u_long len;
    475475    if (*p <= qd->id->ifh.params[0])
    476476      *k = 0;
    … …  
    488488    case 2:
    489489      {
    490     unsigned long len;
     490    mg_u_long len;
    491491    if (*p <= qd->id->ifh.params[1])
    492492      *k = 0;
    … …  
    533533  DocEntry *src = NULL, *dest = NULL;
    534534  int i;            /* index counter into inverted list */
    535   unsigned long pos;
     535  mg_u_long pos;
    536536  int next_start, next_doc_num, next_i;
    537537  int block_counter;        /* within counter in block */
    … …  
    540540  int blk;          /* bblock control parameter */
    541541  int ft;           /* The number of documents the word occurs in */
    542   unsigned long CurrDoc = 0;    /* NOTE: Document numbers start at 1 */
     542  mg_u_long CurrDoc = 0;    /* NOTE: Document numbers start at 1 */
    543543  float Weight;
    544544
    … …  
    582582  while (i < ft && ((op == op_term) || src - L->DE < L->num))
    583583    {
    584       unsigned long diff, Temp;
     584      mg_u_long diff, Temp;
    585585
    586586      if (have_skipping)
    … …  
    754754      u_char *buffer;
    755755      int i, kd;
    756       unsigned long next_mjr_dn = 0;
    757       unsigned long CurrDocNum = 0; /* NOTE: Document numbers start at 1 */
    758       unsigned long LastDocNum = 0; /* [RJM 07/97: Ranked Required Terms] */
    759       unsigned long TempDocNum = 0; /* [RJM 07/97: Ranked Required Terms] */
     756      mg_u_long next_mjr_dn = 0;
     757      mg_u_long CurrDocNum = 0; /* NOTE: Document numbers start at 1 */
     758      mg_u_long LastDocNum = 0; /* [RJM 07/97: Ranked Required Terms] */
     759      mg_u_long TempDocNum = 0; /* [RJM 07/97: Ranked Required Terms] */
    760760      double Wqt, WordLog;
    761761      int dn_blk = 0, len_blk = 0, k;
    … …  
    787787      int Count;        /* The number of times the word occurs in a document */
    788788      double Wdt;
    789       unsigned long diff;
     789      mg_u_long diff;
    790790      if (kd == k)
    791791        {
    … …  
    919919      skip_header = 1;
    920920      fprintf (sk, "%s", skip_header_text[qd->id->ifh.skip_mode]);
    921       fprintf (sk, "\nSkipping method %ld\n", qd->id->ifh.skip_mode);
     921      fprintf (sk, "\nSkipping method %d\n", qd->id->ifh.skip_mode);
    922922      switch (qd->id->ifh.skip_mode)
    923923        {
    924924        case 1:
    925           fprintf (sk, "Skipping is every %ld docnums\n",
     925          fprintf (sk, "Skipping is every %d docnums\n",
    926926               qd->id->ifh.params[0]);
    927927          break;
    928928        case 2:
    929           fprintf (sk, "Max nodes = %ld\nNo skips smaller or equal to %ld\n",
     929          fprintf (sk, "Max nodes = %d\nNo skips smaller or equal to %d\n",
    930930               qd->id->ifh.params[0], qd->id->ifh.params[1]);
    931931          break;
    … …  
    958958      u_char *buffer;
    959959      int pos, i;
    960       unsigned long CurrDocNum = 0; /* NOTE: Document numbers start at 1 */
     960      mg_u_long CurrDocNum = 0; /* NOTE: Document numbers start at 1 */
    961961      double Wqt, WordLog;
    962962      int dn_blk = 0, len_blk = 0, k, kd;
    … …  
    971971      if (sk)
    972972    {
    973       fprintf (sk, "%3d : %8ld %6ld \"%.*s\"%*s", j, we->count,
     973      fprintf (sk, "%3d : %8d %6d \"%.*s\"%*s", j, we->count,
    974974         we->doc_count, Terms->TE[j].Word[0], Terms->TE[j].Word + 1,
    975975           indent - Terms->TE[j].Word[0], "");
    … …  
    10101010      int Count;        /* The number of times the occurs in a document */
    10111011      double Wdt;
    1012       unsigned long diff;
     1012      mg_u_long diff;
    10131013      Invf_Doc_Entry ent, *mem;
    10141014      if (k)
    … …  
    10261026        }
    10271027          if (kd == k - 1)
     1028        {
    10281029        if (i + k < p)
    10291030          {
    … …  
    10361037          }
    10371038        else
     1039          {
    10381040          next_doc_num = -1;
     1041          }
     1042        }
    10391043          if (Anding && i + k < p && next->DocNum > next_doc_num &&
    10401044          next_doc_num >= 0)
    … …  
    11491153      skip_header = 1;
    11501154      fprintf (sk, "%s", skip_header_text[qd->id->ifh.skip_mode]);
    1151       fprintf (sk, "\nSkipping method %ld\n", qd->id->ifh.skip_mode);
     1155      fprintf (sk, "\nSkipping method %d\n", qd->id->ifh.skip_mode);
    11521156      switch (qd->id->ifh.skip_mode)
    11531157        {
    11541158        case 1:
    1155           fprintf (sk, "Skipping is every %ld docnums\n",
     1159          fprintf (sk, "Skipping is every %d docnums\n",
    11561160               qd->id->ifh.params[0]);
    11571161          break;
    11581162        case 2:
    1159           fprintf (sk, "Max nodes = %ld\nNo skips smaller or equal to %ld\n",
     1163          fprintf (sk, "Max nodes = %d\nNo skips smaller or equal to %d\n",
    11601164               qd->id->ifh.params[0], qd->id->ifh.params[1]);
    11611165          break;
    … …  
    11881192      int pos;
    11891193      int i;
    1190       unsigned long CurrDocNum = 0; /* NOTE: Document numbers start at 1 */
     1194      mg_u_long CurrDocNum = 0; /* NOTE: Document numbers start at 1 */
    11911195      double Wqt, WordLog;
    11921196      int dn_blk = 0, len_blk = 0, k, kd;
    … …  
    12011205      if (sk)
    12021206    {
    1203       fprintf (sk, "%3d : %8ld %6ld \"%.*s\"%*s", j, we->count,
     1207      fprintf (sk, "%3d : %8d %6d \"%.*s\"%*s", j, we->count,
    12041208         we->doc_count, Terms->TE[j].Word[0], Terms->TE[j].Word + 1,
    12051209           indent - Terms->TE[j].Word[0], "");
    … …  
    12451249      int Count;        /* The number of times the occurs in a document */
    12461250      double Wdt;
    1247       unsigned long diff;
     1251      mg_u_long diff;
    12481252      Invf_Doc_Entry *mem;
    12491253      if (k)
    … …  
    13911395      skip_header = 1;
    13921396      fprintf (sk, "%s", skip_header_text[qd->id->ifh.skip_mode]);
    1393       fprintf (sk, "\nSkipping method %ld\n", qd->id->ifh.skip_mode);
     1397      fprintf (sk, "\nSkipping method %d\n", qd->id->ifh.skip_mode);
    13941398      switch (qd->id->ifh.skip_mode)
    13951399        {
    13961400        case 1:
    1397           fprintf (sk, "Skipping is every %ld docnums\n",
     1401          fprintf (sk, "Skipping is every %d docnums\n",
    13981402               qd->id->ifh.params[0]);
    13991403          break;
    14001404        case 2:
    1401           fprintf (sk, "Max nodes = %ld\nNo skips smaller or equal to %ld\n",
     1405          fprintf (sk, "Max nodes = %d\nNo skips smaller or equal to %d\n",
    14021406               qd->id->ifh.params[0], qd->id->ifh.params[1]);
    14031407          break;
    … …  
    14311435      int pos;
    14321436      int i, n = 0;
    1433       unsigned long CurrDocNum = 0; /* NOTE: Document numbers start at 1 */
    1434       unsigned long LastDocNum = 0; /* [RJM 07/97: Ranked Required Match] */
     1437      mg_u_long CurrDocNum = 0; /* NOTE: Document numbers start at 1 */
     1438      mg_u_long LastDocNum = 0; /* [RJM 07/97: Ranked Required Match] */
    14351439      int this_item = 0; /* [RJM 07/97: Ranked Required Match] points to the next possible LT to delete */
    14361440      double Wqt, WordLog;
    … …  
    14481452      if (sk)
    14491453    {
    1450       fprintf (sk, "%3d : %8ld %6ld \"%.*s\"%*s", j, we->count,
     1454      fprintf (sk, "%3d : %8d %6d \"%.*s\"%*s", j, we->count,
    14511455         we->doc_count, Terms->TE[j].Word[0], Terms->TE[j].Word + 1,
    14521456           indent - Terms->TE[j].Word[0], "");
    … …  
    15111515      int Count;        /* The number of times the occurs in a document */
    15121516      double Wdt;
    1513       unsigned long diff;
     1517      mg_u_long diff;
    15141518      Invf_Doc_Entry *mem;
    15151519
    … …  
    15301534        }
    15311535          if (kd == k - 1)
     1536        {
    15321537        if (i + k < p)
    15331538          {
    … …  
    15401545          }
    15411546        else
     1547          {
    15421548          next_doc_num = -1;
    1543 
     1549          }
     1550        }
    15441551          /* should we take another skip? */
    15451552          if (Anding && i + k < p && next->DocNum > next_doc_num &&

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/invf_get.h

    r16583 r25147  
    7575Op_types;
    7676
    77 /*Invf_Doc_Entry *HT_find(Hash_Table *HT, unsigned long DN); */
     77/*Invf_Doc_Entry *HT_find(Hash_Table *HT, mg_u_long DN); */
    7878void HT_free (query_data * qd, Hash_Table * HT);
    7979void LT_free (query_data * qd, List_Table * LT);

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/ivf.pass1.c

    r16583 r25147  
    117117typedef struct hash_rec
    118118  {
    119     unsigned long fcnt;     /* fragment frequency */
    120     unsigned long lfcnt;    /* local fragment frequency */
    121     unsigned long fnum;     /* last fragment to use stem */
    122     unsigned long wcnt;     /* stem frequency */
    123     unsigned long lwcnt;    /* local stem frequency */
     119    mg_u_long fcnt;     /* fragment frequency */
     120    mg_u_long lfcnt;    /* local fragment frequency */
     121    mg_u_long fnum;     /* last fragment to use stem */
     122    mg_u_long wcnt;     /* stem frequency */
     123    mg_u_long lwcnt;    /* local stem frequency */
    124124    u_char *word;
    125125  }
    126126hash_rec;
    127127
    128 static unsigned long words_read = 0, words_diff = 0, bytes_diff = 0;
    129 static unsigned long outputbytes = 0;
    130 static unsigned long inputbytes = 0;
    131 static unsigned long MaxMemInUse = 0;
    132 static unsigned long MemInUse = 0;
    133 static unsigned long ChunksWritten = 0;
     128static mg_u_long words_read = 0, words_diff = 0, bytes_diff = 0;
     129static mg_u_long outputbytes = 0;
     130static mg_u_long inputbytes = 0;
     131static mg_u_long MaxMemInUse = 0;
     132static mg_u_long MemInUse = 0;
     133static mg_u_long ChunksWritten = 0;
    134134
    135135
    … …  
    138138
    139139static hash_rec **HashTable;
    140 static unsigned long HashSize=0;
    141 static unsigned long HashUsed=0;
     140static mg_u_long HashSize=0;
     141static mg_u_long HashUsed=0;
    142142static u_char *Pool;
    143143static int PoolLeft=0;
    … …  
    152152static mg_ullong L2_bits = 0;
    153153static mg_ullong L3_bits = 0;
    154 static unsigned long L1_ohead = 0;
    155 static unsigned long L2_ohead = 0;
    156 static unsigned long L3_ohead = 0;
    157 static unsigned long callnum = 0, lcallnum = 0, wordnum = 0, lwordnum = 0;
    158 static unsigned long ptrcnt = 0;
    159 static unsigned long checknum=0;
    160 static long max_mem = 0;
     154static mg_u_long L1_ohead = 0;
     155static mg_u_long L2_ohead = 0;
     156static mg_u_long L3_ohead = 0;
     157static mg_u_long callnum = 0, lcallnum = 0, wordnum = 0, lwordnum = 0;
     158static mg_u_long ptrcnt = 0;
     159static mg_u_long checknum=0;
     160static mg_s_long max_mem = 0;
    161161
    162162
    … …  
    211211              MG_MESSAGE)))  /* [RPAP - Feb 97: WIN32 Port] */
    212212    return (COMPERROR);
    213   fwrite ("    ", sizeof (u_long), 1, ic);  /* Space for the maxmem */
     213  fwrite ("    ", sizeof (mg_u_long), 1, ic);   /* Space for the maxmem */
    214214  ENCODE_START (ic)
    215215    ENCODE_PAUSE (sbs)
    … …  
    256256
    257257
    258 static unsigned long
     258static mg_u_long
    259259mem_reqd (void)
    260260{
    261261  register int i;
    262   register unsigned long total = 0;
    263 /*  register unsigned long N = InvfLevel == 3 ? lwordnum : lcallnum; */
    264   register unsigned long N = lcallnum;
     262  register mg_u_long total = 0;
     263/*  register mg_u_long N = InvfLevel == 3 ? lwordnum : lcallnum; */
     264  register mg_u_long N = lcallnum;
    265265  for (i = 0; i < HashUsed; i++)
    266266    {
    267267      register hash_rec *ent = first_occr[i];
    268 /*      register unsigned long p = InvfLevel == 3 ? ent->lwcnt : ent->lfcnt; */
    269       register unsigned long p = ent->lfcnt;
     268/*      register mg_u_long p = InvfLevel == 3 ? ent->lwcnt : ent->lfcnt; */
     269      register mg_u_long p = ent->lfcnt;
    270270      if (p)
    271271    total += BIO_Bblock_Bound (N, p);
    … …  
    278278}
    279279
    280 static unsigned long
     280static mg_u_long
    281281max_mem_reqd (void)
    282282{
    283283  register int i;
    284   register unsigned long total = 0;
    285 /*  register unsigned long N = InvfLevel == 3 ? wordnum : callnum; */
    286   register unsigned long N = callnum;
     284  register mg_u_long total = 0;
     285/*  register mg_u_long N = InvfLevel == 3 ? wordnum : callnum; */
     286  register mg_u_long N = callnum;
    287287  for (i = 0; i < HashUsed; i++)
    288288    {
    289289      register hash_rec *ent = first_occr[i];
    290 /*      register unsigned long p = InvfLevel == 3 ? ent->wcnt : ent->fcnt; */
    291       register unsigned long p = ent->fcnt;
     290/*      register mg_u_long p = InvfLevel == 3 ? ent->wcnt : ent->fcnt; */
     291      register mg_u_long p = ent->fcnt;
    292292      if (p)
    293293    total += BIO_Bblock_Bound (N, p);
    … …  
    302302
    303303static void
    304 dump_dict (unsigned long mem)
     304dump_dict (mg_u_long mem)
    305305{
    306306  int i;
    … …  
    367367      /* Search the hash table for Word */
    368368      {
    369     register unsigned long hashval, step;
     369    register mg_u_long hashval, step;
    370370    register int hsize = HashSize;
    371371    HASH (hashval, step, Word, hsize);
    … …  
    464464    {
    465465      hash_rec **ht;
    466       unsigned long size;
    467       unsigned long i;
     466      mg_u_long size;
     467      mg_u_long i;
    468468      size = prime (HashSize * 2);
    469469      if (!(ht = Xmalloc (sizeof (hash_rec *) * size)))
    … …  
    480480        register u_char *wptr;
    481481        hash_rec *ent;
    482         register unsigned long hashval, step;
     482        register mg_u_long hashval, step;
    483483
    484484        wptr = HashTable[i]->word;
    … …  
    504504  if (ptrcnt >= checknum)
    505505    {
    506       unsigned long mem;
     506      mg_u_long mem;
    507507      /*fprintf(stderr, "Checking at %u . . . ", ptrcnt); */
    508508      mem = mem_reqd ();
    … …  
    617617      /* check for overflow */
    618618      if (L1_bits + L2_bits < oldL12_bits) {
    619     fprintf(stderr, "ERROR: Inverted file size will probably overflow %d byte unsigned integer\n", sizeof (mg_ullong));
     619    fprintf(stderr, "ERROR: Inverted file size will probably overflow %lu byte unsigned integer\n", sizeof (mg_ullong));
    620620    fprintf(stderr, "       counter in pass 2.\n");
    621621    if (sizeof (mg_ullong) < 8) {
    … …  
    659659write_stem_file (char *file_name)
    660660{
    661   long j;
     661  mg_s_long j;
    662662  struct invf_dict_header idh;
    663   long lookback = (1 << LOGLOOKBACK);   /* ???? */
    664   long totalbytes = 0;      /* The sum of the length of all words, including
     663  mg_s_long lookback = (1 << LOGLOOKBACK);  /* ???? */
     664  mg_s_long totalbytes = 0;     /* The sum of the length of all words, including
    665665                   the length byte */
    666   long indexstringbytes = 0;    /* The amount of space required to store the
     666  mg_s_long indexstringbytes = 0;   /* The amount of space required to store the
    667667                   words in the diction, this takes into account
    668668                   the prefixes */
    … …  
    706706    {
    707707      int i;
    708       unsigned long wcnt, fcnt;  /* [RPAP - Jan 97: Endian Ordering] */
     708      mg_u_long wcnt, fcnt;  /* [RPAP - Jan 97: Endian Ordering] */
    709709      hash_rec *ent = HashTable[j];
    710710      if (lastword != NULL)
    … …  
    750750write_codes (char *file_name)
    751751{
    752   unsigned long dicts = 0;
     752  mg_u_long dicts = 0;
    753753  outputbytes = 0;
    754754  write_stem_file (file_name);
    … …  
    805805    {
    806806      /* [RPAP - Jan 97: Endian Ordering] */
    807       unsigned long fnum;
     807      mg_u_long fnum;
    808808      HTONUL2(first_occur[i]->fnum, fnum);
    809       fwrite ((char *) &fnum, sizeof (unsigned long), 1, f);
     809      fwrite ((char *) &fnum, sizeof (mg_u_long), 1, f);
    810810    }
    811811#endif
    … …  
    837837    GAMMA_ENCODE (1);
    838838  ENCODE_DONE
    839     fseek (ic, sizeof (long), 0);
     839    fseek (ic, sizeof (mg_s_long), 0);
    840840 
    841841  HTONSL(max_mem);  /* [RPAP - Jan 97: Endian Ordering] */

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/ivf.pass2.c

    r16583 r25147  
    3939 * Revision 1.2  1997/08/02  05:01:57  wew
    4040 * changed literal values of 32 for the bit size of magic numbers of
    41  * files to sizeof (unsigned long) * 8, increased the gap at the start
     41 * files to sizeof (mg_u_long) * 8, increased the gap at the start
    4242 * of the invf during processing to 200 bytes
    4343
    … …  
    127127    struct stat file_state;\
    128128    fstat(fileno(invf_out), &file_state);\
    129     Message("len(invf) = %ld", file_state.st_size);\
     129    Message("len(invf) = %d", file_state.st_size);\
    130130  }while(0)
    131131
    132132typedef struct word_rec
    133133  {
    134     unsigned long ptr;
    135     unsigned long last;
     134    mg_u_long ptr;
     135    mg_u_long last;
    136136  }
    137137word_rec;
    … …  
    141141    mg_ullong Disk_Ptr;
    142142    mg_ullong Disk_Last;
    143     unsigned long Disk_B;
     143    mg_u_long Disk_B;
    144144  }
    145145invf_state_rec;
    … …  
    147147typedef struct chunk
    148148  {
    149     unsigned long start_doc;
    150     unsigned long params_pos;
    151     unsigned long disk_pos;
    152     unsigned long N;
     149    mg_u_long start_doc;
     150    mg_u_long params_pos;
     151    mg_u_long disk_pos;
     152    mg_u_long N;
    153153  }
    154154chunk;
    … …  
    175175
    176176static int docs_left = 0, next_docs_left = 0;
    177 static unsigned long N;
     177static mg_u_long N;
    178178
    179179static word_rec *WordRecs;
    … …  
    182182
    183183static char *MemoryBuffer = NULL;
    184 static unsigned long MemBufSize;
    185 static unsigned long BufToUse;
     184static mg_u_long MemBufSize;
     185static mg_u_long BufToUse;
    186186static struct invf_dict_header idh;
    187187
    188188static perf_hash_data *phd;
    189189
    190 static unsigned long *word_list = NULL;
    191 static unsigned long wl_size = 0;
    192 
    193 static unsigned long dict_size;
    194 static unsigned long no_of_ptrs = 0;
    195 static unsigned long chunks_read = 0;
    196 static unsigned long Disk_pos = 0;
    197 static unsigned long callnum = 0;
    198 static unsigned long wordnum = 0;
    199 
    200 static unsigned long totalIbytes = 0;
    201 static unsigned long totalDbytes = 0;
    202 static unsigned long totalHbytes = 0;
    203 
    204 static unsigned long MemInUse = 0;
    205 static unsigned long MaxMemInUse = 0;
    206 static unsigned long max_buffer_len;
     190static mg_u_long *word_list = NULL;
     191static mg_u_long wl_size = 0;
     192
     193static mg_u_long dict_size;
     194static mg_u_long no_of_ptrs = 0;
     195static mg_u_long chunks_read = 0;
     196static mg_u_long Disk_pos = 0;
     197static mg_u_long callnum = 0;
     198static mg_u_long wordnum = 0;
     199
     200static mg_u_long totalIbytes = 0;
     201static mg_u_long totalDbytes = 0;
     202static mg_u_long totalHbytes = 0;
     203
     204static mg_u_long MemInUse = 0;
     205static mg_u_long MaxMemInUse = 0;
     206static mg_u_long max_buffer_len;
    207207
    208208void
    … …  
    292292      return (COMPERROR);
    293293
    294   sprintf (FName, FILE_NAME_FORMAT ".%ld", get_basepath (), file_name,
    295        ".invf.state", (long) getpid ());  /* [RPAP - Feb 97: WIN32 Port] */
     294  sprintf (FName, FILE_NAME_FORMAT ".%d", get_basepath (), file_name,
     295       ".invf.state", (mg_s_long) getpid ());  /* [RPAP - Feb 97: WIN32 Port] */
    296296  if (!(invf_state = fopen (FName, "w+b")))  /* [RPAP - Feb 97: WIN32 Port] */
    297297    {
    … …  
    301301  unlink (FName);
    302302
    303   sprintf (FName, FILE_NAME_FORMAT ".%ld", get_basepath (), file_name,
    304        ".chunk.state", (long) getpid ());  /* [RPAP - Feb 97: WIN32 Port] */
     303  sprintf (FName, FILE_NAME_FORMAT ".%d", get_basepath (), file_name,
     304       ".chunk.state", (mg_s_long) getpid ());  /* [RPAP - Feb 97: WIN32 Port] */
    305305  if (!(chunk_state = fopen (FName, "w+b")))  /* [RPAP - Feb 97: WIN32 Port] */
    306306    {
    … …  
    312312  ChangeMemInUse (RND_BUF_SIZE);
    313313
    314   sprintf (FName, FILE_NAME_FORMAT ".%ld", get_basepath (), file_name,
    315        ".chunks", (long) getpid ());  /* [RPAP - Feb 97: WIN32 Port] */
     314  sprintf (FName, FILE_NAME_FORMAT ".%d", get_basepath (), file_name,
     315       ".chunks", (mg_s_long) getpid ());  /* [RPAP - Feb 97: WIN32 Port] */
    316316  if (!(chunks = fopen (FName, "w+b")))  /* [RPAP - Feb 97: WIN32 Port] */
    317317    {
    … …  
    329329
    330330#define ISR_CACHE 1024
    331 #define ISR_ENTRY_SIZE (sizeof(mg_ullong)*2 + sizeof(unsigned long))
     331#define ISR_ENTRY_SIZE (sizeof(mg_ullong)*2 + sizeof(mg_u_long))
    332332
    333333invf_state_rec *
    … …  
    360360
    361361
    362 unsigned long
    363 occur_to_lexical (long occ, int clear_state)
    364 {
    365   static long pos = -1;
     362mg_u_long
     363occur_to_lexical (mg_s_long occ, int clear_state)
     364{
     365  static mg_s_long pos = -1;
    366366  static random_bitio_state rbs;
    367367  static int val = 0;
    … …  
    383383      return 0;
    384384    }
    385       BIO_Random_Seek_X (sizeof (unsigned long) * 8, &rbs);
     385      BIO_Random_Seek_X (sizeof (mg_u_long) * 8, &rbs);
    386386      pos = 0;
    387387    }
    … …  
    396396
    397397void
    398 add_chunk_state (unsigned long pos, unsigned long start_doc,
    399          unsigned long N)
     398add_chunk_state (mg_u_long pos, mg_u_long start_doc,
     399         mg_u_long N)
    400400{
    401401  chunk_data[chunks_read].params_pos = pos;
    … …  
    448448  totalHbytes = sizeof (perf_hash_data) + sizeof (u_char) * 256 +
    449449    sizeof (int) * (phd->MAX_N + 1) + sizeof (int *) * 3 * phd->MAX_CH +
    450     sizeof (long) * phd->MAX_CH * phd->MAX_L;
     450    sizeof (mg_s_long) * phd->MAX_CH * phd->MAX_L;
    451451
    452452  if (!(WordRecs = Xmalloc (sizeof (word_rec) * idh.dict_size)))
    … …  
    488488  totalDbytes += sizeof (chunk) * (ChunkLimit + 2);
    489489
    490   totalIbits = sizeof (unsigned long) * 8;      /* The magic number */
     490  totalIbits = sizeof (mg_u_long) * 8;      /* The magic number */
    491491  totalIbits += 8 * 200;    /* A 200 byte gap */
    492492
    … …  
    506506    {
    507507      invf_state_rec *isr;
    508       register unsigned long copy, suff, p;
    509       unsigned long fcnt, wcnt;
     508      register mg_u_long copy, suff, p;
     509      mg_u_long fcnt, wcnt;
    510510
    511511      lasttotalIbits = totalIbits;
    … …  
    551551
    552552      if (totalIbits < lasttotalIbits) {
    553     fprintf(stderr, "ERROR: The totalIbits counter (%d byte unsigned integer) has overflowed.\n", sizeof (mg_ullong));
     553    fprintf(stderr, "ERROR: The totalIbits counter (%lu byte unsigned integer) has overflowed.\n", sizeof (mg_ullong));
    554554    if (sizeof (mg_ullong) < 8) {
    555555      fprintf(stderr, "       Try compiling with GCC to enable use of 8 bytes for this counter.\n");
    … …  
    578578LoadCounts (void)
    579579{
    580   unsigned long numwords, i, last_total;
    581   static unsigned long local_N = 0;
    582   unsigned long totalIbits, crbs_pos;
     580  mg_u_long numwords, i, last_total;
     581  static mg_u_long local_N = 0;
     582  mg_u_long totalIbits, crbs_pos;
    583583  word_rec *wr;
    584   unsigned long *counts;
     584  mg_u_long *counts;
    585585
    586586  if (MemoryBuffer == NULL)
    587587    {
    588       MemBufSize = sizeof (unsigned long) * dict_size;
     588      MemBufSize = sizeof (mg_u_long) * dict_size;
    589589      if (max_buffer_len > MemBufSize)
    590590    MemBufSize = max_buffer_len;
    … …  
    593593      ChangeMemInUse (MemBufSize);
    594594    }
    595   counts = (unsigned long *) MemoryBuffer;
    596 /*   bzero ((char *) counts, sizeof (unsigned long) * dict_size); */
     595  counts = (mg_u_long *) MemoryBuffer;
     596/*   bzero ((char *) counts, sizeof (mg_u_long) * dict_size); */
    597597  bzero ((char *) counts, MemBufSize);
    598598  docs_left = next_docs_left;
    … …  
    613613  for (i = 0; i < numwords; i++)
    614614    {
    615       unsigned long word_num, wcnt, fcnt, p;
     615      mg_u_long word_num, wcnt, fcnt, p;
    616616      word_num = occur_to_lexical (i,0);
    617617     
    … …  
    628628      if (wcnt)
    629629    {
    630       register unsigned long length;
     630      register mg_u_long length;
    631631      counts[word_num] = p;
    632632      length = BIO_Bblock_Bound (local_N, p);
    … …  
    644644  for (wr = WordRecs, i = 0; i < dict_size; i++, wr++)
    645645    {
    646       register unsigned long length;
     646      register mg_u_long length;
    647647      length = wr->ptr;
    648648      wr->last = callnum;
    … …  
    688688  random_bitio_state *rbsi;
    689689  random_bitio_state *chks = NULL;
    690   unsigned long *chunk_ptrs;
     690  mg_u_long *chunk_ptrs;
    691691  int i;
    692692
    693693  BIO_Random_Flush (&crbs);
    694694
    695   chunk_ptrs = Xmalloc (chunks_read * sizeof (unsigned long));
    696   ChangeMemInUse (chunks_read * sizeof (unsigned long));
    697   bzero ((char *) chunk_ptrs, chunks_read * sizeof (unsigned long));
     695  chunk_ptrs = Xmalloc (chunks_read * sizeof (mg_u_long));
     696  ChangeMemInUse (chunks_read * sizeof (mg_u_long));
     697  bzero ((char *) chunk_ptrs, chunks_read * sizeof (mg_u_long));
    698698
    699699  rbsi = Xmalloc (chunks_read * sizeof (random_bitio_state));
    … …  
    752752          for (k = 0; k < p; k++)
    753753            {
    754               register unsigned long x, tf;
     754              register mg_u_long x, tf;
    755755              BBLOCK_DECODE (x, b);
    756756              if (k == 0)
    … …  
    775775          for (k = 0; k < p; k++)
    776776            {
    777               register unsigned long x, tf;
     777              register mg_u_long x, tf;
    778778              x = BIO_Random_Bblock_Decode (b, Chks, NULL);
    779779              if (k == 0)
    … …  
    816816/*   chunks_read = 0; */
    817817  Xfree (chunk_ptrs);
    818   ChangeMemInUse (-chunks_read * sizeof (unsigned long));
     818  ChangeMemInUse (-chunks_read * sizeof (mg_u_long));
    819819  chunks_read = 0;
    820820  Disk_pos = 0;
    … …  
    860860  int res;
    861861  u_char *end = s_in + l_in - 1;
    862   unsigned long tocode;
    863   unsigned long wl_pos = 0;
     862  mg_u_long tocode;
     863  mg_u_long wl_pos = 0;
    864864
    865865  if (!docs_left)
    … …  
    934934      if (wl_pos)
    935935    {
    936       unsigned long *wl = word_list;
    937       unsigned long i, count, val;
     936      mg_u_long *wl = word_list;
     937      mg_u_long i, count, val;
    938938      qsort (wl, wl_pos, sizeof (*wl), wl_comp);
    939939      count = 1;
    … …  
    999999
    10001000static void
    1001 stats (unsigned long len)
     1001stats (mg_u_long len)
    10021002{
    10031003#ifndef SILENT
    … …  
    10291029done_ivf_2 (char *FileName)
    10301030{
    1031   long i;
     1031  mg_s_long i;
    10321032  mg_ullong totalIbits;
    1033   unsigned long invf_len;
    1034   unsigned long bytes_output;
     1033  mg_u_long invf_len;
     1034  mg_u_long bytes_output;
    10351035  struct invf_file_header ifh;
    10361036
    … …  
    10541054  invf_len = ftell (invf);
    10551055
    1056   fseek (invf_out, sizeof (long), 0);
     1056  fseek (invf_out, sizeof (mg_s_long), 0);
    10571057  /* [RPAP - Jan 97: Endian Ordering] */
    10581058  HTONUL2(dict_size, ifh.no_of_words);
    … …  
    10651065  bytes_output = ftell (invf_out);
    10661066
    1067   totalIbits = sizeof (unsigned long) * 8;      /* The magic number */
     1067  totalIbits = sizeof (mg_u_long) * 8;      /* The magic number */
    10681068  totalIbits += 8 * 200;    /* A 200 byte gap */
    10691069
    10701070  /* find the right place in the file to start reading p values */
    1071   fseek (dict, sizeof (unsigned long) + sizeof (struct invf_dict_header), 0);
     1071  fseek (dict, sizeof (mg_u_long) + sizeof (struct invf_dict_header), 0);
    10721072  for (i = 0; i < dict_size; i++)
    10731073    {
    10741074      invf_state_rec *isr;
    1075       unsigned long fcnt, wcnt, s, e;
    1076       register unsigned long p;
     1075      mg_u_long fcnt, wcnt, s, e;
     1076      register mg_u_long p;
    10771077      u_char dummy1, dummy2[MAXSTEMLEN + 1];
    10781078
    … …  
    11471147  {
    11481148    char *temp_str = msg_prefix;
    1149     unsigned long total;
     1149    mg_u_long total;
    11501150    msg_prefix = "ivf.pass2";
    11511151    stats (invf_len);

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/lists.h

    r16583 r25147  
    3232    float Weight;
    3333    int DocNum;
    34     unsigned long SeekPos;  /* position in the text file in bytes */
    35     unsigned long Len;      /* length of the document in bytes */
     34    mg_u_long SeekPos;  /* position in the text file in bytes */
     35    mg_u_long Len;      /* length of the document in bytes */
    3636    char *CompTextBuffer;
    3737    struct DocEntry *Next;

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/locallib.c

    r16583 r25147  
    100100
    101101int
    102 huffcodebits (unsigned long *A, int n)
     102huffcodebits (mg_u_long *A, int n)
    103103{
    104104  int i, j, tot = 0, bits = 0, v1, v2, *B;
    … …  
    136136
    137137int
    138 modelbits (unsigned long *A, int n)
     138modelbits (mg_u_long *A, int n)
    139139{
    140140  int i, bits = 0, last, N = 0;
    … …  
    185185
    186186int
    187 Read_cdh (FILE * f, compression_dict_header * cdh, u_long * mem,
    188       u_long * disk)
     187Read_cdh (FILE * f, compression_dict_header * cdh, mg_u_long * mem,
     188      mg_u_long * disk)
    189189{
    190190  if (disk)
    … …  
    212212
    213213int
    214 F_Read_cdh (File * f, compression_dict_header * cdh, u_long * mem,
    215         u_long * disk)
     214F_Read_cdh (File * f, compression_dict_header * cdh, mg_u_long * mem,
     215        mg_u_long * disk)
    216216{
    217217  if (disk)
    … …  
    239239
    240240int
    241 Read_cfh (FILE * f, comp_frags_header * cfh, u_long * mem, u_long * disk)
     241Read_cfh (FILE * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk)
    242242{
    243243  int i;  /* [RPAP - Jan 97: Endian Ordering] */
    … …  
    274274
    275275int
    276 F_Read_cfh (File * f, comp_frags_header * cfh, u_long * mem, u_long * disk)
     276F_Read_cfh (File * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk)
    277277{
    278278  int i;  /* [RPAP - Jan 97: Endian Ordering] */

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/locallib.h

    r16583 r25147  
    3333int vecentropy (int *A, int n);
    3434
    35 int huffcodebits (unsigned long *A, int n);
     35int huffcodebits (mg_u_long *A, int n);
    3636
    37 int modelbits (unsigned long *A, int n);
     37int modelbits (mg_u_long *A, int n);
    3838
    3939int prime (int p);
    4040
    4141
    42 int Read_cdh (FILE * f, compression_dict_header * cdh, u_long * mem, u_long * disk);
     42int Read_cdh (FILE * f, compression_dict_header * cdh, mg_u_long * mem, mg_u_long * disk);
    4343
    44 int Read_cfh (FILE * f, comp_frags_header * cfh, u_long * mem, u_long * disk);
     44int Read_cfh (FILE * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk);
    4545
    46 int F_Read_cdh (File * f, compression_dict_header * cdh, u_long * mem,
    47         u_long * disk);
     46int F_Read_cdh (File * f, compression_dict_header * cdh, mg_u_long * mem,
     47        mg_u_long * disk);
    4848
    49 int F_Read_cfh (File * f, comp_frags_header * cfh, u_long * mem, u_long * disk);
     49int F_Read_cfh (File * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk);
    5050
    5151

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_compression_dict.c

    r16583 r25147  
    4141#include "mg.h"
    4242
    43 #define MAXBITS (sizeof(unsigned long) * 8)
     43#define MAXBITS (sizeof(mg_mg_u_long) * 8)
    4444
    4545/*
    … …  
    9898typedef struct WordData
    9999  {
    100     u_long freq, occur_num;
     100    mg_u_long freq, occur_num;
    101101    float saving;
    102102    float char_bit_cost;
    103     u_long num_trans;
     103    mg_u_long num_trans;
    104104    u_char *word;
    105105  }
    … …  
    107107
    108108static WordData *Words[2];
    109 static u_long Num[2];
    110 static u_long chars[2];
     109static mg_u_long Num[2];
     110static mg_u_long chars[2];
    111111
    112112#define KIND(p) (((p) >= Words[0] && (p) < Words[0] + Num[0]) ? 0 : 1)
    … …  
    118118  {
    119119    WordData **wd;
    120     u_long num_wds;
    121     u_long chars;
     120    mg_u_long num_wds;
     121    mg_u_long chars;
    122122  }
    123123DictData;
    … …  
    129129
    130130static char *file_name = "";
    131 static u_long novel_method = MG_NOVEL_HUFFMAN_CHARS;
     131static mg_u_long novel_method = MG_NOVEL_HUFFMAN_CHARS;
    132132
    133133
    … …  
    136136static void Method3 (int k);
    137137static void Select_all (void);
    138 static u_long WriteOutWords (char *, u_long, int);
     138static mg_u_long WriteOutWords (char *, mg_u_long, int);
    139139static int DecFreqIncWL (void *a, void *b);
    140140static int OccuranceOrder (void *a, void *b);
    … …  
    150150  int lookback = 2;
    151151  double k = 0;
    152   u_long mem_reqd;
     152  mg_u_long mem_reqd;
    153153  opterr = 0;
    154154  msg_prefix = argv[0];
    … …  
    264264{
    265265  FILE *f;
    266   unsigned long i;
     266  mg_u_long i;
    267267  f = open_file (filename, TEXT_STATS_DICT_SUFFIX, "rb",
    268268         MAGIC_STATS_DICT, MG_ABORT);  /* [RPAP - Feb 97: WIN32 Port] */
    … …  
    468468CalcCharCounts (WordData ** wd, int num,
    469469        char *char_lens[2], char *len_lens[2],
    470         u_long escape[2])
    471 {
    472   long char_freqs[2][256];
    473   long len_freqs[2][16];
     470        mg_u_long escape[2])
     471{
     472  mg_u_long char_freqs[2][256];
     473  mg_u_long len_freqs[2][16];
    474474  huff_data hd;
    475475  int i;
    … …  
    480480  for (i = 0; i < num; i++, wd++)
    481481    {
    482       u_long freq = (*wd)->freq;
     482      mg_u_long freq = (*wd)->freq;
    483483      u_char *buf = (*wd)->word;
    484484      int len = *buf++;
    … …  
    487487      escape[idx] += freq;
    488488      for (; len; len--, buf++)
    489     char_freqs[idx][(u_long) (*buf)] += freq;
     489    char_freqs[idx][(mg_u_long) (*buf)] += freq;
    490490    }
    491491  Generate_Huffman_Data (256, char_freqs[0], &hd, NULL);
    … …  
    511511CalcBitCost (WordData ** discard_word, int discard_num,
    512512         WordData ** keep_word, int keep_num, double freqs_trans[2],
    513          u_long escape[2], int num_trans)
     513         mg_u_long escape[2], int num_trans)
    514514{
    515515  char *char_lens[2];
    … …  
    525525      u_char *buf = (*discard_word)->word;
    526526      int len = *buf++;
    527       u_long freq = (*discard_word)->freq;
     527      mg_u_long freq = (*discard_word)->freq;
    528528      int idx = KIND (*discard_word);
    529529
    530530      cbc = len_lens[idx][len];
    531531      for (; len; len--, buf++)
    532     cbc += char_lens[idx][(u_long) (*buf)];
     532    cbc += char_lens[idx][(mg_u_long) (*buf)];
    533533
    534534      (*discard_word)->char_bit_cost = (cbc + esc[idx]) * freq;
    … …  
    546546      u_char *buf = (*keep_word)->word;
    547547      int len = *buf++;
    548       u_long freq = (*keep_word)->freq;
     548      mg_u_long freq = (*keep_word)->freq;
    549549      int idx = KIND (*keep_word);
    550550
    551551      cbc = len_lens[idx][len];
    552552      for (; len; len--, buf++)
    553     cbc += char_lens[idx][(u_long) (*buf)];
     553    cbc += char_lens[idx][(mg_u_long) (*buf)];
    554554
    555555      (*keep_word)->char_bit_cost = (cbc + esc[idx]) * freq;
    … …  
    578578  int recalcs = 0;
    579579  double freqs_trans[2], total;
    580   u_long escape[2];
     580  mg_u_long escape[2];
    581581  WordData **keep_heap, **discard_heap;
    582582
    … …  
    831831
    832832
    833 static u_long
     833static mg_u_long
    834834Write_data (FILE * f, DictData * dd, int lookback)
    835835{
    836   u_long mem_reqd;
     836  mg_u_long mem_reqd;
    837837  huff_data *hd;
    838838  int i;
    839   u_long us = dd->num_wds;
    840   long *freqs;
    841   u_long huff_words_size[MAX_HUFFCODE_LEN + 1];
    842   u_long lencounts[MAX_HUFFCODE_LEN + 1];
     839  mg_u_long us = dd->num_wds;
     840  mg_s_long *freqs;
     841  mg_u_long huff_words_size[MAX_HUFFCODE_LEN + 1];
     842  mg_u_long lencounts[MAX_HUFFCODE_LEN + 1];
    843843  u_char *lastword[MAX_HUFFCODE_LEN + 1];
    844844
    … …  
    932932{
    933933  int j;
    934   long freqs[256];
     934  mg_s_long freqs[256];
    935935  WordData **wd = dd->wd;
    936936  huff_data *hd;
    … …  
    943943      int len = *buf++;
    944944      for (; len; len--, buf++)
    945     freqs[(u_long) (*buf)] += (*wd)->freq;
     945    freqs[(mg_u_long) (*buf)] += (*wd)->freq;
    946946    }
    947947
    … …  
    968968{
    969969  int j;
    970   long freqs[16];
     970  mg_s_long freqs[16];
    971971  WordData **wd = dd->wd;
    972972  huff_data *hd;
    … …  
    995995
    996996
    997 static u_long
    998 WriteOutWords (char *file_name, u_long type, int lookback)
     997static mg_u_long
     998WriteOutWords (char *file_name, mg_u_long type, int lookback)
    999999{
    10001000  FILE *f;
    10011001  int i;
    1002   u_long mem_reqd = 0;
     1002  mg_u_long mem_reqd = 0;
    10031003
    10041004  compression_dict_header cdh;

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_decompress_text.c

    r16583 r25147  
    3434
    3535  int ch;
    36   unsigned long start, finish, len;
    37   u_long total_chars = 0;
     36  mg_u_long start, finish, len;
     37  mg_u_long total_chars = 0;
    3838  u_char *c_buffer = 0;
    3939  int buf_len = -1;
    … …  
    4242  compression_dict *cd = NULL;
    4343  compressed_text_header cth;
    44   u_long doc;
     44  mg_u_long doc;
    4545  int count;
    4646  char *filename = "";
    … …  
    161161
    162162#if 0
    163   printf ("\n#Total chars output = %lu\n", total_chars);
     163  printf ("\n#Total chars output = %u\n", total_chars);
    164164#endif
    165165

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_fast_comp_dict.c

    r16583 r25147  
    9191
    9292
    93 static u_long mem_for_comp_dict (char *filename);
     93static mg_u_long mem_for_comp_dict (char *filename);
    9494static void load_comp_dict (char *filename);
    9595static void save_fast_dict (char *filename);
    … …  
    100100static void *cur;
    101101static u_char *fixup;
    102 static u_long mem, fixup_mem;
     102static uintptr_t mem, fixup_mem;
    103103
    104104int main (int argc, char **argv)
    … …  
    142142  Message ("Actual memory for fast_dict %u", (char *) cur - (char *) buffer);
    143143
    144   if ((u_long) cur > (u_long) buffer + mem)
     144  if ((uintptr_t) cur > (uintptr_t) buffer + mem)
    145145    FatalError (1, "The buffer was not big enough for the dictionary");
    146146
    … …  
    211211unfixup_buffer ()
    212212{
    213   u_long *p;
    214   for (p = buffer; (u_long) p < (u_long) cur; p++)
     213  uintptr_t *p;
     214  for (p = buffer; (uintptr_t) p < (uintptr_t) cur; p++)
    215215    {
    216216      if (IS_FIXUP (p))
    217     *p = *p - (u_long) buffer;
    218     }
    219 }
    220 
    221 
    222 
    223 
    224 static u_long
     217    *p = *p - (uintptr_t) buffer;
     218    }
     219}
     220
     221
     222
     223
     224static mg_u_long
    225225mem_for_aux_dict (compression_dict_header * cdh, char *filename)
    226226{
    227227  int i;
    228   u_long mem = sizeof (auxiliary_dict);
     228  mg_u_long mem = sizeof (auxiliary_dict);
    229229  FILE *aux;
    230230
    … …  
    249249
    250250
    251 static u_long
     251static mg_u_long
    252252mem_for_words (FILE * dict, compression_dict_header * cdh,
    253253           comp_frags_header * cfh)
    254254{
    255   u_long mem = 0;
    256   u_long i, lookback;
     255  mg_u_long mem = 0;
     256  mg_u_long i, lookback;
    257257  int ptrs_reqd = 0;
    258258  int mem_reqd = 0;
    … …  
    282282
    283283
    284 static u_long
     284static mg_u_long
    285285mem_for_comp_dict (char *filename)
    286286{
    287   u_long mem = sizeof (compression_dict);
     287  mg_u_long mem = sizeof (compression_dict);
    288288  compression_dict_header cdh;
    289289  comp_frags_header cfh;
    … …  
    343343      if (hd.clens)
    344344        Xfree (hd.clens);
    345       mem += hd.num_codes * sizeof (unsigned long);
    346       mem += (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *);
     345      mem += hd.num_codes * sizeof (mg_u_long);
     346      mem += (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *);
    347347
    348348      mem += sizeof (hd);
    … …  
    350350      if (hd.clens)
    351351        Xfree (hd.clens);
    352       mem += hd.num_codes * sizeof (unsigned long);
    353       mem += (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *);
     352      mem += hd.num_codes * sizeof (mg_u_long);
     353      mem += (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *);
    354354    }
    355355    break;
    … …  
    377377          if (hd.clens)
    378378        Xfree (hd.clens);
    379           mem += hd.num_codes * sizeof (unsigned long);
    380           mem += (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *);
     379          mem += hd.num_codes * sizeof (mg_u_long);
     380          mem += (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *);
    381381
    382382          mem += sizeof (hd);
    … …  
    384384          if (hd.clens)
    385385        Xfree (hd.clens);
    386           mem += hd.num_codes * sizeof (unsigned long);
    387           mem += (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *);
     386          mem += hd.num_codes * sizeof (mg_u_long);
     387          mem += (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *);
    388388          break;
    389389        case MG_NOVEL_BINARY:
    … …  
    413413
    414414void *
    415 getmem (u_long size, int align)
     415getmem (mg_u_long size, int align)
    416416{
    417417  void *res;
    418   cur = (void *) (((u_long) cur + (align - 1)) & (~(align - 1)));
     418  cur = (void *) (((uintptr_t) cur + (align - 1)) & (~(align - 1)));
    419419  res = cur;
    420420  cur = (char *) cur + size;
    421   if ((long) cur > (long) buffer + mem)
     421  if ((intptr_t) cur > (intptr_t) buffer + mem)
    422422    FatalError (1, "The buffer was not big enough for the dictionary");
    423423  return res;
    … …  
    592592
    593593
    594 static unsigned long **
    595 Generate_Fast_Huffman_Vals (huff_data * data, u_long * mem)
     594static mg_u_long **
     595Generate_Fast_Huffman_Vals (huff_data * data, mg_u_long * mem)
    596596{
    597597  int i;
    598   unsigned long *fcode[MAX_HUFFCODE_LEN + 1];
    599   unsigned long **values;
    600   unsigned long *vals;
     598  mg_u_long *fcode[MAX_HUFFCODE_LEN + 1];
     599  mg_u_long **values;
     600  mg_u_long *vals;
    601601
    602602  if (!data)
    603603    return (NULL);
    604   vals = getmem (data->num_codes * sizeof (*vals), sizeof (long *));
    605   values = getmem ((MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *),
    606            sizeof (long *));
    607 
    608   bzero ((char *) values, (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *));
     604  vals = getmem (data->num_codes * sizeof (*vals), sizeof (mg_s_long *));
     605  values = getmem ((MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *),
     606           sizeof (mg_s_long *));
     607
     608  bzero ((char *) values, (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *));
    609609
    610610  if (mem)
    611611    *mem += data->num_codes * sizeof (*vals) +
    612       (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *);
     612      (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *);
    613613
    614614  fcode[0] = values[0] = &vals[0];
    … …  
    661661    {
    662662      huff_data *hd;
    663       u_long **vals;
     663      mg_u_long **vals;
    664664      if (cd->cdh.num_words[which])
    665665        {
    … …  
    702702    {
    703703      huff_data *hd;
    704       u_long **vals;
     704      mg_u_long **vals;
    705705      if (cd->cdh.num_words[which])
    706706        {
    … …  
    776776
    777777  {
    778     u_long *p;
    779     for (p = buffer; (u_long) p < (u_long) cur; p++)
     778    uintptr_t *p;
     779    for (p = buffer; (uintptr_t) p < (uintptr_t) cur; p++)
    780780      {
    781781    if (IS_FIXUP (p))

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_files.c

    r16583 r25147  
    110110FILE *
    111111open_named_file (const char *name, const char *mode,
    112          u_long magic_num, int err_mode)
    113 {
    114   unsigned long magic;
     112         mg_u_long magic_num, int err_mode)
     113{
     114  mg_u_long magic;
    115115  FILE *f = NULL;
    116116  char *err;
    … …  
    172172FILE *
    173173open_file (const char *name, const char *suffix, const char *mode,
    174        u_long magic_num, int err_mode)
     174       mg_u_long magic_num, int err_mode)
    175175{
    176176  char path[512];
    … …  
    200200FILE *
    201201create_named_file (const char *name, const char *mode,
    202            u_long magic_num, int err_mode)
     202           mg_u_long magic_num, int err_mode)
    203203{
    204204  FILE *f = NULL;
    … …  
    252252FILE *
    253253create_file (const char *name, const char *suffix, const char *mode,
    254          u_long magic_num, int err_mode)
     254         mg_u_long magic_num, int err_mode)
    255255{
    256256  char path[512];

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_files.h

    r16583 r25147  
    2929/* Magic numbers for the different types of files */
    3030
    31 #define GEN_MAGIC(a,b,c,d) ((unsigned long)(((a)<<24) + ((b)<<16) + \
     31#define GEN_MAGIC(a,b,c,d) ((mg_u_long)(((a)<<24) + ((b)<<16) + \
    3232                        ((c)<<8) + (d)))
    3333
    … …  
    5555#define MAGIC_STEM_3            GEN_MAGIC('M','G','s','3')
    5656
    57 #define IS_MAGIC(a) ((((u_long)(a)) & 0xffff0000) == MAGIC_XXXX)
     57#define IS_MAGIC(a) ((((mg_u_long)(a)) & 0xffff0000) == MAGIC_XXXX)
    5858
    5959
    … …  
    268268   an error message.   */
    269269FILE *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);
    271271
    272272
    … …  
    286286   an error message.   */
    287287FILE *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);
    289289
    290290
    … …  
    305305   an error message.   */
    306306FILE *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);
    308308
    309309
    … …  
    322322   an error message.   */
    323323FILE *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/mg/src/text/mg_invf_dict.c

    r16583 r25147  
    115115{
    116116  FILE *id, *idb, *tmp, *ii;
    117   unsigned long i, pos, num, First_word, invf_ptr, invf_len;
    118   unsigned long last_ptr = 0;
     117  mg_u_long i, pos, num, First_word, invf_ptr, invf_len;
     118  mg_u_long last_ptr = 0;
    119119  char *FName;
    120120  struct invf_dict_header idh;
    … …  
    179179  for (i = 0; i < idh.dict_size; i++)
    180180    {
    181       register unsigned long extra, copy, suff;
    182       unsigned long wcnt, fcnt;
     181      register mg_u_long extra, copy, suff;
     182      mg_u_long wcnt, fcnt;
    183183
    184184      /* build a new word on top of prev */
    … …  
    304304
    305305  rewind (tmp);
    306   sdh.blocks_start = sdh.index_chars + sizeof (u_long) + sizeof (sdh) +
     306  sdh.blocks_start = sdh.index_chars + sizeof (mg_u_long) + sizeof (sdh) +
    307307    sdh.num_blocks * sizeof (pos);
    308308  if (force)
    … …  
    323323
    324324  /* skip over the magic number */
    325   fseek (idb, sizeof (u_long), 0);
     325  fseek (idb, sizeof (mg_u_long), 0);
    326326
    327327  /* [RPAP - Jan 97: Endian Ordering] */

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_invf_dump.c

    r16583 r25147  
    3636#include "invf.h"
    3737
    38 extern unsigned long S_btg;
     38extern mg_u_long S_btg;
    3939
    4040/*
    … …  
    124124process_files (char *name)
    125125{
    126   unsigned long N, Nstatic, k;
     126  mg_u_long N, Nstatic, k;
    127127  FILE *dict;
    128128  FILE *invf;
    … …  
    172172    }
    173173  else
    174     printf ("%ld %ld\n", N, ifh.no_of_words);
     174    printf ("%d %d\n", N, ifh.no_of_words);
    175175  for (k = 0; k < ifh.no_of_words; k++)
    176176    {
    177177      int i, blk, doc;
    178       register unsigned long suff, prefix;
    179       unsigned long fcnt, wcnt;
     178      register mg_u_long suff, prefix;
     179      mg_u_long fcnt, wcnt;
    180180      char term[MAXSTEMLEN + 1];
    181181
    … …  
    196196    {
    197197      if (term_dump)
    198         printf ("%ld    \"%s\"\n", fcnt, term);
     198        printf ("%d    \"%s\"\n", fcnt, term);
    199199      else
    200         printf ("%ld\n", fcnt);
     200        printf ("%d\n", fcnt);
    201201    }
    202202      blk = BIO_Bblock_Init (Nstatic, fcnt);
    … …  
    215215          GAMMA_DECODE (count);
    216216          if (word_counts)
     217        {
    217218        if (binary)
     219          {
    218220          fwrite ((char *) &count, sizeof (count), 1, stdout);
     221          }
    219222        else
     223          {
    220224          printf (" %d", count);
     225          }
     226        }
    221227        }
    222228      if (!binary)

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_invf_merge.c

    r16583 r25147  
    5858    struct invf_dict_header idh;
    5959    struct invf_file_header ifh;
    60     u_long nDocs;
     60    mg_u_long nDocs;
    6161
    6262    /* Lexicon processing variables */
    63     u_long fcnt, wcnt;
     63    mg_u_long fcnt, wcnt;
    6464    int suff, pref;
    6565    unsigned char term[MAXSTEMLEN + 1];
    66     u_long term_count;
     66    mg_u_long term_count;
    6767    int done;
    6868
    6969    /* Variables used for merging */
    7070    struct stdio_bitio_state sbs;   /* for bit-based I/O on inverted files */
    71     u_long nTerms;      /* = number of invf entries */
     71    mg_u_long nTerms;       /* = number of invf entries */
    7272    int *fcntlist;      /* store fcnt values read in from the lexicons */
    7373
    … …  
    8181
    8282merge_info m[3];        /*  m[OLD], m[NEW] and m[MERGE] */
    83 u_long magicsize;       /* how big is magic number? currently always 4 */
    84 u_long Nstatic;         /* static # of documents in file */
     83mg_u_long magicsize;        /* how big is magic number? currently always 4 */
     84mg_u_long Nstatic;          /* static # of documents in file */
    8585
    8686float *DocWeightBuffer;
    … …  
    9797int fastMerge = 1;      /* True if fast merge selected. Default = true */
    9898
    99 u_long oldIdxValue;     /* stores last read value from m[OLD].idx
     99mg_u_long oldIdxValue;      /* stores last read value from m[OLD].idx
    100100                   Used to calculate entry lengths */
    101 u_long bytes_output;        /* for writing .invf.idx file */
    102 u_long oldOnlyBits = 0;     /* entries in old only */
    103 u_long oldMergeBits = 0;    /* entries in old that are merged with
     101mg_u_long bytes_output;     /* for writing .invf.idx file */
     102mg_u_long oldOnlyBits = 0;      /* entries in old only */
     103mg_u_long oldMergeBits = 0; /* entries in old that are merged with
    104104                   a new entry */
    105105
    … …  
    242242  m[OLD].idx = open_file (m[OLD].fname, INVF_IDX_SUFFIX, "rb",
    243243              MAGIC_INVI, MG_ABORT);
    244   fread (&oldIdxValue, sizeof (u_long), 1, m[OLD].idx);
     244  fread (&oldIdxValue, sizeof (mg_u_long), 1, m[OLD].idx);
    245245  NTOHUL(oldIdxValue);  /* [RPAP - Jan 97: Endian Ordering] */
    246246
    … …  
    280280 *=======================================================================*/
    281281void
    282 procEntry_slow (int tnum, int type, u_long oldN, u_long newN, u_long mergeN)
     282procEntry_slow (int tnum, int type, mg_u_long oldN, mg_u_long newN, mg_u_long mergeN)
    283283/*
    284284 *  Process an invf entry.
    … …  
    295295  int fcntNEW = m[NEW].fcntlist[tnum];
    296296  int inblk, outblk;
    297   u_long inbits = 0, outbits = 0;
     297  mg_u_long inbits = 0, outbits = 0;
    298298
    299299  /* write .invf.idx pointer */
    300300  HTONUL(bytes_output);  /* [RPAP - Jan 97: Endian Ordering] */
    301   fwrite (&bytes_output, sizeof (u_long), 1, m[MERGE].idx);
     301  fwrite (&bytes_output, sizeof (mg_u_long), 1, m[MERGE].idx);
    302302  NTOHUL(bytes_output);  /* [RPAP - Jan 97: Endian Ordering] */
    303303
    … …  
    383383 */
    384384{
    385   u_long newIdxValue, len = 0;
     385  mg_u_long newIdxValue, len = 0;
    386386
    387387  /* Calculate IFold entry length in bytes if not NEW type */
    388388  if (type != NEW)      /* read in an index number from m[OLD].idx */
    389389    {
    390       fread (&newIdxValue, sizeof (u_long), 1, m[OLD].idx);
     390      fread (&newIdxValue, sizeof (mg_u_long), 1, m[OLD].idx);
    391391      NTOHUL(newIdxValue);  /* [RPAP - Jan 97: Endian Ordering] */
    392392      len = newIdxValue - oldIdxValue;
    … …  
    400400      /* write .invf.idx pointer */
    401401      HTONUL(bytes_output);  /* [RPAP - Jan 97: Endian Ordering] */
    402       fwrite (&bytes_output, sizeof (u_long), 1, m[MERGE].idx);
     402      fwrite (&bytes_output, sizeof (mg_u_long), 1, m[MERGE].idx);
    403403      NTOHUL(bytes_output);  /* [RPAP - Jan 97: Endian Ordering] */
    404404
    … …  
    468468  m[x].term_count = m[x].term_count + 1;
    469469
    470   fread ((char *) &(m[x].fcnt), sizeof (u_long), 1, m[x].dict);
    471   fread ((char *) &(m[x].wcnt), sizeof (u_long), 1, m[x].dict);
     470  fread ((char *) &(m[x].fcnt), sizeof (mg_u_long), 1, m[x].dict);
     471  fread ((char *) &(m[x].wcnt), sizeof (mg_u_long), 1, m[x].dict);
    472472
    473473  /* [RPAP - Jan 97: Endian Ordering] */
    … …  
    620620  /* print some results about terms */
    621621  {
    622     fprintf (stderr, "   Terms: OLD = %ld,  NEW = %ld,  MERGE = %ld\n",
     622    fprintf (stderr, "   Terms: OLD = %d,  NEW = %d,  MERGE = %d\n",
    623623         m[OLD].nTerms, m[NEW].nTerms, m[MERGE].nTerms);
    624     fprintf (stderr, "   In OLD only: %ld,  In NEW only: %ld,  BOTH: %ld\n",
     624    fprintf (stderr, "   In OLD only: %d,  In NEW only: %d,  BOTH: %d\n",
    625625         (m[MERGE].nTerms - m[NEW].nTerms),
    626626         (m[MERGE].nTerms - m[OLD].nTerms),
    … …  
    645645    /* write final .invf.idx pointer */
    646646    HTONUL(bytes_output);  /* [RPAP - Jan 97: Endian Ordering] */
    647     fwrite (&bytes_output, sizeof (u_long), 1, m[MERGE].idx);
     647    fwrite (&bytes_output, sizeof (mg_u_long), 1, m[MERGE].idx);
    648648    NTOHUL(bytes_output);  /* [RPAP - Jan 97: Endian Ordering] */
    649649
    650     fprintf (stderr, "Old invf: old only bits: %ld, merged bits: %ld\n",
     650    fprintf (stderr, "Old invf: old only bits: %d, merged bits: %d\n",
    651651         oldOnlyBits, oldMergeBits);
    652652  }
    … …  
    729729      if (weightfile)
    730730    {
    731       u_long i;  /* [RPAP - Jan 97: Endian Ordering] */
    732 
    733       fprintf (stderr, "writing new weights: Nnew = %ld\n", m[NEW].nDocs);
     731      mg_u_long i;  /* [RPAP - Jan 97: Endian Ordering] */
     732
     733      fprintf (stderr, "writing new weights: Nnew = %d\n", m[NEW].nDocs);
    734734      fseek (weightfile, 0, 2); /* end of file */
    735735

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_invf_rebuild.c

    r16583 r25147  
    4343typedef struct invf_info
    4444  {
    45     unsigned long doc_num, count, bits_so_far, count_bits;
     45    mg_u_long doc_num, count, bits_so_far, count_bits;
    4646  }
    4747invf_info;
    … …  
    200200{
    201201  FILE *in, *out, *idx, *odx, *dict;
    202   unsigned long magic, outmode, N, in_k, out_k;
    203   unsigned long bits_out, bytes_out, i, j;
     202  mg_u_long magic, outmode, N, in_k, out_k;
     203  mg_u_long bits_out, bytes_out, i, j;
    204204  stdio_bitio_state out_buf, in_buf;
    205205  struct invf_dict_header idh;
    … …  
    351351  for (i = 0; i < ifh_in.no_of_words; i++)
    352352    {
    353       unsigned long blk, p;
    354       unsigned long odn_blk = 0, olen_blk = 0;
    355       unsigned long idn_blk = 0, ilen_blk = 0;
    356       register unsigned long suff;
    357       unsigned long fcnt, wcnt, doc_num, bits_so_far, last_major;
    358       unsigned long next_mjr_dn, kd;
     353      mg_u_long blk, p;
     354      mg_u_long odn_blk = 0, olen_blk = 0;
     355      mg_u_long idn_blk = 0, ilen_blk = 0;
     356      register mg_u_long suff;
     357      mg_u_long fcnt, wcnt, doc_num, bits_so_far, last_major;
     358      mg_u_long next_mjr_dn, kd;
    359359      char dummy2[MAXSTEMLEN + 1];
    360360      invf_info *ii;
    … …  
    380380    case 1:
    381381      {
    382         unsigned long len;
     382        mg_u_long len;
    383383        if (p <= ifh_out.params[0])
    384384          out_k = 0;
    … …  
    396396    case 2:
    397397      {
    398         unsigned long len;
     398        mg_u_long len;
    399399        if (p <= mins)
    400400          out_k = 0;
    … …  
    421421    case 1:
    422422      {
    423         unsigned long len;
     423        mg_u_long len;
    424424        if (p <= ifh_in.params[0])
    425425          in_k = 0;
    … …  
    437437    case 2:
    438438      {
    439         unsigned long len;
     439        mg_u_long len;
    440440        if (p <= ifh_in.params[1])
    441441          {
    … …  
    469469    for (j = 0; j < p; j++, kd++)
    470470    {
    471       unsigned long doc_diff, count = 0;
     471      mg_u_long doc_diff, count = 0;
    472472      if (kd == in_k)
    473473        kd = 0;

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_passes.c

    r16583 r25147  
    103103#define TERMRECORD  '\002'
    104104
    105 unsigned long buf_size = 3 * 1024 * 1024;   /* 3Mb */
    106 unsigned long invf_buffer_size = 5 * 1024 * 1024;   /* 5Mb */
    107 unsigned long ChunkLimit = 0;
     105mg_u_long buf_size = 3 * 1024 * 1024;   /* 3Mb */
     106mg_u_long invf_buffer_size = 5 * 1024 * 1024;   /* 5Mb */
     107mg_u_long ChunkLimit = 0;
    108108char InvfLevel = 2;
    109109char SkipSGML = 0;
    … …  
    117117
    118118static char Passes = 0;
    119 static unsigned long trace = 0;
     119static mg_u_long trace = 0;
    120120static int Dump = 0;
    121121static char **files = NULL;
    … …  
    181181#if 0
    182182static char *
    183 str_comma (unsigned long u)
     183str_comma (mg_u_long u)
    184184{
    185185  static char buf[20];
    186   unsigned long a, b, c, d;
     186  mg_u_long a, b, c, d;
    187187  a = u / 1000000000;
    188188  u -= a * 1000000000;
    … …  
    229229
    230230  char *buffer = Xmalloc (buf_size);
    231   unsigned long num_docs = 0;
    232   unsigned long block_bytes = 0;
     231  mg_u_long num_docs = 0;
     232  mg_u_long block_bytes = 0;
    233233  register int buf_left = buf_size;
    234234  register char *look_pos = buffer;
    … …  
    358358          }
    359359        if (Trace)
    360           fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs | %s\n",
     360          fprintf (Trace, "%11" ULL_FS " bytes |%7u docs | %s\n",
    361361               bytes_processed, num_docs,
    362362               ElapsedTime (&StartTime, NULL));
    … …  
    383383          mi = mallinfo ();
    384384          block_bytes -= trace;
    385           fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs |%7.3f Mb | %s\n",
     385          fprintf (Trace, "%11" ULL_FS " bytes |%7u docs |%7.3f Mb | %s\n",
    386386               bytes_processed, num_docs, mi.arena / 1024.0 / 1024.0,
    387387               ElapsedTime (&StartTime, NULL));
    388388#else
    389389          block_bytes -= trace;
    390           fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs | %s\n",
     390          fprintf (Trace, "%11" ULL_FS " bytes |%7u docs | %s\n",
    391391               bytes_processed, num_docs,
    392392               ElapsedTime (&StartTime, NULL));
    … …  
    439439      struct mallinfo mi;
    440440      mi = mallinfo ();
    441       fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs |%7.3f Mb | %s\n",
     441      fprintf (Trace, "%11" ULL_FS " bytes |%7u docs |%7.3f Mb | %s\n",
    442442           bytes_processed, num_docs, mi.arena / 1024.0 / 1024.0,
    443443           ElapsedTime (&StartTime, NULL));
    444444#else
    445       fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs | %s\n",
     445      fprintf (Trace, "%11" ULL_FS " bytes |%7u docs | %s\n",
    446446           bytes_processed, num_docs,
    447447           ElapsedTime (&StartTime, NULL));
    … …  
    563563      break;
    564564    case 't':
    565       trace = (unsigned long) (atof (optarg) * 1024 * 1024);
     565      trace = (mg_u_long) (atof (optarg) * 1024 * 1024);
    566566      break;
    567567    case 'M':

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_passes_4jni.c

    r16583 r25147  
    5757#define TERMRECORD  '\002'
    5858
    59 unsigned long buf_size = 3 * 1024 * 1024;   /* 3Mb */
    60 unsigned long invf_buffer_size = 5 * 1024 * 1024;   /* 5Mb */
    61 unsigned long ChunkLimit = 0;
     59mg_u_long buf_size = 3 * 1024 * 1024;   /* 3Mb */
     60mg_u_long invf_buffer_size = 5 * 1024 * 1024;   /* 5Mb */
     61mg_u_long ChunkLimit = 0;
    6262char InvfLevel = 2;
    6363char SkipSGML = 0;
    … …  
    7171FILE * Trace;
    7272char * filename;
    73 unsigned long num_docs = 0;
    74 unsigned long block_bytes = 0;
     73mg_u_long num_docs = 0;
     74mg_u_long block_bytes = 0;
    7575
    7676static char Passes = 0;
    77 static unsigned long trace = 0;
     77static mg_u_long trace = 0;
    7878static int Dump = 0;
    7979static char **files = NULL;
    … …  
    193193
    194194/* -b arg to mg_passes */
    195 void set_buffer_size(long size) {
     195void set_buffer_size(mg_s_long size) {
    196196  buf_size = size * 1024;
    197197  if (buf_size <  MIN_BUF) {
    … …  
    201201
    202202/* -c arg to mg_passes */
    203 void set_chunk_limit(long chunk_limit) {
     203void set_chunk_limit(mg_s_long chunk_limit) {
    204204  ChunkLimit = chunk_limit;
    205205}
    … …  
    259259/* -t arg to mg_passes */
    260260void set_trace_point(int tracepos) {
    261   trace = (unsigned long) (tracepos * 1024 * 1024);
     261  trace = (mg_u_long) (tracepos * 1024 * 1024);
    262262}
    263263
    … …  
    410410          }
    411411        if (Trace)
    412           fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs | %s\n",
     412          fprintf (Trace, "%11" ULL_FS " bytes |%7u docs | %s\n",
    413413               bytes_processed, num_docs,
    414414               ElapsedTime (&StartTime, NULL));
    … …  
    435435      mi = mallinfo ();
    436436      block_bytes -= trace;
    437       fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs |%7.3f Mb | %s\n",
     437      fprintf (Trace, "%11" ULL_FS " bytes |%7u docs |%7.3f Mb | %s\n",
    438438           bytes_processed, num_docs, mi.arena / 1024.0 / 1024.0,
    439439           ElapsedTime (&StartTime, NULL));
    440440#else
    441441      block_bytes -= trace;
    442       fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs | %s\n",
     442      fprintf (Trace, "%11" ULL_FS " bytes |%7u docs | %s\n",
    443443           bytes_processed, num_docs,
    444444           ElapsedTime (&StartTime, NULL));
    … …  
    492492      struct mallinfo mi;
    493493      mi = mallinfo ();
    494       fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs |%7.3f Mb | %s\n",
     494      fprintf (Trace, "%11" ULL_FS " bytes |%7u docs |%7.3f Mb | %s\n",
    495495           bytes_processed, num_docs, mi.arena / 1024.0 / 1024.0,
    496496           ElapsedTime (&StartTime, NULL));
    497497#else
    498       fprintf (Trace, "%11" ULL_FS " bytes |%7lu docs | %s\n",
     498      fprintf (Trace, "%11" ULL_FS " bytes |%7u docs | %s\n",
    499499           bytes_processed, num_docs,
    500500           ElapsedTime (&StartTime, NULL));

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_passes_4jni.h

    r16583 r25147  
    4040
    4141/* -b arg to mg_passes */
    42 void set_buffer_size(long size);
     42void set_buffer_size(mg_s_long size);
    4343
    4444/* -c arg to mg_passes */
    45 void set_chunk_limit(long chunk_limit);
     45void set_chunk_limit(mg_s_long chunk_limit);
    4646
    4747/* -C arg to mg_passes */

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_perf_hash_build.c

    r16583 r25147  
    116116{
    117117  FILE *dict, *hash;
    118   unsigned long i;
     118  mg_u_long i;
    119119  u_char prev[MAXSTEMLEN + 1];
    120120  struct invf_dict_header idh;
    … …  
    154154  for (i = 0; i < idh.dict_size; i++)
    155155    {
    156       register unsigned long copy, suff, l;
    157       unsigned long wcnt, fcnt;
     156      register mg_u_long copy, suff, l;
     157      mg_u_long wcnt, fcnt;
    158158
    159159      /* build a new word on top of prev */

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_stem_idx.c

    r16583 r25147  
    6969
    7070
    71 static unsigned long MaxMemInUse = 0;
    72 static unsigned long MemInUse = 0;
     71static mg_u_long MaxMemInUse = 0;
     72static mg_u_long MemInUse = 0;
    7373
    7474static idx_hash_rec **IdxHashTable;
    75 static unsigned long IdxHashSize;
    76 static unsigned long IdxHashUsed;
     75static mg_u_long IdxHashSize;
     76static mg_u_long IdxHashUsed;
    7777static u_char *IdxPool;
    7878static int IdxPoolLeft;
    … …  
    8888int force = 0;
    8989
    90 static long lookback = 4;
     90static mg_s_long lookback = 4;
    9191
    9292static void
    … …  
    216216ReadStemDictBlk (File * stem_file)
    217217{
    218   unsigned long i;
     218  mg_u_long i;
    219219  stemmed_dict *sd;
    220220  u_char *buffer;
    … …  
    357357      register unsigned int res;
    358358      int num_indexes;
    359       unsigned long *first_word, *last_invf_len;
     359      mg_u_long *first_word, *last_invf_len;
    360360      unsigned short *num_words;
    361361      u_char *base;
    … …  
    368368
    369369      /* Move through block header */
    370       first_word = (unsigned long *) (sd->buffer);
     370      first_word = (mg_u_long *) (sd->buffer);
    371371      NTOHUL(*first_word);  /* [RPAP - Jan 97: Endian Ordering] */
    372       last_invf_len = (unsigned long *) (first_word + 1);
     372      last_invf_len = (mg_u_long *) (first_word + 1);
    373373      NTOHUL(*last_invf_len);  /* [RPAP - Jan 97: Endian Ordering] */
    374374      num_words = (unsigned short *) (last_invf_len + 1);
    … …  
    404404
    405405      /* Skip irrelevant word info */
    406       base += sizeof (u_long);
    407       base += sizeof (u_long);
    408       base += sizeof (u_long);
     406      base += sizeof (mg_u_long);
     407      base += sizeof (mg_u_long);
     408      base += sizeof (mg_u_long);
    409409
    410410      /* Stem word */
    … …  
    419419        {
    420420          /* Search the idx hash table for word */
    421           register unsigned long hashval, step;
     421          register mg_u_long hashval, step;
    422422          register int hsize = IdxHashSize;
    423423          HASH (hashval, step, word, hsize);
    … …  
    516516        {
    517517          idx_hash_rec **ht;
    518           unsigned long size;
    519           unsigned long i;
     518          mg_u_long size;
     519          mg_u_long i;
    520520          size = prime (IdxHashSize * 2);
    521521          if (!(ht = Xmalloc (sizeof (idx_hash_rec *) * size)))
    … …  
    529529            register u_char *wptr;
    530530            idx_hash_rec *ent;
    531             register unsigned long hashval, step;
     531            register mg_u_long hashval, step;
    532532           
    533533            wptr = IdxHashTable[i]->word;
    … …  
    568568{
    569569  char *FName;
    570   unsigned long i, j, pos, First_word, num;
     570  mg_u_long i, j, pos, First_word, num;
    571571  struct stem_idx_header sih;
    572572  u_char *buffer, *last_word = NULL;
    … …  
    636636  for (i = 0; i < IdxHashUsed; i++)
    637637    {
    638       register unsigned long extra, copy, suff;
     638      register mg_u_long extra, copy, suff;
    639639      register struct idx_hash_rec *ent = IdxHashTable[i];
    640640
    … …  
    765765
    766766  rewind (tmp);
    767   sih.blocks_start = sih.index_chars + sizeof (u_long) + sizeof (sih) +
     767  sih.blocks_start = sih.index_chars + sizeof (mg_u_long) + sizeof (sih) +
    768768    sih.num_blocks * sizeof (pos);
    769769  if (force)
    … …  
    784784
    785785  /* skip over the magic number */
    786   fseek (idbi, sizeof (u_long), 0);
     786  fseek (idbi, sizeof (mg_u_long), 0);
    787787
    788788  /* [RPAP - Jan 97: Endian Ordering] */
    … …  
    821821  sdh.indexed |= 1 << (stem_method - 1);
    822822  HTONUL(sdh.indexed);
    823   fseek (idb, sizeof (u_long), 0);
     823  fseek (idb, sizeof (mg_u_long), 0);
    824824  fwrite ((char *) &sdh, sizeof (sdh), 1, idb);
    825825  fclose (idb);

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_text_estimate.c

    r16583 r25147  
    9191typedef struct stats_t
    9292  {
    93     u_long freq, occur;
    94     u_long len;
     93    mg_u_long freq, occur;
     94    mg_u_long len;
    9595  }
    9696stats_t;
    9797
    98 static u_long huff_count = 0;
    99 static u_long escape_count = 0;
     98static mg_u_long huff_count = 0;
     99static mg_u_long escape_count = 0;
    100100
    101101
    … …  
    106106static double ReadInWordsSpecial (char *name, double *num_bytes,
    107107                  double *num_extra_bytes,
    108                   u_long *aux_compressed);
     108                  mg_u_long *aux_compressed);
    109109
    110110
    … …  
    116116  ProgTime StartTime;
    117117  double num_bytes, num_extra_bytes = 0; /* [RJM 07/97: 4G limit] */
    118   u_long aux_compressed;
     118  mg_u_long aux_compressed;
    119119  int ch;
    120120  double bytes;
    … …  
    207207  compression_stats_header csh;
    208208  FILE *f;
    209   u_long which;
     209  mg_u_long which;
    210210  double bytes, bits = 0;
    211211
    … …  
    246246      if (ht[which])
    247247        {
    248           register unsigned long hashval, step;
     248          register mg_u_long hashval, step;
    249249          register int tsize = ht[which]->size;
    250250          register u_char **wptr;
    … …  
    335335  bits += 5.5 * csh.num_docs;
    336336
    337   bytes = bits / 8 + sizeof (compressed_text_header) + sizeof (u_long);
     337  bytes = bits / 8 + sizeof (compressed_text_header) + sizeof (mg_u_long);
    338338
    339339  *num_bytes = csh.num_bytes;
    … …  
    356356ReadInWordsSpecial (char *name, double *num_bytes,
    357357            double *num_extra_bytes,
    358             u_long *aux_compressed)
     358            mg_u_long *aux_compressed)
    359359{
    360360  compression_stats_header csh;
    361361  FILE *f;
    362   u_long magic, which;
     362  mg_u_long magic, which;
    363363  double bytes, bits = 0;
    364364  double size[2];
    … …  
    386386      frags_stats_header fsh;
    387387      int j, num = 0;
    388       long lens[16], chars[256];
     388      mg_s_long lens[16], chars[256];
    389389
    390390      bzero ((char *) lens, sizeof (lens));
    … …  
    420420      if (ht[which])
    421421        {
    422           register unsigned long hashval, step;
     422          register mg_u_long hashval, step;
    423423          register int tsize = ht[which]->size;
    424424          register u_char **wptr;
    … …  
    489489    int j, num_buckets = 0;
    490490    int start[10], end[10];
    491     long flens[16], fchars[256];
     491    mg_u_long flens[16], fchars[256];
    492492
    493493    for (j = 0; j < 256; j++)
    … …  
    577577  bits += 5.5 * csh.num_docs;
    578578
    579   bytes = bits / 8 + sizeof (compressed_text_header) + sizeof (u_long);
     579  bytes = bits / 8 + sizeof (compressed_text_header) + sizeof (mg_u_long);
    580580
    581581  *num_bytes = csh.num_bytes;

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_text_merge.c

    r16583 r25147  
    4343FileName old_name, new_name, merge_name;
    4444
    45 long magicsize;         /* == where the header in a file begins */
     45mg_s_long magicsize;            /* == where the header in a file begins */
    4646
    4747compressed_text_header cth[3];
    … …  
    100100{
    101101  int i;
    102   u_long data, offset;
     102  mg_u_long data, offset;
    103103  byte c;
    104104
    … …  
    135135  for (i = 0; i < cth[OLD].num_of_docs; i++)
    136136    {
    137       fread (&data, sizeof (u_long), 1, idx[OLD]);
    138       fwrite (&data, sizeof (u_long), 1, idx[MERGE]);
     137      fread (&data, sizeof (mg_u_long), 1, idx[OLD]);
     138      fwrite (&data, sizeof (mg_u_long), 1, idx[MERGE]);
    139139    }
    140140
    141141  /* offset is the amount to add to each entry from idx[NEW] */
    142   fread (&offset, sizeof (u_long), 1, idx[OLD]);
     142  fread (&offset, sizeof (mg_u_long), 1, idx[OLD]);
    143143  NTOHUL(offset);  /* [RPAP - Jan 97: Endian Ordering] */
    144144  offset -= (4 + sizeof (cth[OLD]));    /* 4 for the magic number */
    … …  
    146146  for (i = 0; i < cth[NEW].num_of_docs; i++)
    147147    {
    148       fread (&data, sizeof (u_long), 1, idx[NEW]);
     148      fread (&data, sizeof (mg_u_long), 1, idx[NEW]);
    149149      NTOHUL(data);  /* [RPAP - Jan 97: Endian Ordering] */
    150150      data += offset;
    151151      HTONUL(data);  /* [RPAP - Jan 97: Endian Ordering] */
    152       fwrite (&data, sizeof (u_long), 1, idx[MERGE]);
     152      fwrite (&data, sizeof (mg_u_long), 1, idx[MERGE]);
    153153    }
    154   /* write last u_long in idx[MERGE] (= length of file) */
    155   fread (&data, sizeof (u_long), 1, idx[NEW]);
     154  /* write last mg_u_long in idx[MERGE] (= length of file) */
     155  fread (&data, sizeof (mg_u_long), 1, idx[NEW]);
    156156  NTOHUL(data);  /* [RPAP - Jan 97: Endian Ordering] */
    157157  data += offset;
    158158  HTONUL(data);  /* [RPAP - Jan 97: Endian Ordering] */
    159   fwrite (&data, sizeof (u_long), 1, idx[MERGE]);
     159  fwrite (&data, sizeof (mg_u_long), 1, idx[MERGE]);
    160160
    161161/******* update .text *******/
    … …  
    188188  fclose (idx[NEW]);
    189189
    190   fprintf (stderr, "mg_text_merge: %ld documents added to %s\n",
     190  fprintf (stderr, "mg_text_merge: %d documents added to %s\n",
    191191       cth[NEW].num_of_docs, merge_name);
    192192

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mg_weights_build.c

    r16583 r25147  
    3838#include "words.h"
    3939
    40 #define MAXBITS (sizeof(unsigned long) * 8)
     40#define MAXBITS (sizeof(mg_u_long) * 8)
    4141
    4242/*
    … …  
    8181static char *file_name = "";
    8282static char *text_file_name = "";
    83 static unsigned long NumPara = 0;
    84 static unsigned long StaticNumOfDocs = 0;
    85 
    86 unsigned long get_NumPara (void);
    87 unsigned long get_StaticNumOfDocs (void);
     83static mg_u_long NumPara = 0;
     84static mg_u_long StaticNumOfDocs = 0;
     85
     86mg_u_long get_NumPara (void);
     87mg_u_long get_StaticNumOfDocs (void);
    8888void GenerateWeights (void);
    8989void Make_weight_approx (void);
    … …  
    141141
    142142
    143 unsigned long
     143mg_u_long
    144144get_NumPara (void)
    145145{
    … …  
    158158
    159159
    160 unsigned long
     160mg_u_long
    161161get_StaticNumOfDocs (void)
    162162/* the static number of documents is the N parameter used to
    … …  
    253253    {
    254254      u_char dummy1, dummy2[MAXSTEMLEN + 1];
    255       unsigned long fcnt, wcnt, blk, CurrDoc, p, j;
     255      mg_u_long fcnt, wcnt, blk, CurrDoc, p, j;
    256256      float idf;
    257257
    … …  
    281281      /* check the inverted file index entry for this word */
    282282      {
    283     unsigned long loc;
     283    mg_u_long loc;
    284284    fread ((char *) &loc, sizeof (loc), 1, idx);
    285285    NTOHUL(loc);  /* [RPAP - Jan 97: Endian Ordering] */
    … …  
    292292      for (j = 0; j < p; j++)
    293293    {
    294       unsigned long x, tf;
     294      mg_u_long x, tf;
    295295      BBLOCK_DECODE (x, blk);
    296296      CurrDoc += x;
    … …  
    346346{
    347347  int i, pos, max;
    348   unsigned long buf;
     348  mg_u_long buf;
    349349  double U, L, B;
    350350  FILE *approx, *exact;
    … …  
    368368
    369369    }
    370   fseek (exact, sizeof (u_long), SEEK_SET);
     370  fseek (exact, sizeof (mg_u_long), SEEK_SET);
    371371
    372372  B = pow (U / L, pow (2.0, -(double) bits));
    … …  
    392392  for (buf = pos = i = 0; i < NumPara; i++)
    393393    {
    394       unsigned long fx;
     394      mg_u_long fx;
    395395      float wgt;
    396396      fread ((char *) &wgt, sizeof (wgt), 1, exact);
    … …  
    476476    struct
    477477      {
    478     unsigned long Start;
     478    mg_u_long Start;
    479479    float Weight;
    480480      }
    … …  
    483483      {
    484484    int count;
    485     fread ((char *) &data.Start, sizeof (unsigned long), 1, idx);
     485    fread ((char *) &data.Start, sizeof (mg_u_long), 1, idx);
    486486    if (para && i < cth.num_of_docs)
    487487      {
    … …  
    502502      }
    503503    /* Write out the extra entry for the idx file */
    504     fread ((char *) &data.Start, sizeof (unsigned long), 1, idx);
     504    fread ((char *) &data.Start, sizeof (mg_u_long), 1, idx);
    505505    data.Weight = 0;
    506506    fwrite((char*)&data, sizeof(data), 1, idx_wgt);

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mgdictlist.c

    r16583 r25147  
    7373int quick = 0;
    7474int no_of_words[2];
    75 u_long maxcodelen[2];
     75mg_u_long maxcodelen[2];
    7676
    7777char *dictname = "";
    … …  
    102102
    103103  if (quick)
    104     printf ("%ld\n", idh.dict_size);
     104    printf ("%d\n", idh.dict_size);
    105105  else
    106106    {
    107       printf ("# lookback           = %lu\n", idh.lookback);
    108       printf ("# dict size          = %lu\n", idh.dict_size);
    109       printf ("# total bytes        = %lu\n", idh.total_bytes);
    110       printf ("# index string bytes = %lu\n", idh.index_string_bytes);
     107      printf ("# lookback           = %u\n", idh.lookback);
     108      printf ("# dict size          = %u\n", idh.dict_size);
     109      printf ("# total bytes        = %u\n", idh.total_bytes);
     110      printf ("# index string bytes = %u\n", idh.index_string_bytes);
    111111      printf ("# input bytes        = %.0f\n", idh.input_bytes); /* [RJM 07/97: 4G limit] */
    112       printf ("# num of docs        = %lu\n", idh.num_of_docs);
    113       printf ("# static num of docs = %lu\n", idh.static_num_of_docs);
    114       printf ("# num of words       = %lu\n", idh.num_of_words);
     112      printf ("# num of docs        = %u\n", idh.num_of_docs);
     113      printf ("# static num of docs = %u\n", idh.static_num_of_docs);
     114      printf ("# num of words       = %u\n", idh.num_of_words);
    115115      printf ("#\n");
    116116    }
    … …  
    118118  for (i = 0; i < idh.dict_size; i++)
    119119    {
    120       register unsigned long copy, suff;
    121       unsigned long wcnt, fcnt;
     120      register mg_u_long copy, suff;
     121      mg_u_long wcnt, fcnt;
    122122
    123123      /* build a new word on top of prev */
    … …  
    137137      if (!quick)
    138138    {
    139       printf ("%d: %8ld ", i, wcnt);
    140       printf ("/ %5ld ", fcnt);
    141       printf ("%2d %2ld\t\"", *prev, copy);
     139      printf ("%d: %8d ", i, wcnt);
     140      printf ("/ %5d ", fcnt);
     141      printf ("%2d %2d\t\"", *prev, copy);
    142142    }
    143143      printf ("%s", word2str (prev));
    144144      if (quick)
    145     printf (" %ld %ld\n", wcnt, fcnt);
     145    printf (" %d %d\n", wcnt, fcnt);
    146146      else
    147147    {
    … …  
    159159{
    160160  comp_frags_header cfh;
    161   u_long *codes;
     161  mg_u_long *codes;
    162162  u_char prev[MAXSTEMLEN + 1];
    163163  int i;
    … …  
    168168  printf ("#\n");
    169169  printf ("#   max code len       = %u\n", cfh.hd.maxcodelen);
    170   printf ("#   total bytes        = %lu\n", cfh.uncompressed_size);
     170  printf ("#   total bytes        = %d\n", cfh.uncompressed_size);
    171171  printf ("#\n");
    172172
    … …  
    202202  int i;
    203203  huff_data hd;
    204   u_long *codes;
     204  mg_u_long *codes;
    205205
    206206  if (Read_Huffman_Data (f, &hd, NULL, NULL) == -1)
    … …  
    232232  int i;
    233233  huff_data hd;
    234   u_long *codes;
     234  mg_u_long *codes;
    235235
    236236  if (Read_Huffman_Data (f, &hd, NULL, NULL) == -1)
    … …  
    280280      break;
    281281    }
    282   printf ("# num words          = %lu\n", cdh.num_words[1]);
    283   printf ("# num word chars     = %lu\n", cdh.num_word_chars[1]);
    284   printf ("# num non-words      = %lu\n", cdh.num_words[0]);
    285   printf ("# num non-word chars = %lu\n", cdh.num_word_chars[0]);
    286   printf ("# lookback           = %lu\n", cdh.lookback);
     282  printf ("# num words          = %d\n", cdh.num_words[1]);
     283  printf ("# num word chars     = %d\n", cdh.num_word_chars[1]);
     284  printf ("# num non-words      = %d\n", cdh.num_words[0]);
     285  printf ("# num non-word chars = %d\n", cdh.num_word_chars[0]);
     286  printf ("# lookback           = %d\n", cdh.lookback);
    287287
    288288  for (which = 0; which < 2; which++)
    … …  
    338338
    339339      if (!quick)
    340     printf ("#\n# num %9s      = %lu\n#\n", i ? "words" : "non-words",
     340    printf ("#\n# num %9s      = %u\n#\n", i ? "words" : "non-words",
    341341        fsh.num_frags);
    342342
    … …  
    344344    {
    345345      u_char Word[16];
    346       u_long freq, occur_num;
     346      mg_u_long freq, occur_num;
    347347
    348348      fread (&freq, sizeof (freq), 1, f);
    … …  
    355355      Word[0] = fgetc (f);
    356356      fread (Word + 1, Word[0], 1, f);
    357       printf ("%d: %7ld : %7ld : \"%s\"\n", j, freq,
     357      printf ("%d: %7d : %7d : \"%s\"\n", j, freq,
    358358          occur_num, word2str (Word));
    359359    }
    … …  
    365365{
    366366  FILE *fp;
    367   unsigned long magic = 0;
     367  mg_u_long magic = 0;
    368368
    369369  if (argc < 2)

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mgpass.c

    r16583 r25147  
    100100#define path_length 256
    101101
    102 unsigned long buf_size = 3 * 1024 * 1024;       /* 3Mb */
    103 unsigned long invf_buffer_size = 5 * 1024 * 1024;       /* 5Mb */
    104 unsigned long ChunkLimit = 0;
     102mg_u_long buf_size = 3 * 1024 * 1024;       /* 3Mb */
     103mg_u_long invf_buffer_size = 5 * 1024 * 1024;       /* 5Mb */
     104mg_u_long ChunkLimit = 0;
    105105char InvfLevel = 2;
    106106char SkipSGML = 0;
    … …  
    115115
    116116static char Passes = 0;
    117 static unsigned long trace = 0;
     117static mg_u_long trace = 0;
    118118static int Dump = 0;
    119119static char **files = NULL;
    … …  
    237237void search(char *dname, char *fname)
    238238{
    239   long dirtag;  struct _finddata_t dirinfo;  int in_fd;  char *res;
     239  mg_s_long dirtag;  struct _finddata_t dirinfo;  int in_fd;  char *res;
    240240  char search_name[path_length], found_name[path_length];
    241241
    … …  
    433433      break;
    434434    case 't':
    435       trace = (unsigned long) (atof (optarg) * 1024 * 1024);
     435      trace = (mg_u_long) (atof (optarg) * 1024 * 1024);
    436436      break;
    437437    case 'h':

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mgquery.c

    r16583 r25147  
    143143#ifdef TREC_MODE
    144144char *trec_ids = NULL;
    145 long *trec_paras = NULL;
     145mg_s_long *trec_paras = NULL;
    146146#endif
    147147
    … …  
    264264
    265265#ifdef USE_PROCESS_MEM
    266 static u_long
     266static mg_u_long
    267267process_mem (void)
    268268{
    … …  
    272272    {
    273273      char buf[128];
    274       sprintf (buf, "/proc/%ld", (long) getpid ());
     274      sprintf (buf, "/proc/%d", (mg_s_long) getpid ());
    275275      fd = open (buf, O_RDONLY);
    276276    }
    … …  
    347347StatFile (File * F)
    348348{
    349   static unsigned long NumBytes = 0, NumSeeks = 0, NumReads = 0;
     349  static mg_u_long NumBytes = 0, NumSeeks = 0, NumReads = 0;
    350350  if (F)
    351351    {
    352       if ((int) F != -1)
     352      if ((intptr_t) F != -1)
    353353    {
    354354      if (!BooleanEnv (GetEnv ("briefstats"), 0))
    … …  
    533533/* num should be greater than or equal to 1 */
    534534int
    535 RawDocOutput (query_data * qd, u_long num, FILE * Output)
    536 {
    537   static u_long last_pos = 0;
     535RawDocOutput (query_data * qd, mg_u_long num, FILE * Output)
     536{
     537  static mg_u_long last_pos = 0;
    538538  static u_char *c_buffer = 0;
    539539  static int buf_len = -1;
    540540  static u_char *uc_buffer = 0;
    541   u_long pos, len;
     541  mg_u_long pos, len;
    542542  int ULen;
    543543
    … …  
    570570void
    571571StringOut (FILE * Output, char *string,
    572        int intvalid, unsigned long intval,
     572       int intvalid, mg_u_long intval,
    573573       int floatvalid, double floatval)
    574574{
    … …  
    583583      case 'n':
    584584        if (intvalid)
    585           fprintf (Output, "%lu", intval);
     585          fprintf (Output, "%d", intval);
    586586        else
    587587          fprintf (Output, "%%n");
    … …  
    603603
    604604void
    605 HeaderOut (FILE * Output, u_char * UDoc, unsigned long ULen, int heads_length)
     605HeaderOut (FILE * Output, u_char * UDoc, mg_u_long ULen, int heads_length)
    606606{
    607607  int i, space = 1, num = 0;
    … …  
    688688    {
    689689      u_char *UDoc = NULL;
    690       unsigned long ULen;
     690      mg_u_long ULen;
    691691
    692692      if (need_text)
    … …  
    760760            }
    761761#else
    762         fprintf (Output, "%7d   %6.4f   %7lu\n", GetDocNum (qd),
     762        fprintf (Output, "%7d   %6.4f   %7u\n", GetDocNum (qd),
    763763             GetDocWeight (qd), GetDocCompLength (qd));
    764764#endif
    … …  
    776776          if (PagerRunning && trec_ids)
    777777        {
    778           long DN, PN = GetDocNum (qd) - 1;
     778          mg_s_long DN, PN = GetDocNum (qd) - 1;
    779779          if (trec_paras)
    780780            DN = trec_paras[PN];
    781781          else
    782782            DN = PN;
    783           fprintf (Output, "%-14.14s  %8ld  %10.5f\n",
     783          fprintf (Output, "%-14.14s  %8d  %10.5f\n",
    784784               &trec_ids[DN * 14], PN + 1, GetDocWeight (qd));
    785785        }
    … …  
    991991      return;
    992992    }
    993       sprintf (pager, "%s --style=%s --pager=%s --stem_method=%ld --stemmer=%ld %s",
     993      sprintf (pager, "%s --style=%s --pager=%s --stem_method=%d --stemmer=%d %s",
    994994           HILITE_PAGER,
    995995           GetEnv ("hilite_style"),

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mgstat.c

    r16583 r25147  
    7070void ProcessDict (char *);
    7171void ProcessStem (char *);
    72 long ProcessStemBlk (char *name);  /* [RPAP - Jan 97: Stem Index Change] */
     72mg_s_long ProcessStemBlk (char *name);  /* [RPAP - Jan 97: Stem Index Change] */
    7373
    7474static mg_ullong inputbytes = 0;
    … …  
    8686  int ch;
    8787  int exact = 0;
    88   long indexed = 0; /* [RPAP - Jan 97: Stem Index Change] */
     88  mg_s_long indexed = 0; /* [RPAP - Jan 97: Stem Index Change] */
    8989  opterr = 0;
    9090  while ((ch = getopt (argc, argv, "Ehf:d:")) != -1)
    … …  
    258258    {
    259259      inputbytes = cth.num_of_bytes;
    260       printf ("Input bytes                        : %10" ULL_FS ", %8.2f Mbyte\n",
     260      printf ("Input bytes                        : %10f, %8.2f Mbyte\n",
    261261          cth.num_of_bytes, (double) cth.num_of_bytes / 1024 / 1024);
    262       printf ("Documents                          : %10lu\n", cth.num_of_docs);
    263       printf ("Words in collection [dict]         : %10lu\n", cth.num_of_words);
    264       printf ("Longest doc in collection [dict]   : %10lu characters\n",
     262      printf ("Documents                          : %10d\n", cth.num_of_docs);
     263      printf ("Words in collection [dict]         : %10d\n", cth.num_of_words);
     264      printf ("Longest doc in collection [dict]   : %10d characters\n",
    265265          cth.length_of_longest_doc);
    266266      printf ("Maximum ratio                      : %10.2f\n", cth.ratio);
    … …  
    269269  if (have_cdh)
    270270    {
    271       printf ("Words in dict                      : %10lu\n", cdh.num_words[1]);
    272       printf ("Non-words in dict                  : %10lu\n", cdh.num_words[0]);
    273       printf ("Total chars of distinct words      : %10lu\n", cdh.num_word_chars[1]);
    274       printf ("Total chars of distinct non-words  : %10lu\n", cdh.num_word_chars[0]);
     271      printf ("Words in dict                      : %10d\n", cdh.num_words[1]);
     272      printf ("Non-words in dict                  : %10d\n", cdh.num_words[0]);
     273      printf ("Total chars of distinct words      : %10d\n", cdh.num_word_chars[1]);
     274      printf ("Total chars of distinct non-words  : %10d\n", cdh.num_word_chars[0]);
    275275    }
    276276
    … …  
    294294    return;
    295295  fread ((char *) &idh, sizeof (idh), 1, f);
    296   printf ("Words in collection [stem]         : %10ld\n", NTOHUL(idh.num_of_words));  /* [RPAP - Jan 97: Endian Ordering] */
    297   printf ("Words in stem                      : %10ld\n", NTOHUL(idh.dict_size));  /* [RPAP - Jan 97: Endian Ordering] */
    298   printf ("Indexed fragments                  : %10ld\n", NTOHUL(idh.num_of_docs));  /* [RPAP - Jan 97: Endian Ordering] */
    299   printf ("Total chars of stem words          : %10ld\n", NTOHUL(idh.total_bytes));  /* [RPAP - Jan 97: Endian Ordering] */
     296  printf ("Words in collection [stem]         : %10d\n", NTOHUL(idh.num_of_words));  /* [RPAP - Jan 97: Endian Ordering] */
     297  printf ("Words in stem                      : %10d\n", NTOHUL(idh.dict_size));  /* [RPAP - Jan 97: Endian Ordering] */
     298  printf ("Indexed fragments                  : %10d\n", NTOHUL(idh.num_of_docs));  /* [RPAP - Jan 97: Endian Ordering] */
     299  printf ("Total chars of stem words          : %10d\n", NTOHUL(idh.total_bytes));  /* [RPAP - Jan 97: Endian Ordering] */
    300300  fclose (f);
    301301}
    … …  
    306306
    307307/* [RPAP - Jan 97: Stem Index Change] */
    308 long
     308mg_s_long
    309309ProcessStemBlk (char *name)
    310310{

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/mgstemidxlist.c

    r16583 r25147  
    3636read_3_in_4 (FILE * idbi)
    3737{
    38   unsigned long i;
     38  mg_u_long i;
    3939  stemmed_idx *si;
    4040  u_char *buffer;
    … …  
    106106    }
    107107
    108   printf ("# lookback     = %lu\n", si->sih.lookback);
    109   printf ("# block_size   = %lu\n", si->sih.block_size);
    110   printf ("# num_blocks   = %lu\n", si->sih.num_blocks);
    111   printf ("# blocks_start = %lu\n", si->sih.blocks_start);
    112   printf ("# index_chars  = %lu\n", si->sih.index_chars);
    113   printf ("# num_of_words = %lu\n", si->sih.num_of_words);
     108  printf ("# lookback     = %u\n", si->sih.lookback);
     109  printf ("# block_size   = %u\n", si->sih.block_size);
     110  printf ("# num_blocks   = %u\n", si->sih.num_blocks);
     111  printf ("# blocks_start = %u\n", si->sih.blocks_start);
     112  printf ("# index_chars  = %u\n", si->sih.index_chars);
     113  printf ("# num_of_words = %u\n", si->sih.num_of_words);
    114114
    115115  block = 0;
    116116  while (block < si->sih.num_blocks)
    117117    {
    118       unsigned long *first_word;
     118      mg_u_long *first_word;
    119119      unsigned short *num_words;
    120120      unsigned short *index;
    121       long res;
     121      mg_s_long res;
    122122      u_char *base;
    123123      int num_indexes;
    … …  
    128128      si->active = si->pos[block];
    129129
    130       first_word = (unsigned long *) (si->buffer);
     130      first_word = (mg_u_long *) (si->buffer);
    131131      NTOHUL(*first_word);  /* [RPAP - Jan 97: Endian Ordering] */
    132132      num_words = (unsigned short *) (first_word + 1);
    … …  
    143143
    144144      printf ("\n# block      = %d\n", block);
    145       printf ("# first_word = %lu\n", *first_word);
     145      printf ("# first_word = %u\n", *first_word);
    146146      printf ("# num_words  = %u\n", *num_words);
    147147

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/query.docnums.c

    r16583 r25147  
    6464{
    6565  DocList *Docs = MakeDocList (0);
    66   unsigned long start = 0, finish;
     66  mg_u_long start = 0, finish;
    6767  int range = 0; /* is there a range or not ? */
    6868
    … …  
    7575      finish <= qd->sd->sdh.num_of_docs)
    7676    {
    77       unsigned long i;
     77      mg_u_long i;
    7878      if (!range)
    7979        start = finish;

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/query.ranked.c

    r16583 r25147  
    8989    float *OrgWeight;
    9090    int DocNum;
    91     u_long SeekPos;     /* position in the text file in bytes */
    92     u_long Len;         /* length of the document in bytes */
     91    mg_u_long SeekPos;      /* position in the text file in bytes */
     92    mg_u_long Len;          /* length of the document in bytes */
    9393  }
    9494HeapEntry;
    … …  
    290290    {
    291291      int j;
    292       long num_entries, word_num;
    293       unsigned long count, doc_count, invf_ptr, invf_len;
     292      mg_s_long num_entries, word_num;
     293      mg_u_long count, doc_count, invf_ptr, invf_len;
    294294      int weight_to_apply, stem_to_apply;
    295295      int method_using = -1;
    … …  
    408408        {
    409409          int i;
    410           u_long max_doc_count = 0;
     410          mg_u_long max_doc_count = 0;
    411411
    412412          /* get the maximum doc count */
    … …  
    748748        for (i = 0; i < ST->no_of_items; i++, ide = SP_get_next (ST))
    749749          {
    750         u_long SeekPos, Len;
     750        mg_u_long SeekPos, Len;
    751751        float Weight;
    752752        if (!ide->Sum)
    … …  
    777777        for (i = 0; i < qd->sd->sdh.num_of_docs; i++, fptr++)
    778778          {
    779         u_long SeekPos, Len;
     779        mg_u_long SeekPos, Len;
    780780        float Weight;
    781781        if (!*fptr)
    … …  
    803803        for (ideh = HT->Head; ideh; ideh = ideh->next)
    804804          {
    805         u_long SeekPos, Len;
     805        mg_u_long SeekPos, Len;
    806806        float Weight;
    807807        if (!ideh->IDE.Sum)
    … …  
    829829        for (i = 0; i < LT->num; i++, ide++)
    830830          {
    831         u_long SeekPos, Len;
     831        mg_u_long SeekPos, Len;
    832832        float Weight;
    833833        if (!ide->Sum)

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/stem_search.c

    r16583 r25147  
    8383ReadStemDictBlk (File * stem_file)
    8484{
    85   unsigned long i;
     85  mg_u_long i;
    8686  stemmed_dict *sd;
    8787  u_char *buffer;
    … …  
    173173ReadStemIdxBlk (File * stem_idx_file)
    174174{
    175   unsigned long i;
     175  mg_u_long i;
    176176  stemmed_idx *si;
    177177  u_char *buffer;
    … …  
    300300 * This function looks up a word in the stemmed dictionary, it returns -1
    301301 * if the word cound not be found, and 0 if it successfully finds the word.
    302  * If count is non-null the ulong it is pointing to is set to the number of
     302 * If count is non-null the unsigned it is pointing to is set to the number of
    303303 * occurances of the stemmed word in the collection. i.e wcnt.
    304  * If doc_count is non-null the ulong it is pointing to is set to the number
     304 * If doc_count is non-null the unsigned it is pointing to is set to the number
    305305 * of documents that the word occurs in. i.e fcnt
    306  * If invf_ptr is non-null the ulong it is pointing to is set to the position
     306 * If invf_ptr is non-null the unsigned it is pointing to is set to the position
    307307 * of the inverted file where the entry for this word start.
    308308 */
    309309int
    310 FindWord (stemmed_dict * sd, u_char * Word, unsigned long *count,
    311       unsigned long *doc_count, unsigned long *invf_ptr,
    312       unsigned long *invf_len)
     310FindWord (stemmed_dict * sd, u_char * Word, mg_u_long *count,
     311      mg_u_long *doc_count, mg_u_long *invf_ptr,
     312      mg_u_long *invf_len)
    313313{
    314314  register int lo, hi, mid, c;
    315315  register unsigned int res;
    316316  int block, num_indexes;
    317   unsigned long *first_word, *last_invf_len;
     317  mg_u_long *first_word, *last_invf_len;
    318318  unsigned short *num_words;
    319319  u_char *base;
    … …  
    332332
    333333      /* [RPAP - Jan 97: Endian Ordering] */
    334       first_word = (unsigned long *) (sd->buffer);
     334      first_word = (mg_u_long *) (sd->buffer);
    335335      NTOHUL(*first_word);
    336       last_invf_len = (unsigned long *) (first_word + 1);
     336      last_invf_len = (mg_u_long *) (first_word + 1);
    337337      NTOHUL(*last_invf_len);
    338338      num_words = (unsigned short *) (last_invf_len + 1);
    … …  
    346346  else
    347347    {
    348       first_word = (unsigned long *) (sd->buffer);
    349       last_invf_len = (unsigned long *) (first_word + 1);
     348      first_word = (mg_u_long *) (sd->buffer);
     349      last_invf_len = (mg_u_long *) (first_word + 1);
    350350      num_words = (unsigned short *) (last_invf_len + 1);
    351351      index = num_words + 1;
    … …  
    379379    {
    380380      unsigned copy, suff;
    381       unsigned long invfp;
     381      mg_u_long invfp;
    382382      if (res >= *num_words)
    383383    return (-1);
    … …  
    417417    {
    418418      /* Calculate invf_len is necessary */
    419       unsigned long next_invfp;
     419      mg_u_long next_invfp;
    420420      if (!invf_len)
    421421        return (*first_word + res);
    … …  
    432432      base++;
    433433      suff = *base++;
    434       base += suff + sizeof (unsigned long) * 2;
     434      base += suff + sizeof (mg_u_long) * 2;
    435435      bcopy ((char *) base, (char *) &next_invfp, sizeof (next_invfp));
    436436      NTOHUL(next_invfp);  /* [RPAP - Jan 97: Endian Ordering] */
    … …  
    453453
    454454  int block, num_indexes;
    455   unsigned long *first_word, *last_invf_len;
     455  mg_u_long *first_word, *last_invf_len;
    456456  unsigned short *num_words;
    457457  u_char *base;
    … …  
    460460
    461461  int idx_block, idx_num_indexes;
    462   unsigned long *idx_first_word;
     462  mg_u_long *idx_first_word;
    463463  unsigned short *idx_num_words;
    464464  u_char *idx_base;
    … …  
    512512      si->active = si->pos[idx_block];
    513513
    514       idx_first_word = (unsigned long *) (si->buffer);
     514      idx_first_word = (mg_u_long *) (si->buffer);
    515515      NTOHUL(*idx_first_word);  /* [RPAP - Jan 97: Endian Ordering] */
    516516      idx_num_words = (unsigned short *) (idx_first_word + 1);
    … …  
    525525  else
    526526    {
    527       idx_first_word = (unsigned long *) (si->buffer);
     527      idx_first_word = (mg_u_long *) (si->buffer);
    528528      idx_num_words = (unsigned short *) (idx_first_word + 1);
    529529      idx_index = idx_num_words + 1;
    … …  
    591591    {
    592592      unsigned copy, suff;
    593       unsigned long invfp;
     593      mg_u_long invfp;
    594594      /* Read next stem index pos */
    595595      bcopy ((char *) idx_base, (char *) &num_cases, sizeof (num_cases));
    … …  
    613613      sd->active = sd->pos[block];
    614614
    615       first_word = (unsigned long *) (sd->buffer);
     615      first_word = (mg_u_long *) (sd->buffer);
    616616      NTOHUL(*first_word);  /* [RPAP - Jan 97: Endian Ordering] */
    617       last_invf_len = (unsigned long *) (first_word + 1);
     617      last_invf_len = (mg_u_long *) (first_word + 1);
    618618      NTOHUL(*last_invf_len);  /* [RPAP - Jan 97: Endian Ordering] */
    619619      num_words = (unsigned short *) (last_invf_len + 1);
    … …  
    628628      else
    629629    {
    630       first_word = (unsigned long *) (sd->buffer);
    631       last_invf_len = (unsigned long *) (first_word + 1);
     630      first_word = (mg_u_long *) (sd->buffer);
     631      last_invf_len = (mg_u_long *) (first_word + 1);
    632632      num_words = (unsigned short *) (last_invf_len + 1);
    633633      index = num_words + 1;
    … …  
    646646      base += suff;
    647647      *prev = copy + suff;
    648       base += sizeof (unsigned long);   /* skip doc_count */
    649       base += sizeof (unsigned long);   /* skip count */
    650       base += sizeof (unsigned long);   /* skip invf_ptr */
     648      base += sizeof (mg_u_long);   /* skip doc_count */
     649      base += sizeof (mg_u_long);   /* skip count */
     650      base += sizeof (mg_u_long);   /* skip invf_ptr */
    651651      res++;
    652652    }
    … …  
    694694      else
    695695        {
    696           unsigned long next_invfp;
     696          mg_u_long next_invfp;
    697697          u_char *oldbase = base;
    698698         
    … …  
    700700          base++;
    701701          suff = *base++;
    702           base += suff + sizeof (unsigned long) * 2;
     702          base += suff + sizeof (mg_u_long) * 2;
    703703          bcopy ((char *) base, (char *) &next_invfp, sizeof (next_invfp));
    704704          NTOHUL(next_invfp);  /* [RPAP - Jan 97: Endian Ordering] */
    … …  
    720720          sd->active = sd->pos[block];
    721721
    722           first_word = (unsigned long *) (sd->buffer);
     722          first_word = (mg_u_long *) (sd->buffer);
    723723          NTOHUL(*first_word);  /* [RPAP - Jan 97: Endian Ordering] */
    724           last_invf_len = (unsigned long *) (first_word + 1);
     724          last_invf_len = (mg_u_long *) (first_word + 1);
    725725          NTOHUL(*last_invf_len);  /* [RPAP - Jan 97: Endian Ordering] */
    726726          num_words = (unsigned short *) (last_invf_len + 1);

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/stem_search.h

    r16583 r25147  
    2929stemmed_idx *ReadStemIdxBlk (File * stem_idx_file);
    3030
    31 int FindWord (stemmed_dict * sd, u_char * Word, unsigned long *count,
    32           unsigned long *doc_count, unsigned long *invf_ptr,
    33           unsigned long *invf_len);
     31int FindWord (stemmed_dict * sd, u_char * Word, mg_u_long *count,
     32          mg_u_long *doc_count, mg_u_long *invf_ptr,
     33          mg_u_long *invf_len);
    3434
    3535/* [RPAP - Jan 97: Stem Index Change] */

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/term_lists.c

    r16583 r25147  
    200200int
    201201AddTerm (TermList ** query_term_list, u_char * Word, int Count, int word_num,
    202      u_long count, u_long doc_count, u_long invf_ptr, u_long invf_len, int stemmer_num)  /* [RPAP - Feb 97: Term Frequency] */
     202     mg_u_long count, mg_u_long doc_count, mg_u_long invf_ptr, mg_u_long invf_len, int stemmer_num)  /* [RPAP - Feb 97: Term Frequency] */
    203203{
    204204  int j;
    … …  
    283283{
    284284  fprintf (file, "we->word_num = %d\n", we->word_num);
    285   fprintf (file, "we->count = %ld\n", we->count);
    286   fprintf (file, "we->doc_count = %ld\n", we->doc_count);
    287   fprintf (file, "we->max_doc_count = %ld\n", we->max_doc_count);
    288   fprintf (file, "we->invf_ptr = %ld\n", we->invf_ptr);
    289   fprintf (file, "we->invf_len = %ld\n", we->invf_len);
     285  fprintf (file, "we->count = %d\n", we->count);
     286  fprintf (file, "we->doc_count = %d\n", we->doc_count);
     287  fprintf (file, "we->max_doc_count = %d\n", we->max_doc_count);
     288  fprintf (file, "we->invf_ptr = %d\n", we->invf_ptr);
     289  fprintf (file, "we->invf_len = %d\n", we->invf_len);
    290290}
    291291

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/term_lists.h

    r16583 r25147  
    5959  {
    6060    int word_num;       /* Unique number for each different word */
    61     u_long count;       /* Number of times the word occurs in the text */
    62     u_long doc_count;       /* Number of documents that contain the word */
    63     u_long max_doc_count;       /* [RPAP - Jan 97: Stem Index Change] */
    64     u_long invf_ptr;        /* This is a byte position of the 
     61    mg_u_long count;        /* Number of times the word occurs in the text */
     62    mg_u_long doc_count;        /* Number of documents that contain the word */
     63    mg_u_long max_doc_count;       /* [RPAP - Jan 97: Stem Index Change] */
     64    mg_u_long invf_ptr;     /* This is a byte position of the 
    6565                   inverted file entry corresponding to the word */
    66     u_long invf_len;        /* This is the length of the inverted
     66    mg_u_long invf_len;     /* This is the length of the inverted
    6767                   file entry in bytes */
    6868  }
    … …  
    9393int AddTermEntry (TermList ** query_term_list, TermEntry * te);
    9494int AddTerm (TermList ** query_term_list, u_char * Word, int Count, int word_num,
    95          u_long count, u_long doc_count, u_long invf_ptr, u_long invf_len, /* [RPAP - Feb 97: Term Frequency] */
     95         mg_u_long count, mg_u_long doc_count, mg_u_long invf_ptr, mg_u_long invf_len, /* [RPAP - Feb 97: Term Frequency] */
    9696         int stemmer_num); 
    9797void ResetTermList (TermList ** tl);

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/text.h

    r16583 r25147  
    117117typedef struct compression_dict_header
    118118  {
    119     u_long dict_type;
    120     u_long novel_method;
    121     u_long params[TEXT_PARAMS];
    122     u_long num_words[2];
    123     u_long num_word_chars[2];
    124     u_long lookback;
     119    mg_u_long dict_type;
     120    mg_u_long novel_method;
     121    mg_u_long params[TEXT_PARAMS];
     122    mg_u_long num_words[2];
     123    mg_u_long num_word_chars[2];
     124    mg_u_long lookback;
    125125  }
    126126compression_dict_header;
    … …  
    130130  {
    131131    huff_data hd;
    132     u_long uncompressed_size;
    133     u_long huff_words_size[MAX_HUFFCODE_LEN + 1];
     132    mg_u_long uncompressed_size;
     133    mg_u_long huff_words_size[MAX_HUFFCODE_LEN + 1];
    134134  }
    135135comp_frags_header;
    … …  
    139139typedef struct compressed_text_header
    140140  {
    141     u_long num_of_docs;
    142     u_long num_of_words;    /* number of words in collection */
     141    mg_u_long num_of_docs;
     142    mg_u_long num_of_words; /* number of words in collection */
    143143    double num_of_bytes; /* [RJM 07/97: 4G limit] */
    144144    double ratio;
    145     u_long length_of_longest_doc;   /* (characters) */
    146     u_long dummy;    /* added to make the structure the same on different architectures */
     145    mg_u_long length_of_longest_doc;    /* (characters) */
     146    mg_u_long dummy;    /* added to make the structure the same on different architectures */
    147147  }
    148148compressed_text_header;
    … …  
    151151typedef struct compression_stats_header
    152152  {
    153     u_long num_docs;
    154     u_long dummy;   /* added to make the structure the same on different architectures */
     153    mg_u_long num_docs;
     154    mg_u_long dummy;   /* added to make the structure the same on different architectures */
    155155    double num_bytes; /* [RJM 07/97: 4G limit] */
    156156  }
    … …  
    160160typedef struct frags_stats_header
    161161  {
    162     u_long num_frags;
    163     u_long mem_for_frags;
     162    mg_u_long num_frags;
     163    mg_u_long mem_for_frags;
    164164  }
    165165frags_stats_header;
    … …  
    168168typedef struct aux_frags_header
    169169  {
    170     u_long num_frags;
    171     u_long mem_for_frags;
     170    mg_u_long num_frags;
     171    mg_u_long mem_for_frags;
    172172  }
    173173aux_frags_header;

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/text.pass1.c

    r16583 r25147  
    5050typedef struct hash_rec
    5151  {
    52     unsigned long wcnt;     /* word frequency */
    53     unsigned long occurance_num;
     52    mg_u_long wcnt;     /* word frequency */
     53    mg_u_long occurance_num;
    5454    u_char *word;
    5555  }
    … …  
    5959  {
    6060    hash_rec *HashTable;
    61     unsigned long HashSize;
    62     unsigned long HashUsed;
    63     unsigned long wordnum;
    64     unsigned long words_read;
    65     unsigned long bytes_diff;
     61    mg_u_long HashSize;
     62    mg_u_long HashUsed;
     63    mg_u_long wordnum;
     64    mg_u_long words_read;
     65    mg_u_long bytes_diff;
    6666    huff_data hd;
    6767  }
    … …  
    7070
    7171
    72 static unsigned long LongestDoc = 0;
    73 static unsigned long occurance_num = 0;
     72static mg_u_long LongestDoc = 0;
     73static mg_u_long occurance_num = 0;
    7474static dict_data DictData[2];
    7575
    … …  
    7777static int PoolLeft;
    7878static double inputbytes = 0; /* [RJM 07/97: 4G limit] */
    79 static unsigned long MaxMemInUse = 0;
    80 static unsigned long MemInUse = 0;
     79static mg_u_long MaxMemInUse = 0;
     80static mg_u_long MemInUse = 0;
    8181static compression_stats_header csh =
    8282{0, 0.0}; /* [RJM 07/97: 4G limit] */
    … …  
    131131    register u_char *wptr;
    132132    register int hsize = dd->HashSize;
    133     register unsigned long hashval, step;
     133    register mg_u_long hashval, step;
    134134
    135135    HASH (hashval, step, word, hsize);
    … …  
    189189      /* Search the hash table for Word */
    190190      {
    191     register unsigned long hashval, step;
     191    register mg_u_long hashval, step;
    192192    register int hsize = dd->HashSize;
    193193    HASH (hashval, step, Word, hsize);
    … …  
    248248    {
    249249      hash_rec *ht;
    250       unsigned long size;
    251       unsigned long i;
     250      mg_u_long size;
     251      mg_u_long i;
    252252      size = prime (dd->HashSize * 2);
    253253      if (!(ht = Xmalloc (sizeof (hash_rec) * size)))
    … …  
    263263          {
    264264        register u_char *wptr;
    265         register unsigned long hashval, step;
     265        register mg_u_long hashval, step;
    266266
    267267        wptr = dd->HashTable[i].word;
    … …  
    325325{
    326326  frags_stats_header fsh;
    327   u_long j = 0;
     327  mg_u_long j = 0;
    328328  u_char *curr;
    329329

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/text.pass2.c

    r16583 r25147  
    8282  {
    8383    struct char_pool *next;
    84     u_long left;
     84    mg_u_long left;
    8585    u_char *ptr;
    8686    u_char pool[POOL_SIZE];
    … …  
    9090typedef struct novel_hash_rec
    9191  {
    92     u_long ordinal_num;
     92    mg_u_long ordinal_num;
    9393    u_char *word;
    9494  }
    … …  
    102102  {
    103103    novel_hash_rec *HashTable;
    104     u_long HashSize, HashUsed;
     104    mg_u_long HashSize, HashUsed;
    105105    char_pool *first_pool;
    106106    char_pool *pool;
    107     u_long next_num, binary_start;
     107    mg_u_long next_num, binary_start;
    108108    novel_hash_rec **code_to_nhr;
    109109  }
    … …  
    115115static u_char *comp_buffer;
    116116
    117 static u_long text_length;
     117static mg_u_long text_length;
    118118
    119119/* [RJM 07/97: 4G limit] */
    … …  
    125125static novel_hash_table nht[2];
    126126
    127 static u_long prefix_len = 0;
     127static mg_u_long prefix_len = 0;
    128128
    129129int blk_start[2][33], blk_end[2][33];
    … …  
    165165    return COMPERROR;
    166166
    167   text_length = sizeof (u_long) + sizeof (cth);
     167  text_length = sizeof (mg_u_long) + sizeof (cth);
    168168
    169169  if (!(text_idx = create_file (file_name, TEXT_IDX_SUFFIX, "w+b",
    … …  
    287287      if (ht[which])
    288288    {
    289       register unsigned long hashval, step;
     289      register mg_u_long hashval, step;
    290290      register int tsize = ht[which]->size;
    291291      register u_char **wptr;
    … …  
    336336      if (cdh.dict_type == MG_PARTIAL_DICTIONARY)
    337337        {
    338           u_long i;
     338          mg_u_long i;
    339339          if (ht[which])
    340340        {
    … …  
    358358        case MG_NOVEL_HUFFMAN_CHARS:
    359359          {
    360             u_long i;
     360            mg_u_long i;
    361361            HUFF_ENCODE (Word[0], lens_codes[which],
    362362                 lens_huff[which].clens);
    … …  
    371371        case MG_NOVEL_HYBRID_MTF:
    372372          {
    373             register unsigned long hashval, step;
     373            register mg_u_long hashval, step;
    374374            register novel_hash_table *h = &nht[which];
    375375            register int hsize = h->HashSize;
    … …  
    481481              {
    482482            novel_hash_rec *ht;
    483             unsigned long size;
    484             unsigned long i;
     483            mg_u_long size;
     484            mg_u_long i;
    485485            size = prime (h->HashSize * 2);
    486486            if (cdh.novel_method == MG_NOVEL_HYBRID_MTF)
    … …  
    501501                {
    502502                  register u_char *wptr;
    503                   register unsigned long hashval, step;
     503                  register mg_u_long hashval, step;
    504504
    505505                  wptr = h->HashTable[i].word;
    … …  
    674674{
    675675  int i;
    676   u_long aux_compressed = 0, total_uncomp = 0;
     676  mg_u_long aux_compressed = 0, total_uncomp = 0;
    677677  for (i = 0; i <= 1; i++)
    678678    {
    679679      int j;
    680       long chars[256], fchars[256];
    681       long lens[16], flens[16];
     680      mg_s_long chars[256], fchars[256];
     681      mg_s_long lens[16], flens[16];
    682682      char_pool *cp;
    683683      bzero ((char *) chars, sizeof (chars));
    … …  
    743743  HTOND(cth.ratio);
    744744
    745   if (fseek (text_idx, sizeof (u_long), SEEK_SET) == -1 ||
     745  if (fseek (text_idx, sizeof (mg_u_long), SEEK_SET) == -1 ||
    746746      fwrite (&cth, sizeof (cth), 1, text_idx) != 1)
    747747    return COMPERROR;
    748748  fclose (text_idx);
    749749
    750   if (fseek (text, sizeof (u_long), SEEK_SET) == -1 ||
     750  if (fseek (text, sizeof (mg_u_long), SEEK_SET) == -1 ||
    751751      fwrite (&cth, sizeof (cth), 1, text) != 1)
    752752    return COMPERROR;

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/text_get.c

    r16583 r25147  
    8484
    8585static double
    86 FetchDocStartLev1 (text_data * td, u_long DN,
    87            u_long * seek_pos, u_long * len)
    88 {
    89   unsigned long data[2];
     86FetchDocStartLev1 (text_data * td, mg_u_long DN,
     87           mg_u_long * seek_pos, mg_u_long * len)
     88{
     89  mg_u_long data[2];
    9090  /* [TS:Sep/94] Fixed up the seek call to give the correct offset */
    9191  Fseek (td->TextIdxFile,
    92      sizeof (unsigned long) * (DN - 1) +    /* the doc offsets */
    93      sizeof (unsigned long) +   /* the magic number */
     92     sizeof (mg_u_long) * (DN - 1) +    /* the doc offsets */
     93     sizeof (mg_u_long) +   /* the magic number */
    9494     sizeof (compressed_text_header),   /* the header */
    9595     0);
    … …  
    108108
    109109static int
    110 LoadIdx (text_data * td, unsigned long DN)
     110LoadIdx (text_data * td, mg_u_long DN)
    111111{
    112112  if (!td->idx_data)
    … …  
    121121      int i, num;  /* [RPAP - Jan 97: Endian Ordering] */
    122122
    123       long rn = (long) DN - (MG_PAGE_SIZE >> 1);
     123      mg_s_long rn = (mg_s_long) DN - (MG_PAGE_SIZE >> 1);
    124124      if (rn < 1)
    125125    rn = 1;
    126       Fseek (td->TextIdxWgtFile, (sizeof (unsigned long) + sizeof (float)) *
    127            (rn - 1) + sizeof (unsigned long), 0);
     126      Fseek (td->TextIdxWgtFile, (sizeof (mg_u_long) + sizeof (float)) *
     127           (rn - 1) + sizeof (mg_u_long), 0);
    128128      num = Fread ((char *) td->idx_data, sizeof (*(td->idx_data)), MG_PAGE_SIZE, /* [RPAP - Jan 97: Endian Ordering] */
    129129           td->TextIdxWgtFile);
    … …  
    142142
    143143static double
    144 FDSL2 (text_data * td, unsigned long DN, unsigned long *Pos)
    145 {
    146   unsigned long pos = LoadIdx (td, DN);
     144FDSL2 (text_data * td, mg_u_long DN, mg_u_long *Pos)
     145{
     146  mg_u_long pos = LoadIdx (td, DN);
    147147  *Pos = td->idx_data[pos].Start;
    148148  return (td->idx_data[pos].Weight);
    … …  
    151151
    152152static double
    153 FetchDocStartLev2 (text_data * td, u_long DN,
    154            u_long * seek_pos, u_long * len)
     153FetchDocStartLev2 (text_data * td, mg_u_long DN,
     154           mg_u_long * seek_pos, mg_u_long * len)
    155155{
    156156  double Weight;
    157   unsigned long s1, s2;
     157  mg_u_long s1, s2;
    158158  Weight = FDSL2 (td, DN, &s1);
    159159  do
    … …  
    172172
    173173double
    174 FetchDocStart (query_data * qd, u_long DN, u_long * seek_pos, u_long * len)
     174FetchDocStart (query_data * qd, mg_u_long DN, mg_u_long * seek_pos, mg_u_long * len)
    175175{
    176176  qd->text_idx_lookups++;
    … …  
    181181}
    182182
    183 unsigned long
    184 FetchInitialParagraph (text_data * td, unsigned long ParaNum)
     183mg_u_long
     184FetchInitialParagraph (text_data * td, mg_u_long ParaNum)
    185185{
    186186  if (td->TextIdxWgtFile)
    187187    {
    188       unsigned long pos;
    189       unsigned long start;
     188      mg_u_long pos;
     189      mg_u_long start;
    190190      int PN = ParaNum - 1;
    191191      pos = LoadIdx (td, ParaNum);
    … …  
    583583    {
    584584      huff_data *hd;
    585       u_long **vals;
     585      mg_u_long **vals;
    586586      if (cd->cdh.num_words[which])
    587587        {
    … …  
    625625    {
    626626      huff_data *hd;
    627       u_long **vals;
     627      mg_u_long **vals;
    628628      if (cd->cdh.num_words[which])
    629629        {
    … …  
    716716{
    717717  compression_dict *cd;
    718   u_long *p, *end;
     718  uintptr_t *p, *end;
    719719  u_char *fixup;
    720   u_long mem;
    721   u_long fixup_mem;
     720  mg_u_long mem;
     721  mg_u_long fixup_mem;
    722722  int i;  /* [RPAP - Jan 97: Endian Ordering] */
    723723
    … …  
    732732    }
    733733
    734   end = (u_long *) (((u_char *) cd) + mem);
     734  end = (uintptr_t *) (((u_char *) cd) + mem);
    735735  Fread (cd, sizeof (u_char), mem, text_fast_comp_dict);
    736736
    … …  
    743743  Fread (fixup, fixup_mem, sizeof (u_char), text_fast_comp_dict);
    744744
    745   for (p = (u_long *) cd; (u_long) p < (u_long) end; p++)
     745  for (p = (uintptr_t *) cd; (uintptr_t) p < (uintptr_t) end; p++)
    746746    if (IS_FIXUP (p))
    747747      {
    748748    NTOHUL(*p);  /* [RPAP - Jan 97: Endian Ordering] */
    749     *p = *p + (u_long) cd;
     749    *p = *p + (uintptr_t) cd;
    750750      }
    751751
    … …  
    863863#define MY_HUFF_DECODE(len, code, mcodes)               \
    864864  do {                                  \
    865     register unsigned long *__min_code = (mcodes);          \
    866     register unsigned long *__mclen = __min_code;           \
    867     register unsigned long __code = 0;                  \
     865    register mg_u_long *__min_code = (mcodes);          \
     866    register mg_u_long *__mclen = __min_code;           \
     867    register mg_u_long __code = 0;                  \
    868868    do                                  \
    869869      {                                 \
    … …  
    886886  auxiliary_dict *ad = cd->ad;
    887887  int which;
    888   u_long num_bits, bits;
     888  mg_u_long num_bits, bits;
    889889  u_char *ptr = s_out;
    890890  static int num = 0;
    891   u_long binary_start[2];
     891  mg_u_long binary_start[2];
    892892  int novels_used[2];
    893893  int swaps[2][MAX_SWAPS];

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/text_get.h

    r16583 r25147  
    3232 * It returns the true weight of the document.
    3333 */
    34 double FetchDocStart (query_data * qd, u_long DN, u_long * seek_pos, u_long * len);
     34double FetchDocStart (query_data * qd, mg_u_long DN, mg_u_long * seek_pos, mg_u_long * len);
    3535
    36 unsigned long FetchInitialParagraph (text_data * td, unsigned long ParaNum);
     36mg_u_long FetchInitialParagraph (text_data * td, mg_u_long ParaNum);
    3737
    3838

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/weights.c

    r16583 r25147  
    3939#include "mg_errors.h"
    4040
    41 #define MAXBITS (sizeof(unsigned long) * 8)
     41#define MAXBITS (sizeof(mg_u_long) * 8)
    4242
    4343/*
    … …  
    6363approx_weights_data *
    6464LoadDocWeights (File * weight_file,
    65         unsigned long num_of_docs)
     65        mg_u_long num_of_docs)
    6666{
    6767  approx_weights_data *awd;
    … …  
    7474    }
    7575
    76   Fseek (weight_file, sizeof (long), 0);
     76  Fseek (weight_file, sizeof (mg_s_long), 0);
    7777  Fread (&awd->bits, sizeof (awd->bits), 1, weight_file);
    7878  Fread (&awd->L, sizeof (awd->L), 1, weight_file);
    … …  
    8484
    8585  num = (num_of_docs * awd->bits + 31) / 32;
    86   if (!(awd->DocWeights = Xmalloc (sizeof (unsigned long) * num)))
     86  if (!(awd->DocWeights = Xmalloc (sizeof (mg_u_long) * num)))
    8787    {
    8888      Xfree (awd);
    … …  
    9191    }
    9292
    93   Fread (awd->DocWeights, sizeof (unsigned long), num, weight_file);
     93  Fread (awd->DocWeights, sizeof (mg_u_long), num, weight_file);
    9494  {
    9595    /* [RPAP - Jan 97: Endian Ordering] */
    96     unsigned long i;
     96    mg_u_long i;
    9797    for (i = 0; i < num; i++)
    9898      NTOHUL(awd->DocWeights[i]);
    9999  }
    100100
    101   awd->MemForWeights = num * sizeof (unsigned long);
     101  awd->MemForWeights = num * sizeof (mg_u_long);
    102102  awd->num_of_docs = num_of_docs;
    103103
    … …  
    129129GetLowerApproxDocWeight (approx_weights_data * awd, register int DocNum)
    130130{
    131   register unsigned long c, Pos;
    132   register unsigned long *dw;
     131  register mg_u_long c, Pos;
     132  register mg_u_long *dw;
    133133  if (awd == NULL)
    134134    return 1.0;

  • main/trunk/greenstone2/common-src/indexers/mg/src/text/weights.h

    r16583 r25147  
    2626
    2727approx_weights_data *LoadDocWeights (File * weight_file,
    28                      unsigned long num_of_docs);
     28                     mg_u_long num_of_docs);
    2929
    3030float GetLowerApproxDocWeight (approx_weights_data * awd, register int DocNum);

  • main/trunk/greenstone2/common-src/indexers/mg/sysfuncs.h

    r16583 r25147  
    351351#endif
    352352
    353 /* [RPAP - Feb 97: WIN32 Port] */
    354 #ifndef u_long
    355 # define u_long unsigned long
    356 #endif
     353#include "mglong.h"
     354
    357355#ifndef u_char
    358356# define u_char unsigned char
    359357#endif
    360358
    361 
    362359#endif /* SYSFUNCS_H */

  • main/trunk/greenstone2/common-src/indexers/mgpp/Makefile.in

    r16583 r25147  
    2929CC = @CC@
    3030CXX = @CXX@
    31 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi
     31CFLAGS = @CFLAGS@ -ansi
    3232INSTALL = @INSTALL@
    3333INSTALL_DATA = @INSTALL_DATA@
    3434INSTALL_PROGRAM = @INSTALL_PROGRAM@
    35 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     35LDFLAGS = @LDFLAGS@
    3636LIBS = @LIBS@ 
    3737TOUCH = echo timestamp >

  • main/trunk/greenstone2/common-src/indexers/mgpp/configure

    r23356 r25147  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.67.
     3# Generated by GNU Autoconf 2.65.
    44#
    55#
    66# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
    8 # Foundation, Inc.
     7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
     8# Inc.
    99#
    1010#
    … …  
    317317    done
    318318    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"
    320320
    321321
    … …  
    357357
    358358
    359 # as_fn_error STATUS ERROR [LINENO LOG_FD]
    360 # ----------------------------------------
     359# as_fn_error ERROR [LINENO LOG_FD]
     360# ---------------------------------
    361361# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    362362# 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.
    364364as_fn_error ()
    365365{
    366   as_status=$1; test $as_status -eq 0 && as_status=1
    367   if test "$4"; then
    368     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    369     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     366  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
    370370  fi
    371   $as_echo "$as_me: error: $2" >&2
     371  $as_echo "$as_me: error: $1" >&2
    372372  as_fn_exit $as_status
    373373} # as_fn_error
    … …  
    531531
    532532# 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,
    534534# so uname gets run too.
    535535ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
    … …  
    628628CXX
    629629ENABLE_ACCENTFOLD
    630 COMPAT32BITFLAGS
    631630ENABLE_JAVA
    632631VERSION
    … …  
    769768
    770769  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 ;;
    774772  esac
    775773
    … …  
    816814    # Reject names that are not valid shell variable names.
    817815    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"
    819817    ac_useropt_orig=$ac_useropt
    820818    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    842840    # Reject names that are not valid shell variable names.
    843841    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"
    845843    ac_useropt_orig=$ac_useropt
    846844    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10461044    # Reject names that are not valid shell variable names.
    10471045    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"
    10491047    ac_useropt_orig=$ac_useropt
    10501048    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10621060    # Reject names that are not valid shell variable names.
    10631061    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"
    10651063    ac_useropt_orig=$ac_useropt
    10661064    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
    … …  
    10921090    x_libraries=$ac_optarg ;;
    10931091
    1094   -*) as_fn_error $? "unrecognized option: \`$ac_option'
    1095 Try \`$0 --help' for more information"
     1092  -*) as_fn_error "unrecognized option: \`$ac_option'
     1093Try \`$0 --help' for more information."
    10961094    ;;
    10971095
    … …  
    11011099    case $ac_envvar in #(
    11021100      '' | [0-9]* | *[!_$as_cr_alnum]* )
    1103       as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     1101      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
    11041102    esac
    11051103    eval $ac_envvar=\$ac_optarg
    … …  
    11191117if test -n "$ac_prev"; then
    11201118  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"
    11221120fi
    11231121
    … …  
    11251123  case $enable_option_checking in
    11261124    no) ;;
    1127     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     1125    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
    11281126    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    11291127  esac
    … …  
    11481146    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    11491147  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"
    11511149done
    11521150
    … …  
    11621160  if test "x$build_alias" = x; then
    11631161    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" >&2
     1162    $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
    11661164  elif test "x$build_alias" != "x$host_alias"; then
    11671165    cross_compiling=yes
    … …  
    11781176ac_ls_di=`ls -di .` &&
    11791177ac_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"
    11811179test "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"
    11831181
    11841182
    … …  
    12191217if test ! -r "$srcdir/$ac_unique_file"; then
    12201218  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"
    12221220fi
    12231221ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
    12241222ac_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"
    12261224    pwd)`
    12271225# When building in place, set srcdir=.
    … …  
    12631261      --help=recursive    display the short help of all the included packages
    12641262  -V, --version           display version information and exit
    1265   -q, --quiet, --silent   do not print \`checking ...' messages
     1263  -q, --quiet, --silent   do not print \`checking...' messages
    12661264      --cache-file=FILE   cache test results in FILE [disabled]
    12671265  -C, --config-cache      alias for \`--cache-file=config.cache'
    … …  
    14241422  cat <<\_ACEOF
    14251423configure
    1426 generated by GNU Autoconf 2.67
    1427 
    1428 Copyright (C) 2010 Free Software Foundation, Inc.
     1424generated by GNU Autoconf 2.65
     1425
     1426Copyright (C) 2009 Free Software Foundation, Inc.
    14291427This configure script is free software; the Free Software Foundation
    14301428gives unlimited permission to copy, distribute and modify it.
    … …  
    15341532  fi
    15351533  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1536   test $ac_status = 0; } > conftest.i && {
     1534  test $ac_status = 0; } >/dev/null && {
    15371535     test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
    15381536     test ! -s conftest.err
    … …  
    15581556{
    15591557  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 :
    15611559  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    15621560$as_echo_n "checking for $2... " >&6; }
    1563 if eval "test \"\${$3+set}\"" = set; then :
     1561if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    15641562  $as_echo_n "(cached) " >&6
    15651563fi
    … …  
    15971595  ac_header_preproc=no
    15981596fi
    1599 rm -f conftest.err conftest.i conftest.$ac_ext
     1597rm -f conftest.err conftest.$ac_ext
    16001598{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
    16011599$as_echo "$ac_header_preproc" >&6; }
    … …  
    16241622  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    16251623$as_echo_n "checking for $2... " >&6; }
    1626 if eval "test \"\${$3+set}\"" = set; then :
     1624if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    16271625  $as_echo_n "(cached) " >&6
    16281626else
    … …  
    16881686  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    16891687$as_echo_n "checking for $2... " >&6; }
    1690 if eval "test \"\${$3+set}\"" = set; then :
     1688if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    16911689  $as_echo_n "(cached) " >&6
    16921690else
    … …  
    17651763  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    17661764$as_echo_n "checking for $2... " >&6; }
    1767 if eval "test \"\${$3+set}\"" = set; then :
     1765if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    17681766  $as_echo_n "(cached) " >&6
    17691767else
    … …  
    18181816  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
    18191817$as_echo_n "checking for $2... " >&6; }
    1820 if eval "test \"\${$3+set}\"" = set; then :
     1818if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    18211819  $as_echo_n "(cached) " >&6
    18221820else
    … …  
    20592057
    20602058It was created by $as_me, which was
    2061 generated by GNU Autoconf 2.67.  Invocation command line was
     2059generated by GNU Autoconf 2.65.  Invocation command line was
    20622060
    20632061  $ $0 $@
    … …  
    21692167    echo
    21702168
    2171     $as_echo "## ---------------- ##
     2169    cat <<\_ASBOX
     2170## ---------------- ##
    21722171## Cache variables. ##
    2173 ## ---------------- ##"
     2172## ---------------- ##
     2173_ASBOX
    21742174    echo
    21752175    # The following way of writing the cache mishandles newlines in values,
    … …  
    22052205    echo
    22062206
    2207     $as_echo "## ----------------- ##
     2207    cat <<\_ASBOX
     2208## ----------------- ##
    22082209## Output variables. ##
    2209 ## ----------------- ##"
     2210## ----------------- ##
     2211_ASBOX
    22102212    echo
    22112213    for ac_var in $ac_subst_vars
    … …  
    22202222
    22212223    if test -n "$ac_subst_files"; then
    2222       $as_echo "## ------------------- ##
     2224      cat <<\_ASBOX
     2225## ------------------- ##
    22232226## File substitutions. ##
    2224 ## ------------------- ##"
     2227## ------------------- ##
     2228_ASBOX
    22252229      echo
    22262230      for ac_var in $ac_subst_files
    … …  
    22362240
    22372241    if test -s confdefs.h; then
    2238       $as_echo "## ----------- ##
     2242      cat <<\_ASBOX
     2243## ----------- ##
    22392244## confdefs.h. ##
    2240 ## ----------- ##"
     2245## ----------- ##
     2246_ASBOX
    22412247      echo
    22422248      cat confdefs.h
    … …  
    22932299ac_site_file2=NONE
    22942300if 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
    23012302elif test "x$prefix" != xNONE; then
    23022303  ac_site_file1=$prefix/share/config.site
    … …  
    23132314$as_echo "$as_me: loading site script $ac_site_file" >&6;}
    23142315    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"
    23202317  fi
    23212318done
    … …  
    23932390  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
    23942391$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" 5
     2392  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
    23962393fi
    23972394## -------------------- ##
    … …  
    24112408ac_aux_dir=
    24122409for 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
    24262417done
    24272418if test -z "$ac_aux_dir"; then
    2428   as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
     2419  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
    24292420fi
    24302421
    … …  
    24402431# Make sure we can run config.sub.
    24412432$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
    2442   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
     2433  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
    24432434
    24442435{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
    … …  
    24512442  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
    24522443test "x$ac_build_alias" = x &&
    2453   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
     2444  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
    24542445ac_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" 5
     2446  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
    24562447
    24572448fi
    … …  
    24602451case $ac_cv_build in
    24612452*-*-*) ;;
    2462 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
     2453*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
    24632454esac
    24642455build=$ac_cv_build
    … …  
    24852476else
    24862477  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" 5
     2478    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
    24882479fi
    24892480
    … …  
    24932484case $ac_cv_host in
    24942485*-*-*) ;;
    2495 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
     2486*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
    24962487esac
    24972488host=$ac_cv_host
    … …  
    25182509else
    25192510  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" 5
     2511    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
    25212512fi
    25222513
    … …  
    25262517case $ac_cv_target in
    25272518*-*-*) ;;
    2528 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
     2519*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
    25292520esac
    25302521target=$ac_cv_target
    … …  
    25932584fi
    25942585
    2595 
    2596 { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if architecture is 64-bit" >&5
    2597 $as_echo_n "checking to see if architecture is 64-bit... " >&6; }
    2598 arch_64bit=no
    2599 case "$host_cpu" in
    2600 x86_64) arch_64bit=yes ;;
    2601 esac
    2602 
    2603 if test "$arch_64bit" = yes; then
    2604   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    2605 $as_echo "yes" >&6; }
    2606   if test -z "$COMPAT32BITFLAGS" ; then
    2607     COMPAT32BITFLAGS="-m32"
    2608   fi
    2609 else
    2610   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    2611 $as_echo "no" >&6; }
    2612   if test -z "$COMPAT32BITFLAGS" ; then
    2613     COMPAT32BITFLAGS=
    2614   fi
    2615 fi
    26162586
    26172587
    … …  
    28562826{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    28572827$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
     2829as_fn_error "C++ compiler cannot create executables
     2830See \`config.log' for more details." "$LINENO" 5; }; }
    28602831else
    28612832  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    … …  
    28992870  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    29002871$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2901 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
    2902 See \`config.log' for more details" "$LINENO" 5 ; }
     2872as_fn_error "cannot compute suffix of executables: cannot compile and link
     2873See \`config.log' for more details." "$LINENO" 5; }
    29032874fi
    29042875rm -f conftest conftest$ac_cv_exeext
    … …  
    29572928    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    29582929$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    2959 as_fn_error $? "cannot run C++ compiled programs.
     2930as_fn_error "cannot run C++ compiled programs.
    29602931If you meant to cross compile, use \`--host'.
    2961 See \`config.log' for more details" "$LINENO" 5 ; }
     2932See \`config.log' for more details." "$LINENO" 5; }
    29622933    fi
    29632934  fi
    … …  
    30102981{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    30112982$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3012 as_fn_error $? "cannot compute suffix of object files: cannot compile
    3013 See \`config.log' for more details" "$LINENO" 5 ; }
     2983as_fn_error "cannot compute suffix of object files: cannot compile
     2984See \`config.log' for more details." "$LINENO" 5; }
    30142985fi
    30152986rm -f conftest.$ac_cv_objext conftest.$ac_ext
    … …  
    35253496test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    35263497$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    3527 as_fn_error $? "no acceptable C compiler found in \$PATH
    3528 See \`config.log' for more details" "$LINENO" 5 ; }
     3498as_fn_error "no acceptable C compiler found in \$PATH
     3499See \`config.log' for more details." "$LINENO" 5; }
    35293500
    35303501# Provide some information about the compiler.
    … …  
    38733844set x ${MAKE-make}
    38743845ac_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 :
     3846if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
    38763847  $as_echo_n "(cached) " >&6
    38773848else
    … …  
    38813852    @echo '@@@%%%=$(MAKE)=@@@%%%'
    38823853_ACEOF
    3883 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
     3854# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
    38843855case `${MAKE-make} -f conftest.make 2>/dev/null` in
    38853856  *@@@%%%=?*=@@@%%%*)
    … …  
    40844055
    40854056    fi
    4086     test x$JAVA = x && as_fn_error $? "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5
     4057    test x$JAVA = x && as_fn_error "no acceptable Java virtual machine found in \$PATH" "$LINENO" 5
    40874058fi
    40884059
    … …  
    41464117        ac_cv_prog_uudecode_base64=yes
    41474118else
    4148         echo "configure: 4148: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
     4119        echo "configure: 4119: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
    41494120        echo "configure: failed file was:" >&5
    41504121        cat Test.uue >&5
    … …  
    41614132$as_echo "$as_me: WARNING: I have to compile Test.class from scratch" >&2;}
    41624133        if test x$ac_cv_prog_javac_works = xno; then
    4163                 as_fn_error $? "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5
     4134                as_fn_error "Cannot compile java source. $JAVAC does not work properly" "$LINENO" 5
    41644135        fi
    41654136        if test x$ac_cv_prog_javac_works = x; then
    … …  
    42544225
    42554226  fi
    4256   test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5
     4227  test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5
    42574228else
    42584229  echo "Checking for javac... $JAVAC"
    … …  
    42694240CLASS_TEST=Test.class
    42704241cat << \EOF > $JAVA_TEST
    4271 /* #line 4271 "configure" */
     4242/* #line 4242 "configure" */
    42724243public class Test {
    42734244}
    … …  
    42814252  ac_cv_prog_javac_works=yes
    42824253else
    4283   as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4254  as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    42844255  echo "configure: failed program was:" >&5
    42854256  cat $JAVA_TEST >&5
    … …  
    43084279TEST=Test
    43094280cat << \EOF > $JAVA_TEST
    4310 /* [#]line 4310 "configure" */
     4281/* [#]line 4281 "configure" */
    43114282public class Test {
    43124283public static void main (String args[]) {
    … …  
    43254296          echo "configure: failed program was:" >&5
    43264297          cat $JAVA_TEST >&5
    4327           as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4298          as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    43284299        fi
    43294300fi
    … …  
    43384309  echo "configure: failed program was:" >&5
    43394310  cat $JAVA_TEST >&5
    4340   as_fn_error $? "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4311  as_fn_error "The Java VM $JAVA failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    43414312fi
    43424313rm -fr $JAVA_TEST $CLASS_TEST Test.uue
    … …  
    44384409
    44394410  fi
    4440   test "x$JAVAC" = x && as_fn_error $? "no acceptable Java compiler found in \$PATH" "$LINENO" 5
     4411  test "x$JAVAC" = x && as_fn_error "no acceptable Java compiler found in \$PATH" "$LINENO" 5
    44414412else
    44424413  echo "Checking for javac... $JAVAC"
    … …  
    44534424CLASS_TEST=Test.class
    44544425cat << \EOF > $JAVA_TEST
    4455 /* #line 4455 "configure" */
     4426/* #line 4426 "configure" */
    44564427public class Test {
    44574428}
    … …  
    44654436  ac_cv_prog_javac_works=yes
    44664437else
    4467   as_fn_error $? "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
     4438  as_fn_error "The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)" "$LINENO" 5
    44684439  echo "configure: failed program was:" >&5
    44694440  cat $JAVA_TEST >&5
    … …  
    45254496continue
    45264497fi
    4527 rm -f conftest.err conftest.i conftest.$ac_ext
     4498rm -f conftest.err conftest.$ac_ext
    45284499
    45294500  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    45414512break
    45424513fi
    4543 rm -f conftest.err conftest.i conftest.$ac_ext
     4514rm -f conftest.err conftest.$ac_ext
    45444515
    45454516done
    45464517# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    4547 rm -f conftest.i conftest.err conftest.$ac_ext
     4518rm -f conftest.err conftest.$ac_ext
    45484519if $ac_preproc_ok; then :
    45494520  break
    … …  
    45844555continue
    45854556fi
    4586 rm -f conftest.err conftest.i conftest.$ac_ext
     4557rm -f conftest.err conftest.$ac_ext
    45874558
    45884559  # OK, works on sane cases.  Now check whether nonexistent headers
    … …  
    46004571break
    46014572fi
    4602 rm -f conftest.err conftest.i conftest.$ac_ext
     4573rm -f conftest.err conftest.$ac_ext
    46034574
    46044575done
    46054576# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
    4606 rm -f conftest.i conftest.err conftest.$ac_ext
     4577rm -f conftest.err conftest.$ac_ext
    46074578if $ac_preproc_ok; then :
    46084579
    … …  
    46104581  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    46114582$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    4612 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
    4613 See \`config.log' for more details" "$LINENO" 5 ; }
     4583as_fn_error "C preprocessor \"$CPP\" fails sanity check
     4584See \`config.log' for more details." "$LINENO" 5; }
    46144585fi
    46154586
    … …  
    46724643IFS=$as_save_IFS
    46734644  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" 5
     4645    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    46754646  fi
    46764647else
    … …  
    47384709IFS=$as_save_IFS
    47394710  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" 5
     4711    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    47414712  fi
    47424713else
    … …  
    48704841ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
    48714842"
    4872 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     4843eval as_val=\$$as_ac_Header
     4844   if test "x$as_val" = x""yes; then :
    48734845  cat >>confdefs.h <<_ACEOF
    48744846#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    54425414{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
    54435415$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
    5444 if eval "test \"\${$as_ac_Header+set}\"" = set; then :
     5416if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
    54455417  $as_echo_n "(cached) " >&6
    54465418else
    … …  
    54695441           { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
    54705442$as_echo "$ac_res" >&6; }
    5471 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
     5443eval as_val=\$$as_ac_Header
     5444   if test "x$as_val" = x""yes; then :
    54725445  cat >>confdefs.h <<_ACEOF
    54735446#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
    … …  
    57115684  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
    57125685ac_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 :
     5686eval as_val=\$$as_ac_Header
     5687   if test "x$as_val" = x""yes; then :
    57145688  cat >>confdefs.h <<_ACEOF
    57155689#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
    … …  
    58845858    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
    58855859ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
    5886 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
     5860eval as_val=\$$as_ac_var
     5861   if test "x$as_val" = x""yes; then :
    58875862
    58885863cat >>confdefs.h <<_ACEOF
    … …  
    60446019  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
    60456020ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
    6046 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
     6021eval as_val=\$$as_ac_var
     6022   if test "x$as_val" = x""yes; then :
    60476023  cat >>confdefs.h <<_ACEOF
    60486024#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
    … …  
    60526028done
    60536029
    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
     6030for ac_func in ftruncate strstr strcasecmp
     6031do :
     6032  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
     6033ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
     6034eval 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
    60576039
    60586040else
    60596041  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"
    60626044 ;;
    60636045esac
    60646046
    60656047fi
    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
     6048done
    60926049
    60936050
    … …  
    62286185     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    62296186$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
     6188as_fn_error "cannot compute sizeof (unsigned char *)
     6189See \`config.log' for more details." "$LINENO" 5; }; }
    62326190   else
    62336191     ac_cv_sizeof_unsigned_char_p=0
    … …  
    66156573     ;; #(
    66166574   *)
    6617      as_fn_error $? "unknown endianness
    6618  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 ;;
    66196577 esac
    66206578
    … …  
    67366694ac_libobjs=
    67376695ac_ltlibobjs=
    6738 U=
    67396696for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    67406697  # 1. Remove the extension, and $U if already installed.
    … …  
    68996856
    69006857
    6901 # as_fn_error STATUS ERROR [LINENO LOG_FD]
    6902 # ----------------------------------------
     6858# as_fn_error ERROR [LINENO LOG_FD]
     6859# ---------------------------------
    69036860# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
    69046861# 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.
    69066863as_fn_error ()
    69076864{
    6908   as_status=$1; test $as_status -eq 0 && as_status=1
    6909   if test "$4"; then
    6910     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    6911     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
     6865  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
    69126869  fi
    6913   $as_echo "$as_me: error: $2" >&2
     6870  $as_echo "$as_me: error: $1" >&2
    69146871  as_fn_exit $as_status
    69156872} # as_fn_error
    … …  
    71077064    done
    71087065    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"
    71107067
    71117068
    … …  
    71617118ac_log="
    71627119This file was extended by $as_me, which was
    7163 generated by GNU Autoconf 2.67.  Invocation command line was
     7120generated by GNU Autoconf 2.65.  Invocation command line was
    71647121
    71657122  CONFIG_FILES    = $CONFIG_FILES
    … …  
    72277184ac_cs_version="\\
    72287185config.status
    7229 configured by $0, generated by GNU Autoconf 2.67,
     7186configured by $0, generated by GNU Autoconf 2.65,
    72307187  with options \\"\$ac_cs_config\\"
    72317188
    7232 Copyright (C) 2010 Free Software Foundation, Inc.
     7189Copyright (C) 2009 Free Software Foundation, Inc.
    72337190This config.status script is free software; the Free Software Foundation
    72347191gives unlimited permission to copy, distribute and modify it."
    … …  
    72477204do
    72487205  case $1 in
    7249   --*=?*)
     7206  --*=*)
    72507207    ac_option=`expr "X$1" : 'X\([^=]*\)='`
    72517208    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
    7252     ac_shift=:
    7253     ;;
    7254   --*=)
    7255     ac_option=`expr "X$1" : 'X\([^=]*\)='`
    7256     ac_optarg=
    72577209    ac_shift=:
    72587210    ;;
    … …  
    72787230    case $ac_optarg in
    72797231    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
    7280     '') as_fn_error $? "missing file argument" ;;
    72817232    esac
    72827233    as_fn_append CONFIG_FILES " '$ac_optarg'"
    … …  
    72917242  --he | --h)
    72927243    # Conflict between --help and --header
    7293     as_fn_error $? "ambiguous option: \`$1'
     7244    as_fn_error "ambiguous option: \`$1'
    72947245Try \`$0 --help' for more information.";;
    72957246  --help | --hel | -h )
    … …  
    73007251
    73017252  # This is an error.
    7302   -*) as_fn_error $? "unrecognized option: \`$1'
     7253  -*) as_fn_error "unrecognized option: \`$1'
    73037254Try \`$0 --help' for more information." ;;
    73047255
    … …  
    73577308    "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
    73587309
    7359   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
     7310  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
    73607311  esac
    73617312done
    … …  
    73957346  tmp=./conf$$-$RANDOM
    73967347  (umask 077 && mkdir "$tmp")
    7397 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
     7348} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
    73987349
    73997350# Set up the scripts for CONFIG_FILES section.
    … …  
    74127363ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
    74137364if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
    7414   ac_cs_awk_cr='\\r'
     7365  ac_cs_awk_cr='\r'
    74157366else
    74167367  ac_cs_awk_cr=$ac_cr
    … …  
    74267377  echo "_ACEOF"
    74277378} >conf$$subs.sh ||
    7428   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
    7429 ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
     7379  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
     7380ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
    74307381ac_delim='%!_!# '
    74317382for ac_last_try in false false false false false :; do
    74327383  . ./conf$$subs.sh ||
    7433     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     7384    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    74347385
    74357386  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
    … …  
    74377388    break
    74387389  elif $ac_last_try; then
    7439     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
     7390    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    74407391  else
    74417392    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    … …  
    75267477  cat
    75277478fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
    7528   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
    7529 _ACEOF
    7530 
    7531 # VPATH may cause trouble with some makes, so we remove sole $(srcdir),
    7532 # ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
     7479  || 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
    75337484# trailing colons and then remove the whole line if VPATH becomes empty
    75347485# (actually we leave an empty line to preserve line numbers).
    75357486if 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[    ]*=/{
     7488s/:*\$(srcdir):*/:/
     7489s/:*\${srcdir}:*/:/
     7490s/:*@srcdir@:*/:/
     7491s/^\([^=]*=[     ]*\):*/\1/
    75457492s/:*$//
    7546 x
    7547 s/\(=[   ]*\).*/\1/
    7548 G
    7549 s/\n//
    75507493s/^[^=]*=[   ]*$//
    75517494}'
    … …  
    75757518    break
    75767519  elif $ac_last_try; then
    7577     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
     7520    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
    75787521  else
    75797522    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    … …  
    76607603_ACEOF
    76617604cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
    7662   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
     7605  as_fn_error "could not setup config headers machinery" "$LINENO" 5
    76637606fi # test -n "$CONFIG_HEADERS"
    76647607
    … …  
    76737616  case $ac_mode$ac_tag in
    76747617  :[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;;
    76767619  :[FH]-) ac_tag=-:-;;
    76777620  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    … …  
    77017644       *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
    77027645       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;;
    77047647      esac
    77057648      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
    … …  
    77287671    case $ac_tag in
    77297672    *:-:* | *:-) 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 ;;
    77317674    esac
    77327675    ;;
    … …  
    78597802"
    78607803eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
    7861   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7804  || as_fn_error "could not create $ac_file" "$LINENO" 5
    78627805
    78637806test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
    … …  
    78657808  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
    78667809  { $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" >&5
     7810which seems to be undefined.  Please make sure it is defined." >&5
    78687811$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;}
     7812which seems to be undefined.  Please make sure it is defined." >&2;}
    78707813
    78717814  rm -f "$tmp/stdin"
    … …  
    78747817  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    78757818  esac \
    7876   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7819  || as_fn_error "could not create $ac_file" "$LINENO" 5
    78777820 ;;
    78787821  :H)
    … …  
    78857828      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
    78867829    } >"$tmp/config.h" \
    7887       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7830      || as_fn_error "could not create $ac_file" "$LINENO" 5
    78887831    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
    78897832      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
    … …  
    78927835      rm -f "$ac_file"
    78937836      mv "$tmp/config.h" "$ac_file" \
    7894     || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     7837    || as_fn_error "could not create $ac_file" "$LINENO" 5
    78957838    fi
    78967839  else
    78977840    $as_echo "/* $configure_input  */" \
    78987841      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
    7899       || as_fn_error $? "could not create -" "$LINENO" 5
     7842      || as_fn_error "could not create -" "$LINENO" 5
    79007843  fi
    79017844 ;;
    … …  
    79197862
    79207863test $ac_write_fail = 0 ||
    7921   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
     7864  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
    79227865
    79237866
    … …  
    79407883  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    79417884  # would make configure fail if this is the last instruction.
    7942   $ac_cs_success || as_fn_exit 1
     7885  $ac_cs_success || as_fn_exit $?
    79437886fi
    79447887if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then

  • main/trunk/greenstone2/common-src/indexers/mgpp/configure.in

    r23356 r25147  
    3434AC_SUBST(ENABLE_JAVA)
    3535
    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)
     36dnl AC_MSG_CHECKING(to see if architecture is 64-bit)
     37dnl arch_64bit=no
     38dnl case "$host_cpu" in
     39dnl x86_64) arch_64bit=yes ;;
     40dnl esac
    5441
    5542dnl

  • main/trunk/greenstone2/common-src/indexers/mgpp/java/org/greenstone/mgpp/Makefile.in

    r23356 r25147  
    1717JAVAH = javah
    1818JAR = jar
    19 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX
    20 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -DSILENT -DSHORT_SUFFIX
     19CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX
     20CXXFLAGS = @CXXFLAGS@ -DSILENT -DSHORT_SUFFIX
    2121JAVACFLAGS = @JAVACFLAGS@
    2222DEFS = @DEFS@
    … …  
    2525INSTALL_DATA = @INSTALL_DATA@
    2626INSTALL_PROGRAM = @INSTALL_PROGRAM@
    27 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     27LDFLAGS = @LDFLAGS@
    2828LIBS =  -lstdc++ @LIBS@
    2929TOUCH = echo timestamp >

  • main/trunk/greenstone2/common-src/indexers/mgpp/jni/MGPPRetrieveWrapperImpl.cpp

    r16583 r25147  
    5656   
    5757  // does this work alright? j_docnum is a long (64 bit)
    58   unsigned long docnum = j_docnum;
     58  mg_u_long docnum = j_docnum;
    5959  TextData td;
    6060

  • main/trunk/greenstone2/common-src/indexers/mgpp/jni/Makefile.in

    r22070 r25147  
    2626CC = @CC@
    2727CXX = @CXX@
    28 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fPIC -ansi -DSILENT -DSHORT_SUFFIX
    29 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX
     28CFLAGS = @CFLAGS@ -fPIC -ansi -DSILENT -DSHORT_SUFFIX
     29CXXFLAGS = @CXXFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX
    3030DEFS = @DEFS@
    3131RANLIB = @RANLIB@
    … …  
    3333INSTALL_DATA = @INSTALL_DATA@
    3434INSTALL_PROGRAM = @INSTALL_PROGRAM@
    35 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     35LDFLAGS = @LDFLAGS@
    3636#NOTE: libmgpptext.a needs to come before libmgpplib.a !!!
    3737QUERY_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  
    3636CXX = @CXX@
    3737ifneq ($(NZDL), 1)
    38 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -fPIC
     38CFLAGS = @CFLAGS@ -ansi -fPIC
    3939else
    40 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -fPIC -DSILENT
     40CFLAGS = @CFLAGS@ -ansi -fPIC -DSILENT
    4141endif
    42 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -fPIC
     42CXXFLAGS = @CXXFLAGS@ -fPIC
    4343DEFS = @DEFS@
    4444RANLIB = @RANLIB@

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/alloca.c

    r16583 r25147  
    5959
    6060#if defined (CRAY) && defined (CRAY_STACKSEG_END)
    61 long i00afunc ();
     61mg_s_long i00afunc ();
    6262#define ADDRESS_FUNCTION(arg) (char *) i00afunc (&(arg))
    6363#else
    … …  
    237237struct stack_control_header
    238238  {
    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).  */
    243243  };
    244244
    … …  
    252252struct stack_segment_linkage
    253253  {
    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 previous
     254    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
    259259                   segment of stack.  */
    260     long:32;
    261     long sstcpt:32;     /* Pointer to task common address block.  */
    262     long sscsnm;        /* Private control structure number for
     260    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
    263263                   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;
    285285  };
    286286
    … …  
    290290struct stk_stat
    291291  {
    292     long now;           /* Current total stack size.  */
    293     long maxc;          /* Amount of contiguous space which would
     292    mg_s_long now;          /* Current total stack size.  */
     293    mg_s_long maxc;         /* Amount of contiguous space which would
    294294                   be required to satisfy the maximum
    295295                   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.  This
     296    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
    309309                   number is actually corrupted by STKSTAT to
    310310                   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.  */
    313313  };
    314314
    … …  
    319319struct stk_trailer
    320320  {
    321     long this_address;      /* Address of this block.  */
    322     long this_size;     /* Size of this block (does not include
     321    mg_s_long this_address;     /* Address of this block.  */
     322    mg_s_long this_size;        /* Size of this block (does not include
    323323                   this trailer).  */
    324     long unknown2;
    325     long unknown3;
    326     long link;          /* Address of trailer block of previous
     324    mg_s_long unknown2;
     325    mg_s_long unknown3;
     326    mg_s_long link;         /* Address of trailer block of previous
    327327                   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;
    338338  };
    339339
    … …  
    345345   I doubt that "lint" will like this much. */
    346346
    347 static long
    348 i00afunc (long *address)
     347static mg_s_long
     348i00afunc (mg_s_long *address)
    349349{
    350350  struct stk_stat status;
    351351  struct stk_trailer *trailer;
    352   long *block, size;
    353   long result = 0;
     352  mg_s_long *block, size;
     353  mg_s_long result = 0;
    354354
    355355  /* We want to iterate through all of the segments.  The first
    … …  
    376376  while (trailer != 0)
    377377    {
    378       block = (long *) trailer->this_address;
     378      block = (mg_s_long *) trailer->this_address;
    379379      size = trailer->this_size;
    380380      if (block == 0 || size == 0)
    … …  
    419419   for alloca.  */
    420420
    421 static long
    422 i00afunc (long address)
     421static mg_s_long
     422i00afunc (mg_s_long address)
    423423{
    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;
    428428
    429429  struct stack_segment_linkage *ssptr;

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_gen.cpp

    r16583 r25147  
    2525int fprintf (FILE *, const char *,...);
    2626
    27 unsigned long
    28 BIO_Unary_Length (unsigned long val)
     27mg_u_long
     28BIO_Unary_Length (mg_u_long val)
    2929{
    30   register unsigned long num;
     30  register mg_u_long num;
    3131  num = bitio_buffer::unary_length(val);
    3232  //  UNARY_LENGTH (val, num);
    … …  
    3535
    3636
    37 unsigned long
    38 BIO_Binary_Length (unsigned long val, unsigned long b)
     37mg_u_long
     38BIO_Binary_Length (mg_u_long val, mg_u_long b)
    3939{
    40   register unsigned long num;
     40  register mg_u_long num;
    4141  num = bitio_buffer::binary_length (val, b);
    4242  return (num);
    … …  
    4444
    4545
    46 unsigned long BIO_Gamma_Length (unsigned long val) {
    47   register unsigned long num;
     46mg_u_long BIO_Gamma_Length (mg_u_long val) {
     47  register mg_u_long num;
    4848  num = bitio_buffer::gamma_length(val);
    4949  return (num);
    … …  
    5151
    5252
    53 unsigned long
    54 BIO_Delta_Length (unsigned long val)
     53mg_u_long
     54BIO_Delta_Length (mg_u_long val)
    5555{
    56   register unsigned long num;
     56  register mg_u_long num;
    5757  num = bitio_buffer::delta_length(val);
    5858  return (num);
    … …  
    6060
    6161
    62 unsigned long
    63 BIO_Elias_Length (unsigned long val, unsigned long b, double s)
     62mg_u_long
     63BIO_Elias_Length (mg_u_long val, mg_u_long b, double s)
    6464{
    65   register unsigned long num;
     65  register mg_u_long num;
    6666  num = bitio_buffer::elias_length(val, b, s);
    6767  return (num);
    6868}
    6969
    70 unsigned long
    71 BIO_Bblock_Length (unsigned long val, unsigned long b)
     70mg_u_long
     71BIO_Bblock_Length (mg_u_long val, mg_u_long b)
    7272{
    73   register unsigned long num;
     73  register mg_u_long num;
    7474  num = bitio_buffer::bblock_length (val, b);
    7575  return (num);

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_gen.h

    r16583 r25147  
    3333#define H_BITIO_GEN
    3434
    35 unsigned long BIO_Unary_Length (unsigned long val);
     35mg_u_long BIO_Unary_Length (mg_u_long val);
    3636
    37 unsigned long BIO_Binary_Length (unsigned long val, unsigned long b);
     37mg_u_long BIO_Binary_Length (mg_u_long val, mg_u_long b);
    3838
    39 unsigned long BIO_Gamma_Length (unsigned long val);
     39mg_u_long BIO_Gamma_Length (mg_u_long val);
    4040
    41 unsigned long BIO_Delta_Length (unsigned long val);
     41mg_u_long BIO_Delta_Length (mg_u_long val);
    4242
    43 unsigned long BIO_Elias_Length (unsigned long val, unsigned long b, double s);
     43mg_u_long BIO_Elias_Length (mg_u_long val, mg_u_long b, double s);
    4444
    45 unsigned long BIO_Bblock_Length (unsigned long val, unsigned long b);
     45mg_u_long BIO_Bblock_Length (mg_u_long val, mg_u_long b);
    4646
    4747int BIO_Bblock_Init (int N, int p);

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_m_abstract.h

    r18716 r25147  
    11#ifndef H_BITIO_ABSTRACT
    22#define H_BITIO_ABSTRACT
     3#include "mglong.h"
    34#include <cstdlib>
    45class bitio_buffer {
    … …  
    67  virtual int bit() = 0;
    78  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) {
    1114    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);
    1316      exit(1);
    1417    }
    1518  }
    1619
    17   static inline int floor_log2(unsigned long x) {
    18     unsigned long  _B_x = x;
     20  static inline int floor_log2(mg_u_long x) {
     21    mg_u_long  _B_x = x;
    1922    int reply;
    2023   
    … …  
    2730  }
    2831 
    29   static inline int ceil_log2(unsigned long x) {
     32  static inline int ceil_log2(mg_u_long x) {
    3033    register int _B_x;
    31     unsigned long reply;
     34    mg_u_long reply;
    3235   
    3336    _B_x = x - 1;
    … …  
    4043  }
    4144
    42   inline unsigned long unary_decode(unsigned long *count) {
    43     unsigned long x;
     45  inline mg_u_long unary_decode(mg_u_long *count) {
     46    mg_u_long x;
    4447   
    4548    x = 1;
    … …  
    5154  }
    5255
    53   inline void unary_encode(unsigned long x, unsigned long *count) {
    54     register unsigned long _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);
    5659    if (count != NULL) {
    5760      *count += _B_x;
    … …  
    6366
    6467
    65   inline unsigned long binary_decode(unsigned long b, unsigned long *count) {
    66     register unsigned long _B_x = 0;
    67     register unsigned long _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;
    6871    register int _B_i, _B_logofb, _B_thresh;
    69     register unsigned long reply;
     72    register mg_u_long reply;
    7073   
    7174    if (_B_b != 1) {                   
    … …  
    9699  }
    97100
    98   inline void binary_encode(unsigned long x, unsigned long b, unsigned long *count) {
    99     register unsigned long _B_x = (x);
    100     register unsigned long _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);
    101104    register int _B_nbits, _B_logofb, _B_thresh;
    102105   
    103     check_positive("binary", _B_x);
     106    check_positive((char*)"binary", _B_x);
    104107    _B_logofb = ceil_log2(_B_b);
    105108   
    … …  
    117120  }
    118121
    119   inline unsigned long bblock_decode(unsigned long b, unsigned long *count) {
    120     register unsigned long _B_x1, _B_xx = 0;
    121     register unsigned long _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);
    122125    register int _B_xdivb;
    123126   
    … …  
    131134  }
    132135 
    133   inline void bblock_encode(unsigned long x, unsigned long b, unsigned long *count) {
    134     register unsigned long _B_xx = (x);
    135     register unsigned long _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);
    136139    register int _B_xdivb = 0;
    137     check_positive("bblock", _B_xx);
     140    check_positive((char*)"bblock", _B_xx);
    138141    --_B_xx;
    139142    while (_B_xx >= _B_bb) {
    … …  
    145148  }
    146149
    147   inline unsigned long elias_decode(unsigned long b, double s, unsigned long *count) {
    148     register unsigned long _B_xx;
    149     register unsigned long _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;
    150153    register double _B_s = s;
    151154    register int _B_lower=1, _B_upper=1;
    … …  
    162165    _B_xx = this->binary_decode(_B_upper-_B_lower+1, count);
    163166    --_B_xx;
    164     check_positive("gamma", _B_xx+_B_lower);
     167    check_positive((char*)"gamma", _B_xx+_B_lower);
    165168    return _B_xx+_B_lower;
    166169  }
    167170 
    168   inline void elias_encode(unsigned long x, unsigned long b, double s, unsigned long *count) {
    169     register unsigned long _B_xx = x;
    170     register unsigned long _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;
    171174    register double _B_s = s;
    172175    register int _B_lower=1, _B_upper=1;
    … …  
    174177    register double _B_pow=1.0;
    175178   
    176     check_positive("elias", _B_xx);
     179    check_positive((char*)"elias", _B_xx);
    177180   
    178181    while ((int)_B_xx>_B_upper) {
    … …  
    186189  }
    187190 
    188   inline unsigned long gamma_decode(unsigned long *count) {
    189     register unsigned long _B_xx = 1;
     191  inline mg_u_long gamma_decode(mg_u_long *count) {
     192    register mg_u_long _B_xx = 1;
    190193    register int _B_nbits = 0;
    191194   
    … …  
    199202  }
    200203
    201   inline void gamma_encode(unsigned long x, unsigned long *count) {
    202     register unsigned long _B_xx = x;
     204  inline void gamma_encode(mg_u_long x, mg_u_long *count) {
     205    register mg_u_long _B_xx = x;
    203206    register int _B_logofb;
    204207    register int _B_nbits;
    205208   
    206     check_positive("gamma", _B_xx);
     209    check_positive((char*)"gamma", _B_xx);
    207210    _B_logofb = floor_log2(_B_xx);
    208211    _B_nbits = _B_logofb+1;
    … …  
    215218  }
    216219 
    217   inline unsigned long delta_decode(unsigned long *count) {
    218     register unsigned long _B_xxx;
     220  inline mg_u_long delta_decode(mg_u_long *count) {
     221    register mg_u_long _B_xxx;
    219222    register int _B_logx;
    220223    _B_logx = gamma_decode(count);
    … …  
    225228  }
    226229
    227   inline void delta_encode(unsigned long x, unsigned long *count) {
    228     register unsigned long _B_xxx = x;
     230  inline void delta_encode(mg_u_long x, mg_u_long *count) {
     231    register mg_u_long _B_xxx = x;
    229232    register int _B_logx;
    230233    _B_logx = floor_log2(_B_xxx);
    … …  
    233236  }
    234237
    235   inline unsigned long huff_decode(unsigned long *mcodes, unsigned long **values,
    236                    unsigned long *count = NULL) {
    237     register unsigned long *__min_code = mcodes;
    238     register unsigned long *__mclen    = mcodes;
    239     register unsigned long **__values  = values;
    240     register unsigned long __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;
    241244    do {
    242245      __code += __code + bit();
    … …  
    247250  }
    248251
    249   inline void huff_encode(unsigned long x, unsigned long *codes, char *lens,
    250               unsigned long *count = NULL) {
     252  inline void huff_encode(mg_u_long x, mg_u_long *codes, char *lens,
     253              mg_u_long *count = NULL) {
    251254    register int __i;
    252255    register int __clen = lens[x];
    253     register unsigned long __code = codes[x];
     256    register mg_u_long __code = codes[x];
    254257    for (__i=__clen-1; __i>=0; --__i) {
    255258      encodeBit((__code >> __i) & 1);
    … …  
    260263  }
    261264
    262   static inline unsigned long unary_length(unsigned long x) {
    263     check_positive("unary", x);
     265  static inline mg_u_long unary_length(mg_u_long x) {
     266    check_positive((char*)"unary", x);
    264267    return x;
    265268  }
    266269
    267   static inline int binary_length(unsigned long x, unsigned long b) {
    268     register unsigned long _B_x = (x);
    269     register unsigned long _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);
    270273    register int _B_nbits, _B_logofb, _B_thresh;
    271274   
    272     check_positive("binary", _B_x);
     275    check_positive((char*)"binary", _B_x);
    273276    _B_logofb = ceil_log2(_B_b);
    274277    _B_thresh = (1<<_B_logofb) - _B_b;
    … …  
    278281  }
    279282
    280   static inline unsigned long bblock_length(unsigned long x, unsigned long b) {
    281     register unsigned long _B_bcount, count, _B_xx = (x);
    282     register unsigned long _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);
    283286    register int _B_xdivb = 0;
    284287   
    285     check_positive("bblock", _B_xx);
     288    check_positive((char*)"bblock", _B_xx);
    286289    --_B_xx;
    287290    while (_B_xx >= _B_bb) {
    … …  
    295298  }
    296299 
    297   static inline unsigned long elias_length(unsigned long x, unsigned long b,
     300  static inline mg_u_long elias_length(mg_u_long x, mg_u_long b,
    298301                       double s) {
    299     register unsigned long _B_xx = x;
    300     register unsigned long _B_b = b;
     302    register mg_u_long _B_xx = x;
     303    register mg_u_long _B_b = b;
    301304    register double _B_s = s;
    302305    register int _B_lower=1, _B_upper=1;
    303306    register int _B_k=0, _B_ecount;
    304307    register double _B_pow=1.0;
    305     register unsigned long count;
    306     check_positive("gamma", _B_xx);
     308    register mg_u_long count;
     309    check_positive((char*)"gamma", _B_xx);
    307310   
    308311    while ((int)(_B_xx)>_B_upper) {
    … …  
    318321  }
    319322 
    320   static inline unsigned long gamma_length(unsigned long x) {
    321     register unsigned long _B_xx = x;
     323  static inline mg_u_long gamma_length(mg_u_long x) {
     324    register mg_u_long _B_xx = x;
    322325    register int _B_logofb;
    323     check_positive("gamma", _B_xx);
     326    check_positive((char*)"gamma", _B_xx);
    324327    _B_logofb = floor_log2(_B_xx);
    325328    return _B_logofb*2+1;
    326329  }
    327330
    328   static inline unsigned long delta_length(unsigned long x) {
    329     register unsigned long _B_xxx = x;
     331  static inline mg_u_long delta_length(mg_u_long x) {
     332    register mg_u_long _B_xxx = x;
    330333    register int _B_logx, _B_dcount;
    331     register unsigned long count;
     334    register mg_u_long count;
    332335    _B_logx = floor_log2 (_B_xxx);
    333336    count = gamma_length(_B_logx+1);

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_m_mem.cpp

    r16583 r25147  
    2727
    2828
    29 void mem_bitio_buffer::seek(unsigned long toPos) {
    30   register long _newPos;
     29void mem_bitio_buffer::seek(mg_u_long toPos) {
     30  register mg_s_long _newPos;
    3131  do {
    3232    _newPos = toPos;
    … …  
    3838}
    3939
    40 long mem_bitio_buffer::addff(long b) {
     40mg_s_long mem_bitio_buffer::addff(mg_s_long b) {
    4141  do {
    4242    if (btg == 0) {
    … …  
    5555}
    5656
    57 long mem_bitio_buffer::add00(long b) {
     57mg_s_long mem_bitio_buffer::add00(mg_s_long b) {
    5858  do {
    5959    if (btg == 0) {

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_m_mem.h

    r16583 r25147  
    3535
    3636#include "bitio_m_abstract.h"
     37#include "mglong.h"
    3738
    3839
    … …  
    4849  mem_bitio_buffer ();
    4950  mem_bitio_buffer (unsigned char *buffer, int size);
    50   void seek (unsigned long topos);
     51  void seek (mg_u_long topos);
    5152  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);
    5455  int  bit ();
    5556  void done ();

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_m_mems.cpp

    r16583 r25147  
    1212}
    1313
    14 mems_bitio_buffer::mems_bitio_buffer(unsigned char *readbuffer, long _pos)
     14mems_bitio_buffer::mems_bitio_buffer(unsigned char *readbuffer, mg_s_long _pos)
    1515{
    1616  base = readbuffer;
    … …  
    3131
    3232
    33 void mems_bitio_buffer::seek(unsigned long toPos)
     33void mems_bitio_buffer::seek(mg_u_long toPos)
    3434{
    3535  pos = toPos;
    3636}
    3737
    38 unsigned long mems_bitio_buffer::position()
     38mg_u_long mems_bitio_buffer::position()
    3939{
    4040  return pos;
    4141}
    4242
    43 long mems_bitio_buffer::addff(long b)
     43mg_s_long mems_bitio_buffer::addff(mg_s_long b)
    4444{
    4545  do
    … …  
    5353}
    5454
    55 long mems_bitio_buffer::add00(long b)
     55mg_s_long mems_bitio_buffer::add00(mg_s_long b)
    5656{
    5757  return addff(b);

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_m_mems.h

    r16583 r25147  
    3434
    3535#include "bitio_m_abstract.h"
    36 
     36#include "mglong.h"
    3737
    3838class mems_bitio_buffer : public bitio_buffer {
    3939protected:
    4040  unsigned char *base;
    41   unsigned long  pos;
     41  mg_u_long  pos;
    4242 
    4343public:
    4444  mems_bitio_buffer();
    45   mems_bitio_buffer(unsigned char *readbuffer, long _pos);
    46   void seek(unsigned long topos);
     45  mems_bitio_buffer(unsigned char *readbuffer, mg_s_long _pos);
     46  void seek(mg_u_long topos);
    4747  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);
    5050  int  bit();
    5151  //  int  bitOffset();
    5252  void done();
    5353
    54   unsigned long position();
     54  mg_u_long position();
    5555
    5656  void encodeStart();

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_m_random.cpp

    r16583 r25147  
    99#include "bitio_m_random.h"
    1010
    11 random_bitio_buffer::random_bitio_buffer(FILE *f, unsigned long length)
     11random_bitio_buffer::random_bitio_buffer(FILE *f, mg_u_long length)
    1212{
    1313  buffer = NULL;
    … …  
    1919}
    2020
    21 void random_bitio_buffer::attachFile (FILE *f, unsigned long length) {
     21void random_bitio_buffer::attachFile (FILE *f, mg_u_long length) {
    2222  // delete the old buffer
    2323  if (buffer != NULL) {
    … …  
    4747  if (file != NULL) {
    4848    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    }
    5056  }
    5157}
    … …  
    8894      base += len;
    8995      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    }
    91103      pos = 0;
    92104      used = 0;
    … …  
    136148}
    137149
    138 unsigned long random_bitio_buffer::tell()
     150mg_u_long random_bitio_buffer::tell()
    139151{
    140152  return ((base << 3) + pos);
    141153}
    142154
    143 void random_bitio_buffer::seek(unsigned long toPos)
     155void random_bitio_buffer::seek(mg_u_long toPos)
    144156{
    145157  if (((toPos >> 3) >= base) && (((toPos+7) >> 3) < (base + len)))
    … …  
    153165      base = (toPos >> (shift + 3)) << shift;
    154166      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    }
    156174      pos = toPos & 0x07;
    157175      pos = toPos & ((8 << shift) - 1);
    … …  
    171189}
    172190
    173 long random_bitio_buffer::addff(long b)
     191mg_s_long random_bitio_buffer::addff(mg_s_long b)
    174192{
    175193  return b + b + bit();
    176194}
    177195
    178 long random_bitio_buffer::add00(long b)
     196mg_s_long random_bitio_buffer::add00(mg_s_long b)
    179197{
    180198  return addff(b);
    … …  
    198216      (((toPos + 7) >> 3) < (mg_ullong) (base + len)))
    199217    {
    200       pos = (long) (toPos - (mg_ullong) (base << 3));
     218      pos = (mg_s_long) (toPos - (mg_ullong) (base << 3));
    201219    }
    202220  else
    203221    {
    204222      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));
    210234    }
    211235}

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_m_random.h

    r16583 r25147  
    4242  FILE *file;
    4343  unsigned char *buffer;
    44   unsigned long  base;
    45   unsigned long  used;
    46   unsigned long  pos;
    47   unsigned long  len;
    48   unsigned long  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;
    4949  void writeRead();
    5050
    5151  random_bitio_buffer(FILE *f = 0,
    52               unsigned long length = 8*1024);
     52              mg_u_long length = 8*1024);
    5353  virtual ~random_bitio_buffer();
    5454 
    55   void attachFile (FILE *f, unsigned long length);
     55  void attachFile (FILE *f, mg_u_long length);
    5656
    5757  random_bitio_buffer &operator= (const random_bitio_buffer &_rbb);
    … …  
    6060  void encodeBit(int b);
    6161  void flush();
    62   unsigned long tell();
     62  mg_u_long tell();
    6363
    64   void seek(unsigned long topos);
     64  void seek(mg_u_long topos);
    6565  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);
    6868  int  bit();
    6969  int  bitOffset();

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_m_stdio.cpp

    r16583 r25147  
    2424}
    2525
    26 void stdio_bitio_buffer::seek (unsigned long byte, unsigned char bit) {
     26void stdio_bitio_buffer::seek (mg_u_long byte, unsigned char bit) {
    2727  if (fseek (file, byte, SEEK_SET) != 0) return;
    2828  buffer = getc(file);
    … …  
    3131}
    3232
    33 void stdio_bitio_buffer::seek(unsigned long topos) {
     33void stdio_bitio_buffer::seek(mg_u_long topos) {
    3434  if (fseek(file, topos >> 3, SEEK_SET) != 0) return;
    3535  buffer = getc(file);
    … …  
    3838}
    3939
    40 long stdio_bitio_buffer::addff(long b)
     40mg_s_long stdio_bitio_buffer::addff(mg_s_long b)
    4141{
    4242  if (!btg)
    … …  
    5959}
    6060
    61 long stdio_bitio_buffer::add00(long b)
     61mg_s_long stdio_bitio_buffer::add00(mg_s_long b)
    6262{
    6363  if (!btg)

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/bitio_m_stdio.h

    r16583 r25147  
    3333
    3434#include "bitio_m_abstract.h"
    35 
     35#include "mglong.h"
    3636
    3737class stdio_bitio_buffer : public bitio_buffer {
    … …  
    4040  unsigned char buffer;
    4141  unsigned char btg;
    42   unsigned long bytesWritten;
     42  mg_u_long bytesWritten;
    4343 
    4444public:
    … …  
    4848
    4949  unsigned char GetBtg () { return btg; }
    50   unsigned long GetBytesWritten () { return bytesWritten; }
     50  mg_u_long GetBytesWritten () { return bytesWritten; }
    5151 
    52   void seek (unsigned long byte, unsigned char bit);
    53   void seek (unsigned long topos);
     52  void seek (mg_u_long byte, unsigned char bit);
     53  void seek (mg_u_long topos);
    5454  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);
    5757  int  bit();
    5858  int  bitOffset() { return btg; }

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/gmalloc.c

    r16583 r25147  
    401401{
    402402  __ptr_t result;
    403   unsigned long int adj;
     403  mg_u_long adj;
    404404
    405405  result = (*__morecore) (size);
    406   adj = (unsigned long int) ((unsigned long int) ((char *) result -
     406  adj = (mg_u_long) ((mg_u_long) ((char *) result -
    407407                          (char *) NULL)) % BLOCKSIZE;
    408408  if (adj != 0)
    … …  
    549549      block = BLOCK (result);
    550550      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)
    553553           % BLOCKSIZE) >> log;
    554554
    … …  
    872872      prev = (struct list *) ptr;
    873873      _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)
    876876         % BLOCKSIZE >> type);
    877877      prev->next = _fraghead[type].next;
    … …  
    12841284{
    12851285  __ptr_t result;
    1286   unsigned long int adj;
     1286  mg_u_long adj;
    12871287
    12881288  size = ((size + alignment - 1) / alignment) * alignment;
    … …  
    12911291  if (result == NULL)
    12921292    return NULL;
    1293   adj = (unsigned long int) ((unsigned long int) ((char *) result -
     1293  adj = (mg_u_long) ((mg_u_long) ((char *) result -
    12941294                          (char *) NULL)) % alignment;
    12951295  if (adj != 0)

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/huffman.cpp

    r16583 r25147  
    3030 */
    3131huff_data *
    32 Generate_Huffman_Data (int num, long *freqs, huff_data * data,
    33                u_long * mem)
     32Generate_Huffman_Data (int num, mg_s_long *freqs, huff_data * data,
     33               mg_u_long * mem)
    3434{
    3535  int HNum, i, count;
    36   unsigned long *heap;
     36  mg_u_long *heap;
    3737  huff_data *hd = data;
    3838  if (!hd)
    … …  
    4141    goto error0;
    4242    }
    43   if (!(heap = new unsigned long[num * 2]))
     43  if (!(heap = new mg_u_long[num * 2]))
    4444    goto error1;
    4545  if (!(hd->clens = new char[num]))
    … …  
    7373      if (heap[heap[curr - 1]] > heap[heap[child - 1]])
    7474        {
    75           register u_long temp;
     75          register mg_u_long temp;
    7676          temp = heap[child - 1];
    7777          heap[child - 1] = heap[curr - 1];
    … …  
    141141
    142142  /* Calculate the code lens */
    143   heap[0] = -1UL;
     143  heap[0] = -1;
    144144  heap[1] = 0;
    145145  for (i = 2; i < num * 2; ++i)
    … …  
    154154  for (i = 0; i < num; ++i)
    155155    {
    156       register u_long codelen = heap[i + num];
     156      register mg_u_long codelen = heap[i + num];
    157157      hd->clens[i] = (char) codelen;
    158158      if (!codelen)
    … …  
    190190}
    191191
    192 unsigned long *
    193 Generate_Huffman_Codes (huff_data * data, u_long * mem)
     192mg_u_long *
     193Generate_Huffman_Codes (huff_data * data, mg_u_long * mem)
    194194{
    195195  int i;
    196   unsigned long *codes;
    197   unsigned long mc[MAX_HUFFCODE_LEN + 1];
     196  mg_u_long *codes;
     197  mg_u_long mc[MAX_HUFFCODE_LEN + 1];
    198198
    199199  if (!data)
    200200    return (NULL);
    201   if (!(codes = new unsigned long[data->num_codes]))
     201  if (!(codes = new mg_u_long[data->num_codes]))
    202202    return (NULL);
    203203  if (mem)
    … …  
    212212
    213213
    214 unsigned long **
    215 Generate_Huffman_Vals (huff_data * data, u_long * mem)
     214mg_u_long **
     215Generate_Huffman_Vals (huff_data * data, mg_u_long * mem)
    216216{
    217217  int i;
    218   unsigned long *fcode[MAX_HUFFCODE_LEN + 1];
    219   unsigned long **values;
    220   unsigned long *vals;
     218  mg_u_long *fcode[MAX_HUFFCODE_LEN + 1];
     219  mg_u_long **values;
     220  mg_u_long *vals;
    221221
    222222  if (!data)
    223223    return (NULL);
    224   if (!(vals = new unsigned long[data->num_codes]))
     224  if (!(vals = new mg_u_long[data->num_codes]))
    225225    return (NULL);
    226   if (!(values = new unsigned long *[MAX_HUFFCODE_LEN + 1]))
     226  if (!(values = new mg_u_long *[MAX_HUFFCODE_LEN + 1]))
    227227    {
    228228      delete []vals;
    … …  
    230230    }
    231231
    232   memset (values, '\0', (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *));
     232  memset (values, '\0', (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *));
    233233
    234234  if (mem)
    235235    *mem += data->num_codes * sizeof (*vals) +
    236       (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *);
     236      (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *);
    237237
    238238  fcode[0] = values[0] = &vals[0];
    … …  
    249249
    250250double
    251 Calculate_Huffman_Size (int num, long *freqs, long *counts)
     251Calculate_Huffman_Size (int num, mg_s_long *freqs, mg_s_long *counts)
    252252{
    253253  double size = 0;
    … …  
    318318
    319319
    320 int Read_Huffman_Data (FILE * f, huff_data * hd, u_long * mem, u_long * disk) {
     320int Read_Huffman_Data (FILE * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk) {
    321321  if (fread (&hd->num_codes, sizeof (hd->num_codes), 1, f) != 1)
    322322    return -1;

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/huffman.h

    r16583 r25147  
    3535  int maxcodelen;
    3636  int lencount[MAX_HUFFCODE_LEN + 1];
    37   unsigned long min_code[MAX_HUFFCODE_LEN + 1];
     37  mg_u_long min_code[MAX_HUFFCODE_LEN + 1];
    3838  char *clens;
    3939};
    4040
    4141
    42 huff_data *Generate_Huffman_Data (int num, long *freqs, huff_data * data,
    43                   u_long * mem);
     42huff_data *Generate_Huffman_Data (int num, mg_s_long *freqs, huff_data * data,
     43                  mg_u_long * mem);
    4444
    45 unsigned long *Generate_Huffman_Codes (huff_data * data, u_long * mem);
     45mg_u_long *Generate_Huffman_Codes (huff_data * data, mg_u_long * mem);
    4646
    47 unsigned long **Generate_Huffman_Vals (huff_data * data, u_long * mem);
     47mg_u_long **Generate_Huffman_Vals (huff_data * data, mg_u_long * mem);
    4848
    4949int Write_Huffman_Data (FILE * f, huff_data * hd);
    5050
    51 int Read_Huffman_Data (FILE * f, huff_data * hd, u_long * mem, u_long * disk);
     51int Read_Huffman_Data (FILE * f, huff_data * hd, mg_u_long * mem, mg_u_long * disk);
    5252
    5353/* Calculate the number of bits required to code the data with the
    5454   specified frequencies. Normally freqs and counts should point to
    5555   the same array. */
    56 double Calculate_Huffman_Size (int num, long *freqs, long *counts);
     56double Calculate_Huffman_Size (int num, mg_s_long *freqs, mg_s_long *counts);
    5757
    5858

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/local_strings.cpp

    r16583 r25147  
    5252  char *str_ptr = str;
    5353  char ch = '\0';
    54   long scale = 1;
     54  mg_s_long scale = 1;
    5555
    5656  /* find any scale letter immediately after digits */

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/local_strings.h

    r16583 r25147  
    5454      copy = fgetc(dict);
    5555      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    }
    5763      *data = copy + suff;
    5864    }

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/longlong.h

    r16583 r25147  
    7474#else
    7575
     76#include <stdint.h>
    7677/* Not using GCC, so fall back on plain "long" (32-bit) types */
    77 typedef unsigned long int mg_ullong;
    78 typedef long int mg_llong;
     78typedef uint32_t mg_ullong;
     79typedef int32_t mg_llong;
    7980
    8081#define ULL_FS "lu"

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/lovinstem.cpp

    r16583 r25147  
    497497static Recode_Rules Rules[] =
    498498{
    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, 1
     499  {(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}
    540540};
    541541
    … …  
    560560static Last_Char_Node pr[] =
    561561{
    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},
    570570};
    571571
    … …  
    655655static Ending_List List[] =
    656656{
    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},
    10061006};
    10071007
    … …  
    10171017static First_Char_Node First[] =
    10181018{
    1019   '\'', NULL, NULL,
     1019  {'\'', NULL, NULL,
    10201020  {NULL,
    10211021   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,
    10251025  {List,
    10261026   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,
    10301030  {List + 91,
    10311031   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,
    10351035  {NULL,
    10361036   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,
    10401040  {NULL,
    10411041   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,
    10451045  {List + 150,
    10461046   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,
    10501050  {NULL,
    10511051   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,
    10551055  {NULL,
    10561056   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,
    10601060  {List + 269,
    10611061   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,
    10651065  {List + 283,
    10661066   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,
    10701070  {NULL,
    10711071   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,
    10751075  {NULL,
    10761076   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,
    10801080  {List + 289,
    10811081   List + 290, NULL, List + 291, NULL, NULL,
    1082    NULL, NULL, NULL, NULL, NULL},
     1082   NULL, NULL, NULL, NULL, NULL}},
    10831083};
    10841084

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/messages.cpp

    r16583 r25147  
    2525#include "messages.h"
    2626
    27 char *msg_prefix = "";
     27char *msg_prefix = (char*)"";
    2828
    2929

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/netorder.h

    r22257 r25147  
    1616#define HTOND(d)                                                              \
    1717        do {                                                                  \
    18              unsigned long tmph, tmpl;                                        \
     18             mg_u_long tmph, tmpl;                                        \
    1919         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);   \
    2121         tmph = htonl (tmph);                                             \
    2222         tmpl = htonl (tmpl);                                             \
    2323         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);   \
    2525    }while(0)
    2626#define NTOHD(d)                                                              \
    2727        do {                                                                  \
    28              unsigned long tmph, tmpl;                                        \
     28             mg_u_long tmph, tmpl;                                        \
    2929         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);   \
    3131         tmph = ntohl (tmph);                                             \
    3232         tmpl = ntohl (tmpl);                                             \
    3333         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);   \
    3535        }while(0)
    3636#define HTOND2(hd, nd)                                                        \
    3737        do {                                                                  \
    38              unsigned long tmph, tmpl;                                        \
     38             mg_u_long tmph, tmpl;                                        \
    3939         memcpy ((void *) &tmph, (const void *) &hd, sizeof(double) >> 1);\
    4040         memcpy ((void *) &tmpl, (const void *) ((unsigned int) &hd + (sizeof(double) >> 1)), sizeof (double) >> 1);  \
    … …  
    4646#define NTOHD2(nd, hd)                                                        \
    4747        do {                                                                  \
    48              unsigned long tmph, tmpl;                                        \
     48             mg_u_long tmph, tmpl;                                        \
    4949         memcpy ((void *) &nd, (void *) &tmph, sizeof(double) >> 1);      \
    5050         memcpy ((void *) &tmpl, (const void *) &nd + (sizeof(double) >> 1), sizeof (double) >> 1);  \
    … …  
    5858#define HTONF(f)                                                              \
    5959        do {                                                                  \
    60              unsigned long tmp;                                               \
     60             mg_u_long tmp;                                               \
    6161             memcpy ((void *) &tmp, (const void *) &(f), sizeof (float));     \
    6262             HTONUL (tmp);                                                    \
    … …  
    6565#define NTOHF(f)                                                              \
    6666        do {                                                                  \
    67              unsigned long tmp;                                               \
     67             mg_u_long tmp;                                               \
    6868             memcpy ((void *) &tmp, (const void *) &(f), sizeof (float));     \
    6969         NTOHUL (tmp);                                                    \
    … …  
    7272#define HTONF2(hf, nf)                                                        \
    7373        do {                                                                  \
    74              unsigned long tmp;                                               \
     74             mg_u_long tmp;                                               \
    7575             memcpy ((void *) &tmp, (const void *) &(hf), sizeof (float));    \
    7676             HTONUL (tmp);                                                    \
    … …  
    7979#define NTOHF2(nf, hf)                                                        \
    8080        do {                                                                  \
    81              unsigned long tmp;                                               \
     81             mg_u_long tmp;                                               \
    8282             memcpy ((void *) &tmp, (const void *) &(nf), sizeof (float));    \
    8383         NTOHUL (tmp);                                                    \
    … …  
    114114
    115115/* pointers */
    116 #define HTONP(p)          ((p) = (void *) htonl ((unsigned long) p))
    117 #define NTOHP(p)          ((p) = (void *) ntohl ((unsigned long) p))
    118 #define HTONP2(hp, np)    ((np) = (void *) htonl ((unsigned long) hp))
    119 #define NTOHP2(np, hp)    ((hp) = (void *) ntohl ((unsigned long) 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))
    120120
    121121/* unsigned long */
    … …  
    126126
    127127/* signed long */
    128 #define HTONSL(l)         ((l) = (long) htonl ((unsigned long) (l)))
    129 #define NTOHSL(l)         ((l) = (long) ntohl ((unsigned long) (l)))
    130 #define HTONSL2(hl, nl)   ((nl) = (long) htonl ((unsigned long) (hl)))
    131 #define NTOHSL2(nl, hl)   ((hl) = (long) ntohl ((unsigned long) (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)))
    132132
    133133/* unsigned int */
    134 #define HTONUI(i)         ((i) = (unsigned int) htonl ((unsigned long) (i)))
    135 #define NTOHUI(i)         ((i) = (unsigned int) ntohl ((unsigned long) (i)))
    136 #define HTONUI2(hi, ni)   ((ni) = (unsigned int) htonl ((unsigned long) (hi)))
    137 #define NTOHUI2(ni, hi)   ((hi) = (unsigned int) ntohl ((unsigned long) (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)))
    138138
    139139/* signed int */
    140 #define HTONSI(i)         ((i) = (int) htonl ((unsigned long) (i)))
    141 #define NTOHSI(i)         ((i) = (int) ntohl ((unsigned long) (i)))
    142 #define HTONSI2(hi, ni)   ((ni) = (int) htonl ((unsigned long) (hi)))
    143 #define NTOHSI2(ni, hi)   ((hi) = (int) ntohl ((unsigned long) (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)))
    144144
    145145/* unsigned short */

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/non_ansi.h

    r16583 r25147  
    33
    44#include "config.h"
     5#include "mglong.h"
    56# if !defined(__STDC__)
    67
    … …  
    1112
    1213int fileno(FILE *);
    13 int ftruncate(int, long);
     14int ftruncate(int, mg_s_long);
    1415int pclose(FILE *);
    1516FILE *popen(const char *command, const char *type);

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/perf_hash.cpp

    r16583 r25147  
    4444/* Random Number stuff */
    4545
    46 long irandm (long is[2]);  /* from random.c */
    47 
    48 static long seed[] = {0, 0};
     46mg_s_long irandm (mg_s_long is[2]);  /* from random.c */
     47
     48static mg_s_long seed[] = {0, 0};
    4949#define RANDOM() irandm(seed)
    5050#define SEED_RANDOM(the_seed) do{ seed[0] = the_seed; }while(0)
    … …  
    107107
    108108#ifndef STRUCT
    109 static long **tb0, **tb1, **tb2;
     109static mg_s_long **tb0, **tb1, **tb2;
    110110#else
    111111struct tb_entry **tb;
    … …  
    700700    {
    701701      if (tb0)
    702     if (!(tb0[i] = Xmalloc (sizeof (long) * MAX_L)))
     702    if (!(tb0[i] = Xmalloc (sizeof (mg_s_long) * MAX_L)))
    703703        ok = 0;
    704704      if (tb1)
    705     if (!(tb1[i] = Xmalloc (sizeof (long) * MAX_L)))
     705    if (!(tb1[i] = Xmalloc (sizeof (mg_s_long) * MAX_L)))
    706706        ok = 0;
    707707      if (tb2)
    708     if (!(tb2[i] = Xmalloc (sizeof (long) * MAX_L)))
     708    if (!(tb2[i] = Xmalloc (sizeof (mg_s_long) * MAX_L)))
    709709        ok = 0;
    710710    }
    … …  
    744744
    745745  if (r <= 0)
    746     SEED_RANDOM ((long) time ((time_t *) NULL));
     746    SEED_RANDOM ((mg_s_long) time ((time_t *) NULL));
    747747  else
    748748    SEED_RANDOM (r);
    … …  
    902902    {
    903903      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)))
    905905        ok = 0;
    906906      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)))
    908908        ok = 0;
    909909      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)))
    911911        ok = 0;
    912912    }
    … …  
    946946      int j;
    947947
    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) *
    949949        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) *
    951951        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) *
    953953        sizeof (int);
    954954

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/perf_hash.h

    r16583 r25147  
    2525struct tb_entry
    2626  {
    27     long tb0, tb1, tb2;
     27    mg_s_long tb0, tb1, tb2;
    2828  };
    2929

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/random.cpp

    r16583 r25147  
    3333 *  The table mt[0:127] is defined by mt[i] = 69069 ** (128-i)
    3434 */
    35 
    36 #define MASK ((long) 593970775)
     35#include "random.h"
     36
     37#define MASK ((mg_s_long) 593970775)
    3738/*  or in hex, 23674657 */
    3839
    … …  
    4041/*  i.e. 2 to power -31 */
    4142
    42 static long mt [128] =   {
     43static mg_s_long mt [128] =   {
    4344      902906369,
    4445     2030498053,
    … …  
    172173
    173174double
    174 random (long is [2])
     175random (mg_s_long is [2])
    175176{
    176     long it, leh, nit;
     177    mg_s_long it, leh, nit;
    177178
    178179    it = is [0];
    … …  
    187188    is [0] = it;    is [1] = leh;
    188189    if (leh < 0) leh = ~leh;
    189     return (SCALE * ((long) (leh | 1)));
     190    return (SCALE * ((mg_s_long) (leh | 1)));
    190191}
    191192
    192193
    193194
    194 long
    195 irandm (long is [2])
     195mg_s_long
     196irandm (mg_s_long is [2])
    196197{
    197     long it, leh, nit;
     198    mg_s_long it, leh, nit;
    198199
    199200    it = is [0];

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/random.h

    r16583 r25147  
    3636 *  The table mt[0:127] is defined by mt[i] = 69069 ** (128-i)
    3737 */
     38#include "mglong.h"
    3839
    39 double random (long is [2]);
    40 long irandm (long is [2]);
     40double random (mg_s_long is [2]);
     41mg_s_long irandm (mg_s_long is [2]);
    4142
    4243#endif

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/sysfuncs.h

    r16583 r25147  
    377377#endif
    378378
    379 /* [RPAP - Feb 97: WIN32 Port] */
    380 #ifndef u_long
    381 # define u_long unsigned long
    382 #endif
     379#include "mglong.h"
     380
    383381#ifndef u_char
    384 # define u_char unsigned char
    385 #endif
    386 
     382# define u_char uint8_t
     383#endif
    387384
    388385#endif /* SYSFUNCS_H */

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/unitool.cpp

    r23424 r25147  
    1515 * column
    1616 */
    17 static unsigned long *unicode_cat_data=NULL;
     17static mg_u_long *unicode_cat_data=NULL;
    1818
    1919
    … …  
    4040#define NUM_DECOMPOSE_INFO 1269
    4141static 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}}
    465465};
    466466
    … …  
    14641464 * column
    14651465 */
    1466 /*unsigned long *unicode_cat_data;*/
     1466/*mg_u_long *unicode_cat_data;*/
    14671467
    14681468void create_unicat_data () {
    … …  
    14701470  int min_start=0;
    14711471  int min_end=0;
    1472   register unsigned long min_value=0; /* filling the whole byte */
     1472  register mg_u_long min_value=0; /* filling the whole byte */
    14731473 
    14741474  const unirange *letter_here = letter_info;
    … …  
    14801480
    14811481  if (unicode_cat_data != NULL) return;
    1482   unicode_cat_data = (unsigned long *) malloc (0x10000/4);
     1482  unicode_cat_data = (mg_u_long *) malloc (0x10000/4);
    14831483  if (unicode_cat_data == NULL) return;
    14841484 
    … …  
    15291529   
    15301530      } else {
    1531     register unsigned long mask = 3 << ((i % 16) * 2);
     1531    register mg_u_long mask = 3 << ((i % 16) * 2);
    15321532    unicode_cat_data[i/16] = (unicode_cat_data[i/16] & (~mask)) |
    15331533                  (min_value & mask);

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/win32in.c

    r16583 r25147  
    33#include "win32in.h"
    44
    5 unsigned long htonl(unsigned long x) {
     5mg_u_long htonl(mg_u_long x) {
    66#if defined (LITTLE_ENDIAN) || defined (_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN)
    77    x = ((x >> 24) & 0x000000FF) | ((x >> 8) & 0x0000FF00) |
    … …  
    2424}
    2525
    26 unsigned long ntohl(unsigned long x) {
     26mg_u_long ntohl(mg_u_long x) {
    2727#if defined (LITTLE_ENDIAN) || defined (_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN)
    2828    x = ((x >> 24) & 0x000000FF) | ((x >> 8) & 0x0000FF00) |
    … …  
    5050
    5151main () {
    52     long x;
     52    mg_s_long x;
    5353    short sx;
    5454

  • main/trunk/greenstone2/common-src/indexers/mgpp/lib/win32in.h

    r16583 r25147  
    66
    77#include "longlong.h"
     8#include "mglong.h"
    89#ifdef __cplusplus
    910extern "C" {
    1011#endif
    1112
    12 unsigned long htonl(unsigned long x);
    13 unsigned long ntohl(unsigned long x);
     13mg_u_long htonl(mg_u_long x);
     14mg_u_long ntohl(mg_u_long x);
    1415mg_ullong ntohll(mg_ullong x);
    1516unsigned short htons(unsigned short x);

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/FIvfLevelInfo.cpp

    r16583 r25147  
    7979 
    8080  // read in the array size
    81   unsigned long arrSize = 0;
     81  mg_u_long arrSize = 0;
    8282  if (!ReadVarLenUL (f, arrSize)) return false;
    8383 

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/FIvfLevelInfo.h

    r16583 r25147  
    3131#endif
    3232
     33#include "mglong.h"
    3334#include <stdio.h>
    3435#include "UCArray.h"
    … …  
    3839public:
    3940  UCArray levelTag;
    40   unsigned long numEntries; // N for level
    41   unsigned long approxWeightsDiskPtr;
    42   unsigned long exactWeightsDiskPtr;
     41  mg_u_long numEntries; // N for level
     42  mg_u_long approxWeightsDiskPtr;
     43  mg_u_long exactWeightsDiskPtr;
    4344  bool workInLevel;  // this is just a working variable,
    4445                     // it is not saved or read from the file

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/FText.cpp

    r16583 r25147  
    4141}
    4242
    43 #define BITADDRLEN (sizeof(unsigned long) + sizeof(unsigned char))
     43#define BITADDRLEN (sizeof(mg_u_long) + sizeof(unsigned char))
    4444
    4545 
    … …  
    8585bool FTextLevel::Read (FILE *f) {
    8686  // read in the array size
    87   unsigned long arrSize = 0;
     87  mg_u_long arrSize = 0;
    8888  if (!ReadVarLenUL (f, arrSize)) return false;
    8989
    … …  
    141141
    142142bool TextIdx::Read (FILE *f, const TextLevelInfo &levelInfo,
    143             unsigned long docNum) {
     143            mg_u_long docNum) {
    144144  if (!SeekTextIdx (f, levelInfo, docNum)) return false;
    145145  return Read (f);
    … …  
    166166
    167167bool SeekTextIdx (FILE *f, const TextLevelInfo &levelInfo,
    168           unsigned long docNum) {
     168          mg_u_long docNum) {
    169169  if (docNum == 0 || docNum > levelInfo.numEntries) return false;
    170170 
    171   unsigned long seekPos = levelInfo.textIdxPtr + (docNum-1) * TEXTIDXLEN;
     171  mg_u_long seekPos = levelInfo.textIdxPtr + (docNum-1) * TEXTIDXLEN;
    172172  if (fseek (f, seekPos, SEEK_SET) != 0) return false;
    173173 
    … …  
    176176
    177177
    178 bool ReadTextIdxArray (FILE *f, TextIdxArray &a, unsigned long arrSize) {
     178bool ReadTextIdxArray (FILE *f, TextIdxArray &a, mg_u_long arrSize) {
    179179  // clear the array
    180180  a.erase (a.begin(), a.end());
    … …  
    218218}
    219219 
    220 void CompressTextInfo::SetStart (unsigned long startPos,
     220void CompressTextInfo::SetStart (mg_u_long startPos,
    221221                 unsigned char startBit,
    222222                 unsigned char startWhich) {
    … …  
    232232}
    233233
    234 void CompressTextInfo::SetEnd (unsigned long endPos,
     234void CompressTextInfo::SetEnd (mg_u_long endPos,
    235235                   unsigned char endBit) {
    236236  if (inDoc) {

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/FText.h

    r16583 r25147  
    3838class BitAddr {
    3939public:
    40   unsigned long byte;
     40  mg_u_long byte;
    4141  unsigned char bit;
    4242
    … …  
    5252public:
    5353  UCArray levelTag;
    54   unsigned long textIdxPtr;
    55   unsigned long numEntries;
     54  mg_u_long textIdxPtr;
     55  mg_u_long numEntries;
    5656
    5757  TextLevelInfo ();
    … …  
    9696  // does a seek and reads the appropriate record
    9797  bool Read (FILE *f, const TextLevelInfo &levelInfo,
    98          unsigned long docNum);
     98         mg_u_long docNum);
    9999
    100100  bool Read (FILE *f);
    … …  
    109109
    110110bool SeekTextIdx (FILE *f, const TextLevelInfo &levelInfo,
    111           unsigned long docNum);
     111          mg_u_long docNum);
    112112
    113113
    … …  
    115115typedef vector<TextIdx> TextIdxArray;
    116116
    117 bool ReadTextIdxArray (FILE *f, TextIdxArray &a, unsigned long arrSize);
     117bool ReadTextIdxArray (FILE *f, TextIdxArray &a, mg_u_long arrSize);
    118118bool WriteTextIdxArray (FILE *f, const TextIdxArray &a);
    119119
    … …  
    135135  // set the start of a level (closing off the last opening
    136136  // tag if needed)
    137   void SetStart (unsigned long startPos,
     137  void SetStart (mg_u_long startPos,
    138138         unsigned char startBit,
    139139         unsigned char startWhich);
    … …  
    141141  // if in a document, it will set the end, add the document to the
    142142  // list of document ptrs, and then call ResetStart
    143   void SetEnd (unsigned long endPos,
     143  void SetEnd (mg_u_long endPos,
    144144           unsigned char endBit);
    145145};

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/FragLevelConvert.cpp

    r16583 r25147  
    3131
    3232bool FragLevelConvert::Read (FILE *invfFile,
    33                  unsigned long levelPtr,
    34                  unsigned long _numFrags,
    35                  unsigned long _numLevelDocs) {
     33                 mg_u_long levelPtr,
     34                 mg_u_long _numFrags,
     35                 mg_u_long _numLevelDocs) {
    3636  levelStarts.erase (levelStarts.begin(), levelStarts.end());
    3737  numFrags = _numFrags;
    … …  
    4343  stdio_bitio_buffer buffer(invfFile);
    4444 
    45   unsigned long pTag = numLevelDocs*2;
    46   unsigned long B = BIO_Bblock_Init (numFrags+pTag, pTag);
    47   unsigned long fragNum = 0;
    48   unsigned long 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;
    4949  for (i=0; i<numLevelDocs; ++i) {
    50     unsigned long delta = buffer.bblock_decode (B, NULL)-1;
     50    mg_u_long delta = buffer.bblock_decode (B, NULL)-1;
    5151    fragNum += delta;
    5252
    … …  
    7070}
    7171
    72 bool FragLevelConvert::FragToLevel (unsigned long fragNum,
    73                     unsigned long &levelDocNum) const {
     72bool FragLevelConvert::FragToLevel (mg_u_long fragNum,
     73                    mg_u_long &levelDocNum) const {
    7474  // do binary search for something containing this fragment number
    75   unsigned long low = 1, high = numLevelDocs;
    76   unsigned long mid;
     75  mg_u_long low = 1, high = numLevelDocs;
     76  mg_u_long mid;
    7777
    7878  while ((mid = (low+high)/2) >= 1 && low <= high) {
    … …  
    8989
    9090bool FragLevelConvert::LevelToLevel (FragLevelConvert sectionLevelConvert,
    91          unsigned long levelNum, unsigned long &DocNum) {
     91         mg_u_long levelNum, mg_u_long &DocNum) {
    9292 
    9393  if (levelNum==1) {
    … …  
    9595    return true;
    9696  }
    97   unsigned long levelfragnum = sectionLevelConvert.levelStarts[levelNum-1]+1;
     97  mg_u_long levelfragnum = sectionLevelConvert.levelStarts[levelNum-1]+1;
    9898
    9999  if (FragToLevel(levelfragnum, DocNum)) {

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/FragLevelConvert.h

    r16583 r25147  
    2323#define FRAGLEVELCONVERT_H
    2424
     25#include "mglong.h"
    2526#include <stdio.h>
    2627#include "UCArray.h"
    27 
    2828
    2929/*Notes about levelStarts (kjm18) - this is my interpretation of
    … …  
    4545protected:
    4646  // note fragment start is one before before real start
    47   vector<unsigned long> levelStarts;
    48   unsigned long numFrags;
    49   unsigned long numLevelDocs;
     47  vector<mg_u_long> levelStarts;
     48  mg_u_long numFrags;
     49  mg_u_long numLevelDocs;
    5050 
    5151public:
    5252  FragLevelConvert ();
    5353
    54   bool Read (FILE *invfFile, unsigned long levelPtr,
    55          unsigned long _numFrags, unsigned long _numLevelDocs);
     54  bool Read (FILE *invfFile, mg_u_long levelPtr,
     55         mg_u_long _numFrags, mg_u_long _numLevelDocs);
    5656
    57   bool FragToLevel (unsigned long fragNum, unsigned long &levelDocNum) const;
     57  bool FragToLevel (mg_u_long fragNum, mg_u_long &levelDocNum) const;
    5858
    5959  // this function converts from one level number to another
    … …  
    6464  // coresponding level
    6565  bool LevelToLevel (FragLevelConvert sectionLevelConvert,
    66            unsigned long levelNum, unsigned long &DocNum);
     66           mg_u_long levelNum, mg_u_long &DocNum);
    6767};
    6868

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/GSDLQueryParser.cpp

    r16583 r25147  
    140140}
    141141
    142 static unsigned long GetStemMethod(LexEl &el, int defaultStemMethod) {
     142static mg_u_long GetStemMethod(LexEl &el, int defaultStemMethod) {
    143143  // 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 = (unsigned long)defaultStemMethod;
     144  mg_u_long stem = (mg_u_long)defaultStemMethod;
    145145     
    146146  UCArray::const_iterator here = el.text.begin();
    … …  
    205205    if (termNode.stemMethod == STEM_INVALID) { // error so backtrack
    206206      here = oldHere;
    207       termNode.stemMethod = (unsigned long)defaultStemMethod;
     207      termNode.stemMethod = (mg_u_long)defaultStemMethod;
    208208    }
    209209      } else here = oldHere; //ignore - wrong syntax

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/IndexData.cpp

    r16583 r25147  
    163163  // read in the information from the dictionary
    164164  block_dict_el tagEl;
    165   unsigned long tagElNum;
     165  mg_u_long tagElNum;
    166166  if (!SearchBlockDictEl (dictFile, biTags, bdh.entries_per_tblk,
    167167              bdh.tag_dict_size, level, tagEl, tagElNum))

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/IndexData.h

    r16583 r25147  
    5959  // level specific information
    6060  UCArray curLevel; // last level that was loaded
    61   unsigned long curLevelNum;
     61  mg_u_long curLevelNum;
    6262  FragLevelConvert levelConverter;
    6363  ApproxWeightsData weightData;

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/MGQuery.cpp

    r16583 r25147  
    4040void PrintNode (ostream &s, QueryNode *node, int indent) {
    4141  if (node == NULL) {
    42     PrintIndentText (s, "NULL\n", indent);
     42    PrintIndentText (s, (char*)"NULL\n", indent);
    4343  } else {
    4444    node->Print (s, indent+2);
    … …  
    102102
    103103  // combine document numbers and corresponding ranks
    104   unsigned long leftI = 0;
    105   unsigned long rightI = 0;
    106   unsigned long outI = 0;
     104  mg_u_long leftI = 0;
     105  mg_u_long rightI = 0;
     106  mg_u_long outI = 0;
    107107  while (leftI < result.docs.size() &&
    108108     rightI < rightResult.docs.size()) {
    … …  
    146146
    147147void AndQueryNode::Print (ostream &s, int indent) const {
    148   PrintIndentText (s, "leftNode:\n", indent);
     148  PrintIndentText (s, (char*)"leftNode:\n", indent);
    149149  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);
    152152  PrintNode (s, rightNode, indent+2);
    153153}
    … …  
    187187
    188188  // combine document numbers and corresponding ranks
    189   unsigned long leftSize = leftResult.docs.size();
    190   unsigned long rightSize = rightResult.docs.size();
    191   unsigned long leftI = 0;
    192   unsigned long rightI = 0;
    193   unsigned long leftDocNum = 0;
    194   unsigned long 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;
    195195  while (leftI < leftSize || rightI < rightSize) {
    196196    // check leftI
    197197    if (leftI < leftResult.docs.size())
    198198      leftDocNum = leftResult.docs[leftI];
    199     else leftDocNum = ULONG_MAX;
     199    else leftDocNum = (mg_u_long)ULONG_MAX;
    200200   
    201201    // check rightI
    202202    if (rightI < rightResult.docs.size())
    203203      rightDocNum = rightResult.docs[rightI];
    204     else rightDocNum = ULONG_MAX;
     204    else rightDocNum = (mg_u_long)ULONG_MAX;
    205205   
    206206    // combine
    … …  
    250250
    251251void OrQueryNode::Print (ostream &s, int indent) const {
    252   PrintIndentText (s, "leftNode:\n", indent);
     252  PrintIndentText (s, (char*)"leftNode:\n", indent);
    253253  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);
    256256  PrintNode (s, rightNode, indent+2);
    257257}
    … …  
    297297
    298298  // combine document numbers and corresponding ranks
    299   unsigned long queryI = 0;
    300   unsigned long notI = 0;
    301   unsigned long outI = 0;
     299  mg_u_long queryI = 0;
     300  mg_u_long notI = 0;
     301  mg_u_long outI = 0;
    302302  while (queryI < result.docs.size() &&
    303303     notI < notResult.docs.size()) {
    … …  
    342342
    343343void NotQueryNode::Print (ostream &s, int indent) const {
    344   PrintIndentText (s, "queryNode:\n", indent);
     344  PrintIndentText (s, (char*)"queryNode:\n", indent);
    345345  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);
    348348  PrintNode (s, notNode, indent+2);
    349349}
    … …  
    361361  // get information about this tag
    362362  block_dict_el tagEl;
    363   unsigned long tagElNum;
     363  mg_u_long tagElNum;
    364364  if (!SearchBlockDictEl (indexData.dictFile, indexData.biTags,
    365365              indexData.bdh.entries_per_tblk,
    … …  
    373373  stdio_bitio_buffer buffer(indexData.invfFile);
    374374 
    375   unsigned long pTag = tagEl.frag_occur*2;
    376   unsigned long B = BIO_Bblock_Init (indexData.bdh.num_frags+pTag, pTag);
    377   unsigned long fragNum = 0;
    378   unsigned long 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;
    379379  FragRange thisFrag;
    380380  for (i=0; i<tagEl.frag_occur; ++i) {
    381381    // get start
    382     unsigned long delta = buffer.bblock_decode (B, NULL)-1;
     382    mg_u_long delta = buffer.bblock_decode (B, NULL)-1;
    383383    fragNum += delta;
    384384
    … …  
    427427
    428428  // get a list of term numbers
    429   vector<unsigned long> equivNums;
     429  vector<mg_u_long> equivNums;
    430430  FindWordNumbers (indexData, term, stemMethod, equivNums);
    431431
    … …  
    435435  FragData tempFragData2;
    436436  UCArray equivWord;
    437   vector<unsigned long>::iterator here = equivNums.begin();
    438   vector<unsigned long>::iterator end = equivNums.end();
     437  vector<mg_u_long>::iterator here = equivNums.begin();
     438  vector<mg_u_long>::iterator end = equivNums.end();
    439439  while (here != end) {
    440440    // get the information for this word
    … …  
    565565
    566566void ProxMatchQueryNode::Print (ostream &s, int indent) const {
    567   PrintIndentText (s, "PROXMATCH\n", indent);
     567  PrintIndentText (s, (char*)"PROXMATCH\n", indent);
    568568  if (tagNodePtr != NULL) tagNodePtr->Print (s, indent+2);
    569569 
    … …  
    583583void BrowseQueryNode::Calculate (IndexData &indexData, BrowseQueryResult &result) const {
    584584
    585   unsigned long number=0;
     585  mg_u_long number=0;
    586586  FindNearestWordNumber(indexData, term, number);
    587587  if (number + startPosition > 0 ) {
    … …  
    604604
    605605void BrowseQueryNode::Print (ostream &s, int indent) const {
    606   PrintIndentText(s, "BROWSEQUERYNODE\n", indent);
     606  PrintIndentText(s, (char*)"BROWSEQUERYNODE\n", indent);
    607607  PrintIndent (s, indent+2);
    608608  s << "TERM:"<<term<<"\n";
    … …  
    631631
    632632  // make weights into ranks if needed
    633   unsigned long i;
     633  mg_u_long i;
    634634  if (queryInfo.sortByRank || queryInfo.needRankInfo) {
    635635    for (i=0; i<result.ranks.size(); ++i) {
    … …  
    639639  }
    640640 
    641   unsigned long resultsSize = queryInfo.maxDocs;
     641  mg_u_long resultsSize = queryInfo.maxDocs;
    642642  if (resultsSize == 0 || resultsSize > result.docs.size())
    643643    resultsSize = result.docs.size();
    … …  
    655655           result.docs.begin()+resultsSize,
    656656           result.ranks.begin()+resultsSize,
    657            (unsigned long) result.ranks.size()-resultsSize,
     657           (mg_u_long) result.ranks.size()-resultsSize,
    658658           gtRank);
    659659
    … …  
    665665  if (queryInfo.exactWeights &&
    666666      (queryInfo.sortByRank || queryInfo.needRankInfo)) {
    667     unsigned long exactDiskPtr =
     667    mg_u_long exactDiskPtr =
    668668      indexData.levels.levelInfo[indexData.curLevel].exactWeightsDiskPtr;
    669669   
    … …  
    737737  }
    738738 
    739   unsigned long DocNum = 0;
    740  
    741   for (unsigned long 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) {
    742742
    743743    // do an if ! here????

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/MGQuery.h

    r16583 r25147  
    107107
    108108
    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)
    111111
    112112/* NOTE: range stuff - the range values are for the previous term relative
    … …  
    123123public:
    124124  UCArray term;
    125   unsigned long termWeight;
    126   unsigned long stemMethod;
    127   signed long startRange; // range relative to last term
    128   signed long 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;
    129129 
    130130  void Clear ();
    … …  
    161161 public:
    162162  UCArray term;
    163   signed long startPosition;
    164   unsigned long numTerms;
     163  mg_s_long startPosition;
     164  mg_u_long numTerms;
    165165
    166166  void Clear();

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/Makefile.in

    r22070 r25147  
    5353CC = @CC@
    5454CXX = @CXX@
    55 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -ansi -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS)
    56 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS)
     55CFLAGS = @CFLAGS@ -ansi -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS)
     56CXXFLAGS = @CXXFLAGS@ -fPIC -DSILENT -DSHORT_SUFFIX $(AFFLAGS)
    5757DEFS = @DEFS@
    5858RANLIB = @RANLIB@
    … …  
    6060INSTALL_DATA = @INSTALL_DATA@
    6161INSTALL_PROGRAM = @INSTALL_PROGRAM@
    62 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
     62LDFLAGS = @LDFLAGS@
    6363LIBS = ../lib/libmgpplib.a $(AFLIBS) -lstdc++ ../../../packages/iconv/lib/libiconv.a @LIBS@
    6464TOUCH = echo timestamp >

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/QueryResultsSort.h

    r16583 r25147  
    4545void PushHeap (DocNumArray::iterator docNumHeap,
    4646           RandomAccessIterator parallelHeap,
    47            unsigned long heapSize,
     47           mg_u_long heapSize,
    4848           const Compare &comp) {
    49   unsigned long holeIndex = heapSize-1;
    50   unsigned long parent = (holeIndex - 1) / 2;
     49  mg_u_long holeIndex = heapSize-1;
     50  mg_u_long parent = (holeIndex - 1) / 2;
    5151  while (holeIndex > 0 && comp (*(parallelHeap+parent),
    5252                *(parallelHeap+holeIndex))) {
    … …  
    6363void AdjustHeap (DocNumArray::iterator docNumHeap,
    6464             RandomAccessIterator parallelHeap,
    65              unsigned long holeIndex,
    66              unsigned long heapSize,
     65             mg_u_long holeIndex,
     66             mg_u_long heapSize,
    6767             const Compare &comp) {
    68   unsigned long secondChild = 2 * holeIndex + 2;
     68  mg_u_long secondChild = 2 * holeIndex + 2;
    6969  while (secondChild < heapSize) {
    7070    if (comp(*(parallelHeap + secondChild),
    … …  
    8787void PopHeap (DocNumArray::iterator docNumHeap,
    8888          RandomAccessIterator parallelHeap,
    89           unsigned long heapSize,
     89          mg_u_long heapSize,
    9090          const Compare &comp) {
    9191  swap (*(parallelHeap), *(parallelHeap+heapSize-1));
    9292  swap (*(docNumHeap), *(docNumHeap+heapSize-1));
    93   AdjustHeap (docNumHeap, parallelHeap, (unsigned long)0, heapSize-1, comp);
     93  AdjustHeap (docNumHeap, parallelHeap, (mg_u_long)0, heapSize-1, comp);
    9494}
    9595
    … …  
    9797void MakeHeap (DocNumArray::iterator docNumHeap,
    9898           RandomAccessIterator parallelHeap,
    99            unsigned long size,
     99           mg_u_long size,
    100100           const Compare &comp) {
    101101  if (size < 2) return;
    102102 
    103   unsigned long i = 0;
     103  mg_u_long i = 0;
    104104  for (i=1; i<=size; ++i)
    105105    PushHeap (docNumHeap, parallelHeap, i, comp);
    … …  
    110110void SortHeap (DocNumArray::iterator docNumHeap,
    111111           RandomAccessIterator parallelHeap,
    112            unsigned long size,
     112           mg_u_long size,
    113113           const Compare &comp) {
    114114  if (size < 2) return;
    115115
    116   unsigned long i;
     116  mg_u_long i;
    117117  for (i=size; i>1; --i)
    118118    PopHeap (docNumHeap, parallelHeap, i, comp);
    … …  
    123123void SelectAddHeap (DocNumArray::iterator docNumHeap,
    124124            RandomAccessIterator parallelHeap,
    125             unsigned long heapSize,
     125            mg_u_long heapSize,
    126126            DocNumArray::iterator docNumAdd,
    127127            RandomAccessIterator parallelAdd,
    128             unsigned long addSize,
     128            mg_u_long addSize,
    129129            const Compare &comp) {
    130   unsigned long i;
     130  mg_u_long i;
    131131  for (i=0; i<addSize; ++i) {
    132132    if (comp(*(parallelAdd+i), *(parallelHeap))) {
    133133      swap (*(docNumHeap), *(docNumAdd+i));
    134134      swap (*(parallelHeap), *(parallelAdd+i));
    135       AdjustHeap (docNumHeap, parallelHeap, (unsigned long)0, heapSize, comp);
     135      AdjustHeap (docNumHeap, parallelHeap, (mg_u_long)0, heapSize, comp);
    136136    }
    137137  }

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/Queryer.cpp

    r19822 r25147  
    6363int main (int argc, char **argv) {
    6464  int ch;
    65   char *textfilename = "";
    66   char *indexfilename = "";
    67   char *basePath = "";
     65  char *textfilename = (char*)"";
     66  char *indexfilename = (char*)"";
     67  char *basePath = (char*)"";
    6868 
    6969  opterr = 0;
    … …  
    186186    // print
    187187    UCArray docText;
    188     unsigned long docNum = 0;
     188    mg_u_long docNum = 0;
    189189    cin >> docNum;
    190190    cin.getline(query, 2048, '\n'); // eat up return

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/Terms.cpp

    r16583 r25147  
    5050    << t.stemMethod << ")equiv terms(";
    5151 
    52   unsigned long i;
     52  mg_u_long i;
    5353  for (i=0; i<t.equivTerms.size(); ++i) {
    5454    s << t.equivTerms[i] << ", ";
    … …  
    8383
    8484  s << "termFreqs: ";
    85   for (unsigned long i=0; i<termFreqs.size(); ++i)
     85  for (mg_u_long i=0; i<termFreqs.size(); ++i)
    8686    s << termFreqs[i] << ", ";
    8787 
    … …  
    9494ostream &operator<< (ostream &s, const QueryResult &r) {
    9595  s << "docs: ";
    96   unsigned long i;
     96  mg_u_long i;
    9797  for (i=0; i<r.docs.size(); ++i)
    9898    s << r.docs[i] << ", ";
    … …  
    136136ostream &operator<< (ostream &s, const ExtQueryResult &r) {
    137137  s << "docs: ";
    138   unsigned long i;
     138  mg_u_long i;
    139139  for (i=0; i<r.docs.size(); ++i)
    140140    s << r.docs[i] << ", ";
    … …  
    181181ostream &operator<< (ostream &s, const BrowseQueryResult &r) {
    182182  s << "terms: ";
    183   unsigned long i;
     183  mg_u_long i;
    184184  for (i=0; i<r.termFreqs.size(); ++i)
    185185    s << r.termFreqs[i] << ", ";
    … …  
    207207void FindWordNumbers (IndexData &indexData,
    208208              const UCArray &term,
    209               unsigned long stemMethod,
    210               vector<unsigned long> &equivWords) {
     209              mg_u_long stemMethod,
     210              vector<mg_u_long> &equivWords) {
    211211  equivWords.erase (equivWords.begin(), equivWords.end());
    212212
    … …  
    222222    // don't need to stem the word,
    223223    // find the word number(s) for this term
    224     unsigned long wordElNum = 0;
    225     unsigned long numLevels = indexData.bdh.num_levels;
     224    mg_u_long wordElNum = 0;
     225    mg_u_long numLevels = indexData.bdh.num_levels;
    226226    word_block_dict_el wordDictEl;
    227227    wordDictEl.SetNumLevels (numLevels);
    … …  
    245245  unsigned char mgWord[MAXSTEMLEN + 1];
    246246  UCArray stemTerm;
    247   unsigned long stemmerNum = 0;
     247  mg_u_long stemmerNum = 0;
    248248
    249249  /* [JFG - Mar 06: Accent folding patch] */
    … …  
    266266  // need to look up this term in the appropriate dictionary
    267267  stem_block_dict_el stemDictEl;
    268   unsigned long stemElNum;
     268  mg_u_long stemElNum;
    269269  bool result = false;
    270270 
    … …  
    287287void ReadTermFragData (IndexData &indexData,
    288288               bool needFragFreqs,
    289                unsigned long termNum,
     289               mg_u_long termNum,
    290290               FragData &fragData,
    291291               FragRangeArray *fragLimits,
    … …  
    294294
    295295  // look up the word in the dictionary
    296   unsigned long numLevels = indexData.bdh.num_levels;
     296  mg_u_long numLevels = indexData.bdh.num_levels;
    297297  word_block_dict_el wordDictEl;
    298298  wordDictEl.SetNumLevels (numLevels);
    … …  
    311311  stdio_bitio_buffer buffer (indexData.invfFile);
    312312   
    313   unsigned long B = BIO_Bblock_Init (indexData.bdh.num_frags,
     313  mg_u_long B = BIO_Bblock_Init (indexData.bdh.num_frags,
    314314                     wordDictEl.frag_occur);
    315   unsigned long fragNum = 0;
    316   unsigned long termFreq = 0;
    317 
    318   unsigned long fragLimitI = 0;
    319   unsigned long 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;
    320320  for (i=0; i<wordDictEl.frag_occur; ++i) {
    321321    fragNum += buffer.bblock_decode (B, NULL);
    … …  
    359359
    360360  // do or
    361   unsigned long f1I = 0, f1Size = f1.fragNums.size();
    362   unsigned long 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();
    363363  while (f1I < f1Size || f2I < f2Size) {
    364364    if (f2I < f2Size &&
    … …  
    395395             FragData &fragData,
    396396             const FragData &comFragData,
    397              signed long startRange,
    398              signed long endRange,
     397             mg_s_long startRange,
     398             mg_s_long endRange,
    399399             const FragRangeArray *fragLimits) {
    400400  // sanity check on range
    401401  if (startRange > endRange) {
    402     signed long temp = endRange;
     402    mg_s_long temp = endRange;
    403403    endRange = startRange;
    404404    startRange = temp;
    … …  
    409409    fragData.matchDocs = comFragData.matchDocs;
    410410 
    411   unsigned long fragDataI = 0;
    412   unsigned long fragDataSize = fragData.fragNums.size();
    413   unsigned long comFragDataI = 0;
    414   unsigned long comFragDataSize = comFragData.fragNums.size();
    415   unsigned long fragLimitI = 0;
    416   unsigned long fragLimitSize = (fragLimits==NULL) ? 0 : (*fragLimits).size();
    417   unsigned long 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;
    418418
    419419  while (fragDataI < fragDataSize &&
    420420     comFragDataI < comFragDataSize) {
    421     signed long fragNum = (signed long)fragData.fragNums[fragDataI];
    422     signed long comFragNum = (signed long)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];
    423423   
    424424    // go to the right fragment limit (for the com frag)
    425425    if (fragLimits != NULL) {
    426426      while (fragLimitI+1 < fragLimitSize &&
    427          comFragNum > (signed long)(*fragLimits)[fragLimitI+1].rangeStart) {
     427         comFragNum > (mg_s_long)(*fragLimits)[fragLimitI+1].rangeStart) {
    428428    ++fragLimitI;
    429429      }
    … …  
    432432    if (fragNum <= comFragNum+startRange ||
    433433    (fragLimits!=NULL &&
    434      fragNum<=(signed long)(*fragLimits)[fragLimitI].rangeStart)) {
     434     fragNum<=(mg_s_long)(*fragLimits)[fragLimitI].rangeStart)) {
    435435      ++fragDataI;
    436436     
    437437    } else if (fragNum > comFragNum+endRange ||
    438438           (fragLimits!=NULL &&
    439         fragNum>(signed long)(*fragLimits)[fragLimitI].rangeEnd)) {
     439        fragNum>(mg_s_long)(*fragLimits)[fragLimitI].rangeEnd)) {
    440440      ++comFragDataI;
    441441     
    … …  
    471471             const UCArray &tag,
    472472             const UCArray &term,
    473              unsigned long stemMethod,
    474              unsigned long termWeight,
     473             mg_u_long stemMethod,
     474             mg_u_long termWeight,
    475475             UCArrayVector &equivTerms,
    476476             QueryResult &result) {
    … …  
    480480
    481481  // log (N / ft)
    482   unsigned long N = indexData.levels.levelInfo[indexData.curLevel].numEntries;
     482  mg_u_long N = indexData.levels.levelInfo[indexData.curLevel].numEntries;
    483483  float wordLog = log((double)N / (double)termData.matchDocs);
    484484
    … …  
    491491  float Wdt;
    492492 
    493   unsigned long termDataI = 0;
    494   unsigned long termDataSize = termData.fragNums.size();
    495   unsigned long levelDocNum = 0;
    496  
    497   unsigned long termDocFreq = 0;
    498   unsigned long lastLevelDocNum = 0;
    499   unsigned long 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;
    500500 
    501501  while (termDataI < termDataSize) {
    … …  
    552552                const UCArray &tag,
    553553                const UCArray &term,
    554                 unsigned long stemMethod,
    555                 unsigned long termWeight,
     554                mg_u_long stemMethod,
     555                mg_u_long termWeight,
    556556                UCArrayVector &equivTerms,
    557557                QueryResult &result) {
    … …  
    571571  float Wdt;
    572572 
    573   unsigned long termDataI = 0;
    574   unsigned long termDataSize = termData.fragNums.size();
    575   unsigned long levelDocNum = 0;
    576  
    577   unsigned long termDocFreq = 0;
    578   unsigned long lastLevelDocNum = 0;
    579   unsigned long overallwordfreq = 0;
    580   unsigned long resultI = 0;
    581   unsigned long resultSize = result.docs.size();
    582   unsigned long 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;
    583583 
    584584 
    … …  
    664664  bool needRanks = (queryInfo.sortByRank || queryInfo.needRankInfo);
    665665
    666   unsigned long termDataI = 0;
    667   unsigned long termDataSize = termData.fragNums.size();
    668   unsigned long levelDocNum = 0;
    669  
    670   unsigned long lastLevelDocNum = 0;
    671 
    672   unsigned long resultI = 0;
    673   unsigned long resultSize = result.docs.size();
    674   unsigned long 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;
    675675 
    676676  while (termDataI < termDataSize) {
    … …  
    732732void FindNearestWordNumber (IndexData &indexData,
    733733                const UCArray &term,
    734                 unsigned long &number) {
     734                mg_u_long &number) {
    735735
    736736    // find the word number for this term
    737     unsigned long wordElNum = 0;
    738     unsigned long numLevels = indexData.bdh.num_levels;
     737    mg_u_long wordElNum = 0;
     738    mg_u_long numLevels = indexData.bdh.num_levels;
    739739    word_block_dict_el wordDictEl;
    740740    wordDictEl.SetNumLevels (numLevels);
    … …  
    748748
    749749void GetTermList(IndexData &indexData,
    750          unsigned long startTerm,
    751          unsigned long numTerms,
     750         mg_u_long startTerm,
     751         mg_u_long numTerms,
    752752         TermFreqArray &terms) {
    753753
    … …  
    777777
    778778void GetTermList(IndexData &indexData,
    779          unsigned long startTerm,
    780          unsigned long numTerms,
     779         mg_u_long startTerm,
     780         mg_u_long numTerms,
    781781         UCArrayVector &terms) {
    782782

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/Terms.h

    r16583 r25147  
    2424
    2525#include "IndexData.h"
     26#include "mglong.h"
    2627
    2728#if defined(GSDL_USE_OBJECTSPACE)
    … …  
    3839  // general query information
    3940  UCArray docLevel;
    40   unsigned long maxDocs; // 0 = all
     41  mg_u_long maxDocs; // 0 = all
    4142  bool sortByRank;
    4243  bool exactWeights;
    … …  
    5758  int stemMethod;
    5859  UCArrayVector equivTerms; // the stemmed and casefolded variants of the term
    59   unsigned long matchDocs; // tf for level - num levels
     60  mg_u_long matchDocs; // tf for level - num levels
    6061               // containing this term
    61   unsigned long termFreq;  // overall term freq - num words that
     62  mg_u_long termFreq;  // overall term freq - num words that
    6263                // are this term
    6364  void Clear ();
    … …  
    7273
    7374typedef vector<float> RankArray;
    74 typedef vector<unsigned long> DocNumArray;
     75typedef vector<mg_u_long> DocNumArray;
    7576
    7677class QueryResult {
    … …  
    8182  TermFreqArray termFreqs;
    8283
    83   unsigned long actualNumDocs;
     84  mg_u_long actualNumDocs;
    8485  void Clear ();
    8586  QueryResult ();
    … …  
    9091bool operator== (const QueryResult &r1, const QueryResult &r2);
    9192
    92 typedef vector<unsigned long> FragNumArray;
    93 typedef vector<unsigned long> FragFreqArray;
     93typedef vector<mg_u_long> FragNumArray;
     94typedef vector<mg_u_long> FragFreqArray;
    9495
    9596class FragData {
    9697public:
    97   unsigned long matchDocs;    // ft for level
     98  mg_u_long matchDocs;    // ft for level
    9899  FragNumArray fragNums;
    99100  FragFreqArray fragFreqs;
    … …  
    106107class FragRange {
    107108public:
    108   unsigned long rangeStart;
    109   unsigned long rangeEnd;
     109  mg_u_long rangeStart;
     110  mg_u_long rangeEnd;
    110111
    111112  void Clear () { rangeStart = rangeEnd = 0; }
    … …  
    119120void FindWordNumbers (IndexData &indexData,
    120121              const UCArray &term,
    121               unsigned long stemMethod,
    122               vector<unsigned long> &equivWords);
     122              mg_u_long stemMethod,
     123              vector<mg_u_long> &equivWords);
    123124
    124125void ReadTermFragData (IndexData &indexData,
    125126               bool needFragFreqs,
    126                unsigned long termNum,
     127               mg_u_long termNum,
    127128               FragData &fragData,
    128129               FragRangeArray *fragLimits,
    … …  
    138139             FragData &fragData,
    139140             const FragData &comFragData,
    140              signed long startRange,
    141              signed long endRange,
     141             mg_s_long startRange,
     142             mg_s_long endRange,
    142143             const FragRangeArray *fragLimits);
    143144
    … …  
    147148             const UCArray &tag,
    148149             const UCArray &term,
    149              unsigned long stemMethod,
    150              unsigned long termWeight,
     150             mg_u_long stemMethod,
     151             mg_u_long termWeight,
    151152             UCArrayVector &equivTerms,
    152153             QueryResult &result);
    … …  
    157158                const UCArray &tag,
    158159                const UCArray &term,
    159                 unsigned long stemMethod,
    160                 unsigned long termWeight,
     160                mg_u_long stemMethod,
     161                mg_u_long termWeight,
    161162                UCArrayVector &equivTerms,
    162163                QueryResult &result);
    … …  
    201202void FindNearestWordNumber (IndexData &indexData,
    202203                const UCArray &term,
    203                 unsigned long &number);
     204                mg_u_long &number);
    204205
    205206void GetTermList(IndexData &indexData,
    206          unsigned long startTerm,
    207          unsigned long numTerms,
     207         mg_u_long startTerm,
     208         mg_u_long numTerms,
    208209         TermFreqArray &terms);
    209210
    210211void GetTermList (IndexData &indexData,
    211          unsigned long startTerm,
    212          unsigned long numTerms,
     212         mg_u_long startTerm,
     213         mg_u_long numTerms,
    213214         UCArrayVector &terms);
    214215

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/TextEl.cpp

    r16583 r25147  
    246246}
    247247 
    248 static void AddTextEl (TextElArray &doc, unsigned long &docLen,
     248static void AddTextEl (TextElArray &doc, mg_u_long &docLen,
    249249               const TextEl &el) {
    250250  doc.push_back (el);
    … …  
    258258
    259259bool ReadDoc (FileBuf &buf, const UCArray &docTag,
    260           TextElArray &doc, unsigned long &docLen,
     260          TextElArray &doc, mg_u_long &docLen,
    261261          bool compatMode) {
    262262  bool compatInPara = false;
    … …  
    316316// copy of readdoc to get TextElArray from u_char buffer
    317317bool ReadDoc(u_char ** buffer, const UCArray &docTag,
    318          TextElArray &doc, unsigned long &docLen,
     318         TextElArray &doc, mg_u_long &docLen,
    319319         bool compatMode) {
    320320  bool compatInPara = false;

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/TextEl.h

    r16583 r25147  
    6060// returns true if a document could be found
    6161bool ReadDoc (FileBuf &buf, const UCArray &docTag,
    62           TextElArray &doc, unsigned long &docLen,
     62          TextElArray &doc, mg_u_long &docLen,
    6363          bool compatMode=false);
    6464
    6565bool ReadDoc(u_char **buffer, const UCArray &docTag,
    66          TextElArray &doc, unsigned long &docLen,
     66         TextElArray &doc, mg_u_long &docLen,
    6767         bool compatMode=false);
    6868

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/TextGet.cpp

    r16583 r25147  
    187187                  huff_type type) {
    188188  huff_data * hd;
    189   u_long **   vals;
     189  mg_u_long **   vals;
    190190
    191191  if (!(hd = new huff_data))
    … …  
    326326  if (text_fast_comp_dict == NULL) return false;
    327327 
    328   u_long *p, *end;
     328  uintptr_t *p, *end;
    329329  u_char *fixup;
    330   u_long mem;
    331   u_long fixup_mem;
     330  mg_u_long mem;
     331  mg_u_long fixup_mem;
    332332  int i;  /* [RPAP - Jan 97: Endian Ordering] */
    333333
    … …  
    343343  }
    344344
    345   end = (u_long *) (((u_char *) cd) + mem);
     345  end = (uintptr_t *) (((u_char *) cd) + mem);
    346346  fread (cd, sizeof (u_char), mem, text_fast_comp_dict);
    347347
    … …  
    354354  fread (fixup, fixup_mem, sizeof (u_char), text_fast_comp_dict);
    355355
    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)
    357357    if (IS_FIXUP (p))
    358358      {
    359359    NTOHUL(*p);  /* [RPAP - Jan 97: Endian Ordering] */
    360     *p = *p + (u_long) cd;
     360    *p = *p + (uintptr_t) cd;
    361361      }
    362362
    … …  
    464464
    465465  // 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) &&
    467467          levels.Read (levelFile));
    468468
    … …  
    507507
    508508  // 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))
    510510    return false;
    511511
    … …  
    535535
    536536bool GetDocIdx (TextData &td, const UCArray &docLevel,
    537         unsigned long docNum, TextIdx &docIdx) {
     537        mg_u_long docNum, TextIdx &docIdx) {
    538538  // make sure the text index file was opened successfully
    539539  if (td.textIdxFile == NULL) return false;
    … …  
    551551#define MY_HUFF_DECODE(len, code, mcodes)               \
    552552  do {                                  \
    553     register unsigned long *__min_code = (mcodes);          \
    554     register unsigned long *__mclen = __min_code;           \
    555     register unsigned long __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;                  \
    556556    do                                  \
    557557      {                                 \
    … …  
    565565
    566566bool GetDocText (TextData &td, const UCArray &docLevel,
    567          unsigned long docNum, UCArray &docText) {
     567         mg_u_long docNum, UCArray &docText) {
    568568  // erase the current text
    569569  docText.erase (docText.begin(), docText.end());
    … …  
    581581  auxiliary_dict *ad = cd.ad;
    582582  int which = docIdx.which;
    583   unsigned long num_bits = (docIdx.end.byte*8+(8-docIdx.end.bit)) -
     583  mg_u_long num_bits = (docIdx.end.byte*8+(8-docIdx.end.bit)) -
    584584    (docIdx.start.byte*8+(8-docIdx.start.bit));
    585   unsigned long bits = 0;
     585  mg_u_long bits = 0;
    586586
    587587  if (docText.capacity() < docText.size() + num_bits + 1) {

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/TextGet.h

    r16583 r25147  
    4949// get information about where a document starts and finishes
    5050bool GetDocIdx (TextData &td, const UCArray &docLevel,
    51         unsigned long docNum, TextIdx &docIdx);
     51        mg_u_long docNum, TextIdx &docIdx);
    5252
    5353
    5454// decompress a document's text
    5555bool GetDocText (TextData &td, const UCArray &docLevel,
    56          unsigned long docNum, UCArray &docText);
     56         mg_u_long docNum, UCArray &docText);
    5757
    5858#endif

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/UCArray.cpp

    r16583 r25147  
    104104
    105105
    106 bool ReadVarLenUL (FILE *f, unsigned long &n) {
    107   register unsigned long temp = 0;
     106bool ReadVarLenUL (FILE *f, mg_u_long &n) {
     107  register mg_u_long temp = 0;
    108108  register unsigned int bitPos = 0;
    109109  unsigned char b = 0;
    … …  
    121121}
    122122
    123 bool WriteVarLenUL (FILE *f, unsigned long n) {
    124   register unsigned long temp = n;
     123bool WriteVarLenUL (FILE *f, mg_u_long n) {
     124  register mg_u_long temp = n;
    125125  register unsigned char b = 0;
    126126  do {
    … …  
    135135
    136136
    137 bool ReadUL (FILE *f, unsigned long &n) {
    138   if (fread (&n, sizeof (unsigned long), 1, f) <= 0) return false;
     137bool ReadUL (FILE *f, mg_u_long &n) {
     138  if (fread (&n, sizeof (mg_u_long), 1, f) <= 0) return false;
    139139  NTOHUL (n);
    140140  return true;
    … …  
    142142
    143143
    144 bool WriteUL (FILE *f, unsigned long n) {
     144bool WriteUL (FILE *f, mg_u_long n) {
    145145  HTONUL (n);
    146   return (fwrite (&n, sizeof (unsigned long), 1, f) > 0);
     146  return (fwrite (&n, sizeof (mg_u_long), 1, f) > 0);
    147147}
    148148
    … …  
    174174
    175175  // read in the array size
    176   unsigned long arraySize = 0;
     176  mg_u_long arraySize = 0;
    177177  if (!ReadVarLenUL (f, arraySize)) return false;
    178178
    … …  
    382382
    383383
    384 unsigned long PrefixLen (const UCArray &a1, const UCArray &a2) {
    385   unsigned long l = (a1.size() < a2.size()) ? a1.size() : a2.size();
    386   unsigned long i = 0;
     384mg_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;
    387387
    388388  UCArray::const_iterator a1Here = a1.begin();

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/UCArray.h

    r18717 r25147  
    2222#ifndef UCARRAY_H
    2323#define UCARRAY_H
     24
     25#include "mglong.h"
    2426
    2527#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
    … …  
    8183
    8284// used for reading and writing variable length unsigned longs
    83 bool ReadVarLenUL (FILE *f, unsigned long &n);
    84 bool WriteVarLenUL (FILE *f, unsigned long n);
     85bool ReadVarLenUL (FILE *f, mg_u_long &n);
     86bool WriteVarLenUL (FILE *f, mg_u_long n);
    8587
    86 // used for reading and writing unsigned longs
    87 bool ReadUL (FILE *f, unsigned long &n);
    88 bool WriteUL (FILE *f, unsigned long n);
     88// used for reading and writing unsigned longs 
     89bool ReadUL (FILE *f, mg_u_long &n);
     90bool WriteUL (FILE *f, mg_u_long n);
    8991
    9092// used for reading and writing floats
    … …  
    123125typedef vector<UCArray> UCArrayVector;
    124126
    125 unsigned long PrefixLen (const UCArray &a1, const UCArray &a2);
     127mg_u_long PrefixLen (const UCArray &a1, const UCArray &a2);
    126128
    127129// prev == NULL if no previous string

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/Weights.cpp

    r16583 r25147  
    2424#include "sysfuncs.h"
    2525
    26 #define MAXBITS (sizeof(unsigned long) * 8)
     26#define MAXBITS (sizeof(mg_u_long) * 8)
    2727
    2828
    … …  
    5353}
    5454
    55 bool ApproxWeightsData::Read (FILE *approxWeightsFile, unsigned long diskPtr,
    56                   unsigned long _numLevelDocs) {
     55bool ApproxWeightsData::Read (FILE *approxWeightsFile, mg_u_long diskPtr,
     56                  mg_u_long _numLevelDocs) {
    5757  Free ();
    5858 
    … …  
    6969
    7070  // allocate buffer for the weights
    71   unsigned long arrSize = (bits*numLevelDocs+sizeof(unsigned long)-1) / 32;
    72   weightBuf = new unsigned long[arrSize];
     71  mg_u_long arrSize = (bits*numLevelDocs+sizeof(mg_u_long)-1) / 32;
     72  weightBuf = new mg_u_long[arrSize];
    7373
    7474  // read in the weights
    75   unsigned long i;
     75  mg_u_long i;
    7676  for (i=0; i<arrSize; ++i) {
    7777    ReadUL (approxWeightsFile, weightBuf[i]);
    … …  
    8181  // (if not small enough table == NULL
    8282  if (bits <= 12) {
    83     unsigned long i, tableSize = (1 << bits);
     83    mg_u_long i, tableSize = (1 << bits);
    8484    table = new float[tableSize];
    8585    table[0] = L;
    … …  
    9191}
    9292
    93 float ApproxWeightsData::GetLowerApproxDocWeight (unsigned long levelDocNum) {
     93float ApproxWeightsData::GetLowerApproxDocWeight (mg_u_long levelDocNum) {
    9494  // sanity check
    9595  if (bits == 0 || weightBuf == NULL) return 1.0;
    9696
    97   register unsigned long c, pos;
    98   register unsigned long *dw;
     97  register mg_u_long c, pos;
     98  register mg_u_long *dw;
    9999
    100100  // get the compressed version of the weight
    … …  
    114114
    115115
    116 float GetExactDocWeight (FILE *exactWeightsFile, unsigned long diskPtr,
    117              unsigned long levelDocNum) {
     116float GetExactDocWeight (FILE *exactWeightsFile, mg_u_long diskPtr,
     117             mg_u_long levelDocNum) {
    118118  // go to the appropriate place in the weights file
    119119  fseek (exactWeightsFile, diskPtr+sizeof(float)*levelDocNum, SEEK_SET);

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/Weights.h

    r16583 r25147  
    2323#define WEIGHTS_H
    2424
     25#include "mglong.h"
    2526#include <stdio.h>
    2627
    … …  
    2930public:
    3031  unsigned char bits;
    31   unsigned long mask;
     32  mg_u_long mask;
    3233  double L;
    3334  double B;
    34   unsigned long numLevelDocs;
    35   unsigned long *weightBuf;
     35  mg_u_long numLevelDocs;
     36  mg_u_long *weightBuf;
    3637  float *table;   // precomputed translation table
    3738 
    … …  
    4142  void Free (); // frees any allocated memory
    4243 
    43   bool Read (FILE *approxWeightsFile, unsigned long diskPtr,
    44          unsigned long _numLevelDocs);
     44  bool Read (FILE *approxWeightsFile, mg_u_long diskPtr,
     45         mg_u_long _numLevelDocs);
    4546
    46   float GetLowerApproxDocWeight (unsigned long levelDocNum);
     47  float GetLowerApproxDocWeight (mg_u_long levelDocNum);
    4748};
    4849
    … …  
    5051// diskPtr points to the start of the exact document weights
    5152// for this level
    52 float GetExactDocWeight (FILE *exactWeightsFile, unsigned long diskPtr,
    53              unsigned long levelDocNum);
     53float GetExactDocWeight (FILE *exactWeightsFile, mg_u_long diskPtr,
     54             mg_u_long levelDocNum);
    5455
    5556

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/WordData.h

    r16583 r25147  
    2424
    2525 public:
    26   unsigned long docCount;
    27   unsigned long wordCount;
     26  mg_u_long docCount;
     27  mg_u_long wordCount;
    2828
    2929  inline void read(FILE *f)
    … …  
    3636    }
    3737
    38   inline unsigned long documents()
     38  inline mg_u_long documents()
    3939    {
    4040      return docCount;

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/build.h

    r16583 r25147  
    7777
    7878
    79 extern unsigned long invf_buffer_size;
     79extern mg_u_long invf_buffer_size;
    8080/*
    8181 * The amount of memory to allocate to the invertion buffer.

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/comp_dict.cpp

    r16583 r25147  
    4242huff_data char_huff[2];
    4343huff_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;
     44mg_u_long *char_codes[2], *lens_codes[2];
     45mg_u_long Words_disk = 0;
     46mg_u_long Chars_disk = 0;
    4747
    4848
    … …  
    5555  dict_hash_table *ht;
    5656  u_char **words;
    57   u_long ht_size;
     57  mg_u_long ht_size;
    5858
    5959  ht_size = prime (cfh->hd.num_codes * HASH_RATIO);
    … …  
    9999
    100100      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    }
    102108      *allwords = val + copy;
    103109
    … …  
    108114    {
    109115      register u_char **wptr;
    110       register unsigned long tsize = ht->size;
    111       register unsigned long hashval, step;
     116      register mg_u_long tsize = ht->size;
     117      register mg_u_long hashval, step;
    112118
    113119      HASH (hashval, step, allwords, tsize);
    … …  
    166172    return COMPERROR;
    167173
    168   Words_disk = sizeof (u_long);
     174  Words_disk = sizeof (mg_u_long);
    169175
    170176  if (Read_cdh (dict, &cdh, NULL, &Words_disk) == -1)

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/comp_dict.h

    r16583 r25147  
    2424typedef struct dict_hash_table
    2525  {
    26     u_long size;
     26    mg_u_long size;
    2727    huff_data *hd;
    28     u_long *codes;
     28    mg_u_long *codes;
    2929    u_char **words;
    3030    u_char **table[1];
    … …  
    4040extern huff_data char_huff[2];
    4141extern 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;
     42extern mg_u_long *char_codes[2], *lens_codes[2];
     43extern mg_u_long Words_disk;
     44extern mg_u_long Chars_disk;
    4545
    4646

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/hash.h

    r16583 r25147  
    2626    do {                        \
    2727        register u_char *p=wd;          \
    28         register long len = *p++;       \
    29         register unsigned long hval;        \
     28        register mg_s_long len = *p++;      \
     29        register mg_u_long hval;        \
    3030        if (len>25) len = 25;           \
    3131        for (hval=0; len; --len)        \

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/invf.cpp

    r16583 r25147  
    104104}
    105105
    106 void word_dict_el::SetNumLevels (unsigned long numLevels) {
     106void word_dict_el::SetNumLevels (mg_u_long numLevels) {
    107107  if (levelFreqs != NULL) delete [] levelFreqs;
    108   levelFreqs = new unsigned long [numLevels];
    109 }
    110  
    111 bool word_dict_el::Read (FILE *f, unsigned long numLevels) {
     108  levelFreqs = new mg_u_long [numLevels];
     109}
     110 
     111bool word_dict_el::Read (FILE *f, mg_u_long numLevels) {
    112112  if (!dict_el::Read (f)) return false;
    113113
    114114  if (levelFreqs == NULL) return false;
    115115 
    116   unsigned long i;
     116  mg_u_long i;
    117117  for (i=0; i<numLevels; ++i) {
    118118    if (!ReadUL (f, levelFreqs[i])) return false;
    … …  
    123123
    124124bool word_dict_el::Write (FILE *f, const UCArray *lastEl,
    125               unsigned long numLevels) const {
     125              mg_u_long numLevels) const {
    126126  if (!dict_el::Write (f, lastEl)) return false;
    127127
    128128  if (levelFreqs == NULL) return false;
    129129
    130   unsigned long i;
     130  mg_u_long i;
    131131  for (i=0; i<numLevels; ++i) {
    132132    if (!WriteUL (f, levelFreqs[i])) return false;
    … …  
    229229}
    230230
    231 void word_block_dict_el::SetNumLevels (unsigned long numLevels) {
     231void word_block_dict_el::SetNumLevels (mg_u_long numLevels) {
    232232  if (levelFreqs != NULL) delete [] levelFreqs;
    233   levelFreqs = new unsigned long [numLevels];
    234 }
    235 
    236 bool word_block_dict_el::Read (FILE *f, unsigned long numLevels) {
     233  levelFreqs = new mg_u_long [numLevels];
     234}
     235
     236bool word_block_dict_el::Read (FILE *f, mg_u_long numLevels) {
    237237  if (!block_dict_el::Read (f)) return false;
    238238 
    239239  if (levelFreqs == NULL) return false;
    240240 
    241   unsigned long i;
     241  mg_u_long i;
    242242  for (i=0; i<numLevels; ++i) {
    243243    if (!ReadUL (f, levelFreqs[i])) return false;
    … …  
    248248
    249249bool word_block_dict_el::Write (FILE *f, const UCArray *lastEl,
    250                 unsigned long numLevels) const {
     250                mg_u_long numLevels) const {
    251251  if (!block_dict_el::Write (f, lastEl)) return false;
    252252 
    253253  if (levelFreqs == NULL) return false;
    254254 
    255   unsigned long i;
     255  mg_u_long i;
    256256  for (i=0; i<numLevels; ++i) {
    257257    if (!WriteUL (f, levelFreqs[i])) return false;
    … …  
    288288 
    289289  // read in the array size
    290   unsigned long arraySize = 0;
     290  mg_u_long arraySize = 0;
    291291  if (!ReadVarLenUL (f, arraySize)) return false;
    292292 
    … …  
    383383 
    384384  // read in the array size
    385   unsigned long arraySize = 0;
     385  mg_u_long arraySize = 0;
    386386  if (!ReadVarLenUL (f, arraySize)) return false;
    387387 
    388388  // read in the array
    389   unsigned long wordNum;
     389  mg_u_long wordNum;
    390390  while (arraySize > 0) {
    391391    if (!ReadUL (f, wordNum)) return false;
    … …  
    404404  if (!WriteVarLenUL (f, equivWords.size())) return false;
    405405
    406   vector<unsigned long>::const_iterator here = equivWords.begin();
    407   vector<unsigned long>::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();
    408408  while (here != end) {
    409409    if (!WriteUL (f, (*here))) return false;
    … …  
    464464
    465465bool SearchElNum (const block_idx &bIdx,
    466           unsigned long entriesPerBlock,
    467           unsigned long elNum,
    468           unsigned long &blockIdxNum,
    469           unsigned long &blockStartElNum) {
     466          mg_u_long entriesPerBlock,
     467          mg_u_long elNum,
     468          mg_u_long &blockIdxNum,
     469          mg_u_long &blockStartElNum) {
    470470  blockIdxNum = 0;
    471471  blockStartElNum = 0;
    … …  
    481481
    482482bool SearchEl (const block_idx &bIdx,
    483            unsigned long entriesPerBlock,
     483           mg_u_long entriesPerBlock,
    484484           const UCArray &el,
    485            unsigned long &blockIdxNum,
    486            unsigned long &blockStartElNum) {
     485           mg_u_long &blockIdxNum,
     486           mg_u_long &blockStartElNum) {
    487487  blockIdxNum = 0;
    488488  blockStartElNum = 0;
    489489
    490   unsigned long begin = 0;
    491   unsigned long bIdxEnd = bIdx.size();
    492   unsigned long end = bIdxEnd;
    493   unsigned long 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;
    494494  while (begin < end) {
    495495    mid = (begin+end)/2;
    … …  
    517517bool SearchBlockDictElNum (FILE *dictFile,
    518518               const block_idx &bIdx,
    519                unsigned long entriesPerBlock,
    520                unsigned long dictSize,
    521                unsigned long elNum,
     519               mg_u_long entriesPerBlock,
     520               mg_u_long dictSize,
     521               mg_u_long elNum,
    522522               block_dict_el &dictEl) {
    523523  UCArrayClear (dictEl.el);
    … …  
    525525
    526526  // find the block that contains the element
    527   unsigned long blockIdxNum, curElNum;
     527  mg_u_long blockIdxNum, curElNum;
    528528  if (!SearchElNum (bIdx, entriesPerBlock, elNum,
    529529            blockIdxNum, curElNum))
    … …  
    541541bool SearchBlockDictEl (FILE *dictFile,
    542542            const block_idx &bIdx,
    543             unsigned long entriesPerBlock,
    544             unsigned long dictSize,
     543            mg_u_long entriesPerBlock,
     544            mg_u_long dictSize,
    545545            const UCArray &el,
    546546            block_dict_el &dictEl,
    547             unsigned long &elNum) {
     547            mg_u_long &elNum) {
    548548  UCArrayClear (dictEl.el);
    549549
    550550  // find the block that contains the element
    551   unsigned long blockIdxNum;
     551  mg_u_long blockIdxNum;
    552552  if (!SearchEl (bIdx, entriesPerBlock, el,
    553553         blockIdxNum, elNum))
    554554    return false;
    555555
    556   unsigned long blockEndElNum = elNum + entriesPerBlock;
     556  mg_u_long blockEndElNum = elNum + entriesPerBlock;
    557557  if (blockEndElNum > dictSize) blockEndElNum = dictSize;
    558558
    … …  
    576576bool SearchWordBlockDictElNum (FILE *dictFile,
    577577                   const block_idx &bIdx,
    578                    unsigned long entriesPerBlock,
    579                    unsigned long dictSize,
    580                    unsigned long numLevels,
    581                    unsigned long elNum,
     578                   mg_u_long entriesPerBlock,
     579                   mg_u_long dictSize,
     580                   mg_u_long numLevels,
     581                   mg_u_long elNum,
    582582                   word_block_dict_el &dictEl) {
    583583  UCArrayClear (dictEl.el);
    … …  
    585585
    586586  // find the block that contains the element
    587   unsigned long blockIdxNum, curElNum;
     587  mg_u_long blockIdxNum, curElNum;
    588588  if (!SearchElNum (bIdx, entriesPerBlock, elNum,
    589589            blockIdxNum, curElNum))
    … …  
    601601bool SearchWordBlockDictEl (FILE *dictFile,
    602602                const block_idx &bIdx,
    603                 unsigned long entriesPerBlock,
    604                 unsigned long dictSize,
    605                 unsigned long numLevels,
     603                mg_u_long entriesPerBlock,
     604                mg_u_long dictSize,
     605                mg_u_long numLevels,
    606606                const UCArray &el,
    607607                word_block_dict_el &dictEl,
    608                 unsigned long &elNum) {
     608                mg_u_long &elNum) {
    609609  UCArrayClear (dictEl.el);
    610610
    611611  // find the block that contains the element
    612   unsigned long blockIdxNum;
     612  mg_u_long blockIdxNum;
    613613  if (!SearchEl (bIdx, entriesPerBlock, el,
    614614         blockIdxNum, elNum))
    615615    return false;
    616616
    617   unsigned long blockEndElNum = elNum + entriesPerBlock;
     617  mg_u_long blockEndElNum = elNum + entriesPerBlock;
    618618  if (blockEndElNum > dictSize) blockEndElNum = dictSize;
    619619
    … …  
    637637bool SearchStemBlockDictElNum (FILE *dictFile,
    638638                   const block_idx &bIdx,
    639                    unsigned long entriesPerBlock,
    640                    unsigned long dictSize,
    641                    unsigned long elNum,
     639                   mg_u_long entriesPerBlock,
     640                   mg_u_long dictSize,
     641                   mg_u_long elNum,
    642642                   stem_block_dict_el &dictEl) {
    643643  UCArrayClear (dictEl.el);
    … …  
    645645
    646646  // find the block that contains the element
    647   unsigned long blockIdxNum, curElNum;
     647  mg_u_long blockIdxNum, curElNum;
    648648  if (!SearchElNum (bIdx, entriesPerBlock, elNum,
    649649            blockIdxNum, curElNum))
    … …  
    661661bool SearchStemBlockDictEl (FILE *dictFile,
    662662                const block_idx &bIdx,
    663                 unsigned long entriesPerBlock,
    664                 unsigned long dictSize,
     663                mg_u_long entriesPerBlock,
     664                mg_u_long dictSize,
    665665                const UCArray &el,
    666666                stem_block_dict_el &dictEl,
    667                 unsigned long &elNum) {
     667                mg_u_long &elNum) {
    668668  UCArrayClear (dictEl.el);
    669669
    670670  // find the block that contains the element
    671   unsigned long blockIdxNum;
     671  mg_u_long blockIdxNum;
    672672  if (!SearchEl (bIdx, entriesPerBlock, el,
    673673         blockIdxNum, elNum))
    674674    return false;
    675675
    676   unsigned long blockEndElNum = elNum + entriesPerBlock;
     676  mg_u_long blockEndElNum = elNum + entriesPerBlock;
    677677  if (blockEndElNum > dictSize) blockEndElNum = dictSize;
    678678
    … …  
    696696bool PartialMatchSearchWordBlockDictEl (FILE *dictFile,
    697697                 const block_idx &bIdx,
    698                  unsigned long entriesPerBlock,
    699                  unsigned long dictSize,
    700                  unsigned long numLevels,
     698                 mg_u_long entriesPerBlock,
     699                 mg_u_long dictSize,
     700                 mg_u_long numLevels,
    701701                 const UCArray &el,
    702702                 word_block_dict_el &dictEl,
    703                  vector<unsigned long> &elNumList,
     703                 vector<mg_u_long> &elNumList,
    704704                 bool casefold) {
    705705
    706706  UCArrayClear (dictEl.el);
    707707  elNumList.erase (elNumList.begin(), elNumList.end());
    708   unsigned long elNum;
     708  mg_u_long elNum;
    709709  // find the block that contains the element
    710   unsigned long blockIdxNum;
     710  mg_u_long blockIdxNum;
    711711  // will this work??
    712712  if (!SearchEl (bIdx, entriesPerBlock, el,
    … …  
    714714    return false;
    715715  }
    716   unsigned long blockEndElNum = elNum + entriesPerBlock;
     716  mg_u_long blockEndElNum = elNum + entriesPerBlock;
    717717  if (blockEndElNum > dictSize) blockEndElNum = dictSize;
    718718 
    … …  
    770770bool NearestSearchWordBlockDictEl (FILE *dictFile,
    771771                   const block_idx &bIdx,
    772                    unsigned long entriesPerBlock,
    773                    unsigned long dictSize,
    774                    unsigned long numLevels,
     772                   mg_u_long entriesPerBlock,
     773                   mg_u_long dictSize,
     774                   mg_u_long numLevels,
    775775                   const UCArray &el,
    776776                   word_block_dict_el &dictEl,
    777                    unsigned long &elNum) {
     777                   mg_u_long &elNum) {
    778778
    779779  UCArrayClear (dictEl.el);
    780780
    781781  // find the block that contains the element
    782   unsigned long blockIdxNum;
     782  mg_u_long blockIdxNum;
    783783  if (!SearchEl (bIdx, entriesPerBlock, el,
    784784         blockIdxNum, elNum))
    785785    return false;
    786786
    787   unsigned long blockEndElNum = elNum + entriesPerBlock;
     787  mg_u_long blockEndElNum = elNum + entriesPerBlock;
    788788  if (blockEndElNum > dictSize) blockEndElNum = dictSize;
    789789
    … …  
    809809bool SearchWordBlockDictElNumRange (FILE *dictFile,
    810810                    const block_idx &bIdx,
    811                     unsigned long entriesPerBlock,
    812                     unsigned long dictSize,
    813                     unsigned long numLevels,
    814                     unsigned long elNum,
    815                     unsigned long 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,
    816816                    UCArrayVector &terms) {
    817817
    … …  
    825825 
    826826  // find the block that contains the element
    827   unsigned long blockIdxNum, curElNum;
     827  mg_u_long blockIdxNum, curElNum;
    828828  if (!SearchElNum (bIdx, entriesPerBlock, elNum,
    829829            blockIdxNum, curElNum))
    830830    return false;
    831831
    832   unsigned long lastElNum = elNum + numWords - 1;
     832  mg_u_long lastElNum = elNum + numWords - 1;
    833833  if (lastElNum > dictSize) lastElNum = dictSize;
    834834
    … …  
    859859bool SearchWordBlockDictElNumRange (FILE *dictFile,
    860860                    const block_idx &bIdx,
    861                     unsigned long entriesPerBlock,
    862                     unsigned long dictSize,
    863                     unsigned long numLevels,
    864                     unsigned long elNum,
    865                     unsigned long 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,
    866866                    word_block_dict_el_array &terms) {
    867867
    … …  
    876876 
    877877  // find the block that contains the element
    878   unsigned long blockIdxNum, curElNum;
     878  mg_u_long blockIdxNum, curElNum;
    879879  if (!SearchElNum (bIdx, entriesPerBlock, elNum,
    880880            blockIdxNum, curElNum))
    881881    return false;
    882882
    883   unsigned long lastElNum = elNum + numWords - 1;
     883  mg_u_long lastElNum = elNum + numWords - 1;
    884884  if (lastElNum > dictSize) lastElNum = dictSize;
    885885

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/invf.h

    r16583 r25147  
    2525#define H_INVF
    2626
     27#include "mglong.h"
    2728#include <stdio.h>
    2829
    … …  
    3233// header info for .invf.dict file
    3334struct invf_dict_header {
    34   unsigned long lookback;
    35   unsigned long word_dict_start;
    36   unsigned long word_dict_size;
    37   unsigned long tag_dict_start;
    38   unsigned long tag_dict_size;
    39   unsigned long num_docs;
    40   unsigned long num_frags;
    41   unsigned long num_words;
    42   unsigned long total_bytes;
    43   unsigned long index_string_bytes;
    44   unsigned long 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;
    4546
    4647  invf_dict_header ();
    … …  
    5556struct dict_el {
    5657  UCArray el; // word or tag
    57   unsigned long frag_occur;
    58   unsigned long freq;
     58  mg_u_long frag_occur;
     59  mg_u_long freq;
    5960
    6061  virtual void Clear ();
    … …  
    6970
    7071struct word_dict_el : public dict_el {
    71   unsigned long *levelFreqs;
     72  mg_u_long *levelFreqs;
    7273
    7374  void Clear ();
    … …  
    7576  ~word_dict_el ();
    7677
    77   void SetNumLevels (unsigned long numLevels);
     78  void SetNumLevels (mg_u_long numLevels);
    7879
    7980  // SetNumLevels should be called before either
    … …  
    8182 
    8283  // Read assumes that the last word is in el
    83   bool Read (FILE *f, unsigned long numLevels);
     84  bool Read (FILE *f, mg_u_long numLevels);
    8485  bool Write (FILE *f, const UCArray *lastEl,
    85           unsigned long numLevels) const;
     86          mg_u_long numLevels) const;
    8687};
    8788
    … …  
    100101  // for blocked dictionaries
    101102
    102   unsigned long entries_per_wblk; // word blocks
    103   unsigned long num_wblks;
    104   unsigned long max_wblk_size;
    105   unsigned long wblk_start;
    106   unsigned long wblk_idx_start;
    107  
    108   unsigned long entries_per_tblk; // tag blocks
    109   unsigned long num_tblks;
    110   unsigned long max_tblk_size;
    111   unsigned long tblk_start;
    112   unsigned long 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;
    113114 
    114115  block_dict_header ();
    … …  
    122123struct block_dict_el {
    123124  UCArray el; // word or tag
    124   unsigned long frag_occur; // # entries in invf file - if have a
     125  mg_u_long frag_occur; // # entries in invf file - if have a
    125126  // word level index, this is the same as freq, otherwise, its the number
    126127  // of fragments containing this word
    127   unsigned long freq; // # of times this word occurs
    128   unsigned long invf_ptr; // pointer into inverted file
     128  mg_u_long freq; // # of times this word occurs
     129  mg_u_long invf_ptr; // pointer into inverted file
    129130
    130131  virtual void Clear ();
    … …  
    140141
    141142struct word_block_dict_el : public block_dict_el {
    142   unsigned long *levelFreqs; // freq of the word at each level
     143  mg_u_long *levelFreqs; // freq of the word at each level
    143144
    144145  void Clear ();
    … …  
    146147  ~word_block_dict_el ();
    147148
    148   void SetNumLevels (unsigned long numLevels);
     149  void SetNumLevels (mg_u_long numLevels);
    149150
    150151  // SetNumLevels should be called before either
    … …  
    152153 
    153154  // Read assumes that the last word is in el
    154   bool Read (FILE *f, unsigned long numLevels);
     155  bool Read (FILE *f, mg_u_long numLevels);
    155156  bool Write (FILE *f, const UCArray *lastEl,
    156           unsigned long numLevels) const;
     157          mg_u_long numLevels) const;
    157158};
    158159
    … …  
    161162struct block_idx_info {
    162163  UCArray el;
    163   unsigned long block_ptr;
     164  mg_u_long block_ptr;
    164165
    165166  block_idx_info ();
    … …  
    179180
    180181struct stem_idx_header {
    181   unsigned long lookback;
    182   unsigned long dict_size;
    183 
    184   unsigned long entries_per_block;
    185   unsigned long num_blocks;
    186   unsigned long max_block_size;
    187   unsigned long blocks_start;
    188   unsigned long block_idx_start;
    189  
    190   unsigned long stemmer_num;
    191   unsigned long 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;
    192193
    193194  stem_idx_header ();
    … …  
    200201struct stem_block_dict_el {
    201202  UCArray el; // word or tag
    202   vector<unsigned long> equivWords;
     203  vector<mg_u_long> equivWords;
    203204 
    204205  stem_block_dict_el ();
    … …  
    220221// with num entries, and a pointer into invf file
    221222struct invf_file_header {
    222   unsigned long no_of_words;
    223   unsigned long no_of_tags;
    224   unsigned long skip_mode;
    225   unsigned long word_level_index; // 1 if word level index
    226   unsigned long 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];
    227228
    228229  invf_file_header ();
    … …  
    242243// the block index is sorted by DictCompare (or DictLTUCArray)
    243244bool SearchElNum (const block_idx &bIdx,
    244           unsigned long entriesPerBlock,
    245           unsigned long elNum,
    246           unsigned long &blockIdxNum,
    247           unsigned long &blockStartElNum);
     245          mg_u_long entriesPerBlock,
     246          mg_u_long elNum,
     247          mg_u_long &blockIdxNum,
     248          mg_u_long &blockStartElNum);
    248249bool SearchEl (const block_idx &bIdx,
    249            unsigned long entriesPerBlock,
     250           mg_u_long entriesPerBlock,
    250251           const UCArray &el,
    251            unsigned long &blockIdxNum,
    252            unsigned long &blockStartElNum);
     252           mg_u_long &blockIdxNum,
     253           mg_u_long &blockStartElNum);
    253254
    254255
    … …  
    258259bool SearchBlockDictElNum (FILE *dictFile,
    259260               const block_idx &bIdx,
    260                unsigned long entriesPerBlock,
    261                unsigned long dictSize,
    262                unsigned long elNum,
     261               mg_u_long entriesPerBlock,
     262               mg_u_long dictSize,
     263               mg_u_long elNum,
    263264               block_dict_el &dictEl);
    264265bool SearchBlockDictEl (FILE *dictFile,
    265266            const block_idx &bIdx,
    266             unsigned long entriesPerBlock,
    267             unsigned long dictSize,
     267            mg_u_long entriesPerBlock,
     268            mg_u_long dictSize,
    268269            const UCArray &el,
    269270            block_dict_el &dictEl,
    270             unsigned long &elNum);
     271            mg_u_long &elNum);
    271272
    272273// assumes the numLevels has been set for dictEl
    273274bool SearchWordBlockDictElNum (FILE *dictFile,
    274275                   const block_idx &bIdx,
    275                    unsigned long entriesPerBlock,
    276                    unsigned long dictSize,
    277                    unsigned long numLevels,
    278                    unsigned long elNum,
     276                   mg_u_long entriesPerBlock,
     277                   mg_u_long dictSize,
     278                   mg_u_long numLevels,
     279                   mg_u_long elNum,
    279280                   word_block_dict_el &dictEl);
    280281bool SearchWordBlockDictEl (FILE *dictFile,
    281282                const block_idx &bIdx,
    282                 unsigned long entriesPerBlock,
    283                 unsigned long dictSize,
    284                 unsigned long numLevels,
     283                mg_u_long entriesPerBlock,
     284                mg_u_long dictSize,
     285                mg_u_long numLevels,
    285286                const UCArray &el,
    286287                word_block_dict_el &dictEl,
    287                 unsigned long &elNum);
     288                mg_u_long &elNum);
    288289
    289290bool SearchStemBlockDictElNum (FILE *dictFile,
    290291                   const block_idx &bIdx,
    291                    unsigned long entriesPerBlock,
    292                    unsigned long dictSize,
    293                    unsigned long elNum,
     292                   mg_u_long entriesPerBlock,
     293                   mg_u_long dictSize,
     294                   mg_u_long elNum,
    294295                   stem_block_dict_el &dictEl);
    295296bool SearchStemBlockDictEl (FILE *dictFile,
    296297                const block_idx &bIdx,
    297                 unsigned long entriesPerBlock,
    298                 unsigned long dictSize,
     298                mg_u_long entriesPerBlock,
     299                mg_u_long dictSize,
    299300                const UCArray &el,
    300301                stem_block_dict_el &dictEl,
    301                 unsigned long &elNum);
     302                mg_u_long &elNum);
    302303
    303304//-----------------------------------------------------
    … …  
    307308bool PartialMatchSearchWordBlockDictEl (FILE *dictFile,
    308309                 const block_idx &bIdx,
    309                  unsigned long entriesPerBlock,
    310                  unsigned long dictSize,
    311                  unsigned long numLevels,
     310                 mg_u_long entriesPerBlock,
     311                 mg_u_long dictSize,
     312                 mg_u_long numLevels,
    312313                 const UCArray &el,
    313314                 word_block_dict_el &dictEl,
    314                  vector<unsigned long> &elNumList,
     315                 vector<mg_u_long> &elNumList,
    315316                 bool casefold);
    316317//----------------------------------------------------------
    … …  
    320321bool NearestSearchWordBlockDictEl (FILE *dictFile,
    321322                const block_idx &bIdx,
    322                 unsigned long entriesPerBlock,
    323                 unsigned long dictSize,
    324                 unsigned long numLevels,
     323                mg_u_long entriesPerBlock,
     324                mg_u_long dictSize,
     325                mg_u_long numLevels,
    325326                const UCArray &el,
    326327                word_block_dict_el &dictEl,
    327                 unsigned long &elNum);
     328                mg_u_long &elNum);
    328329
    329330// returns a list of word_block_dict_el, with no levelfreqs
    330331bool SearchWordBlockDictElNumRange (FILE *dictFile,
    331332                    const block_idx &bIdx,
    332                     unsigned long entriesPerBlock,
    333                     unsigned long dictSize,
    334                     unsigned long numLevels,
    335                     unsigned long elNum,
    336                     unsigned long 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,
    337338                    word_block_dict_el_array &terms);
    338339                   
    … …  
    340341bool SearchWordBlockDictElNumRange (FILE *dictFile,
    341342                    const block_idx &bIdx,
    342                     unsigned long entriesPerBlock,
    343                     unsigned long dictSize,
    344                     unsigned long numLevels,
    345                     unsigned long elNum,
    346                     unsigned long 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,
    347348                    UCArrayVector &terms);
    348349                   

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/ivf.pass1.cpp

    r16583 r25147  
    5151// structure to determine level information
    5252struct LevelWorker {
    53   unsigned long lastLevelDocNum;
    54   unsigned long count;
     53  mg_u_long lastLevelDocNum;
     54  mg_u_long count;
    5555
    5656  LevelWorker () {
    … …  
    6262// note: the word is stored in the map
    6363struct IvfWordInfo {
    64   unsigned long wordCount;      // word frequency
    65   unsigned long fragCount;      // number of fragments that contain the word
    66   unsigned long lastFragNum;    // last fragment to contain the word
    67   unsigned long chunkWordCount; // word frequency within this chunk
    68   unsigned long chunkFragCount; // number of fragments within this chunk that
     64  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
    6969                                //   contain the word
    7070
    … …  
    8181// tags don't require as much information
    8282struct IvfTagInfo {
    83   unsigned long tagCount;       // tag frequency
    84   unsigned long fragCount;      // number of fragments that contain the tag
    85   unsigned long lastFragNum;    // last fragment to contain the tag
    86   unsigned long chunkFragCount; // number of fragments within this chunk that
     83  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
    8787                                //   contain the tag
    8888
    … …  
    109109IvfTagInfoItArray ivfTagInfoOccurOrder;
    110110
    111 static unsigned long chunksWritten;
    112 static unsigned long maxMemNeeded;
    113 
    114 static unsigned long numDocs;
    115 static unsigned long numChunkDocs;
    116 
    117 static unsigned long numFrags;
    118 static unsigned long numChunkFrags;
    119 
    120 static unsigned long numWords;
     111static mg_u_long chunksWritten;
     112static mg_u_long maxMemNeeded;
     113
     114static mg_u_long numDocs;
     115static mg_u_long numChunkDocs;
     116
     117static mg_u_long numFrags;
     118static mg_u_long numChunkFrags;
     119
     120static mg_u_long numWords;
    121121
    122122// the number of document numbers in the inverted file
    123 static unsigned long numChunkEntries;
     123static mg_u_long numChunkEntries;
    124124
    125125// next entry in the inverted file to check memory
    126126// requirements for the current chunk
    127 static unsigned long entryCheckPoint;
     127static mg_u_long entryCheckPoint;
    128128
    129129// information about all the different levels
    … …  
    173173              MAGIC_CHUNK, MG_MESSAGE)))
    174174    return COMPERROR;
    175   fwrite ("    ", sizeof (u_long), 1, ic);  // Space for the maxmem
     175  fwrite ("    ", sizeof (mg_u_long), 1, ic);   // Space for the maxmem
    176176  icb.attachFile (ic);
    177177  icb.encodeStart();
    … …  
    195195
    196196  numChunkEntries = 0;
    197   entryCheckPoint = (unsigned long) ((invf_buffer_size * INIT_CHECK_FRAC) / CHECK_DIV);
     197  entryCheckPoint = (mg_u_long) ((invf_buffer_size * INIT_CHECK_FRAC) / CHECK_DIV);
    198198
    199199  // init the level information
    … …  
    347347
    348348
    349 static unsigned long MemoryRequired (bool wordLevelIndex) {
    350   register unsigned long total = 0;
     349static mg_u_long MemoryRequired (bool wordLevelIndex) {
     350  register mg_u_long total = 0;
    351351
    352352  // add memory required for word entries
    … …  
    372372    if (info.chunkFragCount > 0) {
    373373      // two d entries for each frag entry
    374       unsigned long pTag = info.chunkFragCount*2;
     374      mg_u_long pTag = info.chunkFragCount*2;
    375375      total += BIO_Bblock_Bound (numChunkFrags+pTag, pTag);
    376376    }
    … …  
    385385
    386386/*
    387 static void PrintChunkInfo (unsigned long mem) {
     387static void PrintChunkInfo (mg_u_long mem) {
    388388  cout << "Chunk Number: " << chunksWritten << "\n";
    389389  cout << "numChunkDocs " << numChunkDocs << "\n";
    … …  
    396396  IvfTagInfoMap::iterator tagMapHere = ivfTagInfo.begin();
    397397  IvfTagInfoMap::iterator tagMapEnd = ivfTagInfo.end();
    398   unsigned long tagNum = 0;
     398  mg_u_long tagNum = 0;
    399399  while (tagMapHere != tagMapEnd) {
    400400    cout << (*tagMapHere).first << " " << tagNum
    … …  
    406406*/
    407407
    408 static void OutputChunkInfo (unsigned long mem, bool /*wordLevelIndex*/) {
     408static void OutputChunkInfo (mg_u_long mem, bool /*wordLevelIndex*/) {
    409409  ++chunksWritten;
    410410
    … …  
    493493  // check the amount of memory needed for this chunk
    494494  if (numChunkEntries >= entryCheckPoint) {
    495     unsigned long mem = MemoryRequired (wordLevelIndex);
     495    mg_u_long mem = MemoryRequired (wordLevelIndex);
    496496    if (mem >= invf_buffer_size * CHECK_CLOSE) {
    497497      if (mem > maxMemNeeded) maxMemNeeded = mem;
    498498      OutputChunkInfo (mem, wordLevelIndex);
    499       entryCheckPoint = (unsigned long)
     499      entryCheckPoint = (mg_u_long)
    500500    ((invf_buffer_size * INIT_CHECK_FRAC) / CHECK_DIV);
    501501     
    502502    } else {
    503       entryCheckPoint = (unsigned long)
     503      entryCheckPoint = (mg_u_long)
    504504    (entryCheckPoint * ((CHECK_FRAC * (invf_buffer_size - mem)) / mem) +
    505505     entryCheckPoint);
    … …  
    513513
    514514
    515 static void CalcInvfDictSize (unsigned long &totalBytes,
    516                   unsigned long &indexStringBytes) {
     515static void CalcInvfDictSize (mg_u_long &totalBytes,
     516                  mg_u_long &indexStringBytes) {
    517517  totalBytes = 0;   // The sum of the length of all words, including
    518518            // the length byte
    … …  
    526526  IvfWordInfoMap::iterator wordEnd = ivfWordInfo.end();
    527527  while (wordHere != wordEnd) {
    528     unsigned long wordSize = (*wordHere).first.size();
     528    mg_u_long wordSize = (*wordHere).first.size();
    529529    totalBytes += wordSize + 1;
    530530    indexStringBytes += wordSize + 2;
    … …  
    541541  IvfTagInfoMap::iterator tagEnd = ivfTagInfo.end();
    542542  while (tagHere != tagEnd) {
    543     unsigned long tagSize = (*tagHere).first.size();
     543    mg_u_long tagSize = (*tagHere).first.size();
    544544    totalBytes += tagSize + 1;
    545545    indexStringBytes += tagSize + 2;
    … …  
    642642
    643643  // write out the updated header
    644   fseek (sp, sizeof (u_long), SEEK_SET);
     644  fseek (sp, sizeof (mg_u_long), SEEK_SET);
    645645  if (!idh.Write (sp)) { fclose (sp); return; }
    646646 
    … …  
    691691
    692692  // write out the word translation table
    693   unsigned long wordDictSize = ivfWordInfoOccurOrder.size();
     693  mg_u_long wordDictSize = ivfWordInfoOccurOrder.size();
    694694  IvfWordInfoItArray::iterator wordItHere = ivfWordInfoOccurOrder.begin();
    695695  IvfWordInfoItArray::iterator wordItEnd = ivfWordInfoOccurOrder.end();
    696   unsigned long oN = 0;
     696  mg_u_long oN = 0;
    697697  while (wordItHere != wordItEnd) {
    698698    register IvfWordInfo &ivfWordInfo = (*(*wordItHere)).second;
    … …  
    703703
    704704  // write out the tag translation table
    705   unsigned long tagDictSize = ivfTagInfoOccurOrder.size();
     705  mg_u_long tagDictSize = ivfTagInfoOccurOrder.size();
    706706  IvfTagInfoItArray::iterator tagItHere = ivfTagInfoOccurOrder.begin();
    707707  IvfTagInfoItArray::iterator tagItEnd = ivfTagInfoOccurOrder.end();
    … …  
    737737
    738738  char *temp_str = msg_prefix;
    739   msg_prefix = "ivf.pass1";
     739  msg_prefix = (char*)"ivf.pass1";
    740740
    741741  // output the last chunk
    742742  if (numChunkDocs > 0) {
    743     unsigned long mem = MemoryRequired (wordLevelIndex);
     743    mg_u_long mem = MemoryRequired (wordLevelIndex);
    744744    OutputChunkInfo (mem, wordLevelIndex);
    745745    if (mem > maxMemNeeded) maxMemNeeded = mem;
    … …  
    751751
    752752  // write out the maximum memory required and close the file
    753   fseek (ic, sizeof (long), 0);
     753  fseek (ic, sizeof (mg_u_long), 0);
    754754  WriteUL (ic, maxMemNeeded);
    755755  fclose (ic);

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/ivf.pass2.cpp

    r19822 r25147  
    7979
    8080
    81 static unsigned long numDocs = 0;
    82 static unsigned long numChunkDocs = 0;
    83 static unsigned long numDocsInChunk = 0;
    84 
    85 static unsigned long numFrags = 0;
    86 static unsigned long numFragsInChunk = 0;
    87 static unsigned long chunkStartFragNum = 0;
     81static mg_u_long numDocs = 0;
     82static mg_u_long numChunkDocs = 0;
     83static mg_u_long numDocsInChunk = 0;
     84
     85static mg_u_long numFrags = 0;
     86static mg_u_long numFragsInChunk = 0;
     87static mg_u_long chunkStartFragNum = 0;
    8888
    8989
    … …  
    9191
    9292struct BitPtr {
    93   unsigned long start;
    94   unsigned long here;
    95   unsigned long lastFragNum;
    96   unsigned long lgB;
     93  mg_u_long start;
     94  mg_u_long here;
     95  mg_u_long lastFragNum;
     96  mg_u_long lgB;
    9797 
    9898  void Clear () { start = here = lastFragNum = lgB = 0; }
    … …  
    102102class WordBitPtrs {
    103103protected:
    104   unsigned long numWords;
    105   unsigned long numTags;
    106   unsigned long size;
     104  mg_u_long numWords;
     105  mg_u_long numTags;
     106  mg_u_long size;
    107107  BitPtr *wordBitPtrs;
    108108
    109   void CheckBufOverrun (unsigned long num) {
     109  void CheckBufOverrun (mg_u_long num) {
    110110    if (wordBitPtrs[num].here > wordBitPtrs[num+1].start) {
    111111      cerr << "numDocs: " << numDocs << "\n";
    … …  
    127127  WordBitPtrs () { wordBitPtrs = NULL; Clear(); }
    128128  ~WordBitPtrs ();
    129   void SetSize (unsigned long _numWords,
    130         unsigned long _numTags);
     129  void SetSize (mg_u_long _numWords,
     130        mg_u_long _numTags);
    131131
    132132  void ResetPtrs () {
    133133    if (wordBitPtrs == NULL) return;
    134     unsigned long i;
     134    mg_u_long i;
    135135    for (i=0; i<size; ++i) wordBitPtrs[i].Clear();
    136136  }
    137137 
    138   BitPtr &GetWordBitPtr (unsigned long wordNum)
     138  BitPtr &GetWordBitPtr (mg_u_long wordNum)
    139139    { return wordBitPtrs[wordNum]; }
    140   unsigned long &GetWordStart (unsigned long wordNum)
     140  mg_u_long &GetWordStart (mg_u_long wordNum)
    141141    { return wordBitPtrs[wordNum].start; }
    142   unsigned long &GetWordHere (unsigned long wordNum)
     142  mg_u_long &GetWordHere (mg_u_long wordNum)
    143143    { return wordBitPtrs[wordNum].here; }
    144   void CheckWordBufOverrun (unsigned long wordNum)
     144  void CheckWordBufOverrun (mg_u_long wordNum)
    145145    { CheckBufOverrun (wordNum); }
    146146
    147   BitPtr &GetTagBitPtr (unsigned long tagNum)
     147  BitPtr &GetTagBitPtr (mg_u_long tagNum)
    148148    { return wordBitPtrs[tagNum + numWords]; }
    149   unsigned long &GetTagStart (unsigned long tagNum)
     149  mg_u_long &GetTagStart (mg_u_long tagNum)
    150150    { return wordBitPtrs[tagNum + numWords].start; }
    151   unsigned long &GetTagHere (unsigned long tagNum)
     151  mg_u_long &GetTagHere (mg_u_long tagNum)
    152152    { return wordBitPtrs[tagNum + numWords].here; }
    153   void CheckTagBufOverrun (unsigned long tagNum)
     153  void CheckTagBufOverrun (mg_u_long tagNum)
    154154    { CheckBufOverrun (tagNum + numWords); }
    155155
    156156  BitPtr &GetEndBitPtr ()
    157157    { return wordBitPtrs[size-1]; }
    158   unsigned long &GetEndStart ()
     158  mg_u_long &GetEndStart ()
    159159    { return wordBitPtrs[size-1].start; }
    160   unsigned long &GetEndHere ()
     160  mg_u_long &GetEndHere ()
    161161    { return wordBitPtrs[size-1].here; }
    162162};
    … …  
    165165struct IP2TagInfo {
    166166  bool inTag;
    167   unsigned long startFrag;
    168   unsigned long tagNum;
     167  mg_u_long startFrag;
     168  mg_u_long tagNum;
    169169
    170170  IP2TagInfo () {
    … …  
    183183class OccurToDictConverter {
    184184protected:
    185   unsigned long pos;
    186   unsigned long val;
     185  mg_u_long pos;
     186  mg_u_long val;
    187187  FILE *transFile;
    188188  random_bitio_buffer rbs;
    189189
    190   unsigned long wordDictSize;
    191   unsigned long tagDictSize;
     190  mg_u_long wordDictSize;
     191  mg_u_long tagDictSize;
    192192
    193193  void SeekStart ();
    194   unsigned long TranslateNum (unsigned long num);
     194  mg_u_long TranslateNum (mg_u_long num);
    195195 
    196196public:
    … …  
    198198  ~OccurToDictConverter ();
    199199
    200   void Open (char *filename, unsigned long _wordDictSize,
    201          unsigned long _tagDictSize);
     200  void Open (char *filename, mg_u_long _wordDictSize,
     201         mg_u_long _tagDictSize);
    202202
    203203  // Close frees all allocated memory
    204204  void Close ();
    205205
    206   unsigned long TranslateWord (unsigned long occurNum)
     206  mg_u_long TranslateWord (mg_u_long occurNum)
    207207    { return TranslateNum (occurNum); }
    208   unsigned long TranslateTag (unsigned long occurNum)
     208  mg_u_long TranslateTag (mg_u_long occurNum)
    209209    { return TranslateNum (occurNum+wordDictSize); }
    210210};
    … …  
    214214  mg_ullong start;
    215215  mg_ullong here;
    216   unsigned long lastFragNum;
    217   unsigned long B;
     216  mg_u_long lastFragNum;
     217  mg_u_long B;
    218218
    219219  void Clear () {
    … …  
    230230protected:
    231231  InvfStateRec recCache [ISR_SIZE];
    232   unsigned long startNum;
     232  mg_u_long startNum;
    233233
    234234  FILE *stateFile;
    … …  
    248248  // previous references to state records may be
    249249  // invalidated calling GetRec
    250   InvfStateRec &GetRec (unsigned long num);
     250  InvfStateRec &GetRec (mg_u_long num);
    251251};
    252252
    … …  
    258258static stdio_bitio_buffer chunkBuf;
    259259
    260 static unsigned long ivfMemBufSize = 0;
     260static mg_u_long ivfMemBufSize = 0;
    261261static char *ivfMemBuf = NULL;
    262262
    … …  
    290290}
    291291
    292 void WordBitPtrs::SetSize (unsigned long _numWords,
    293                unsigned long _numTags){
     292void WordBitPtrs::SetSize (mg_u_long _numWords,
     293               mg_u_long _numTags){
    294294  Clear();
    295295  numWords = _numWords;
    … …  
    302302void OccurToDictConverter::SeekStart () {
    303303  if (transFile == NULL) return;
    304   rbs.SEEK_X (sizeof (unsigned long) * 8);
     304  rbs.SEEK_X (sizeof (mg_u_long) * 8);
    305305  pos = 0;
    306306}
    307307
    308 unsigned long OccurToDictConverter::TranslateNum (unsigned long num) {
     308mg_u_long OccurToDictConverter::TranslateNum (mg_u_long num) {
    309309  if (num < pos) SeekStart ();
    310310  while (pos <= num) {
    … …  
    330330}
    331331
    332 void OccurToDictConverter::Open (char *filename, unsigned long _wordDictSize,
    333                  unsigned long _tagDictSize) {
     332void OccurToDictConverter::Open (char *filename, mg_u_long _wordDictSize,
     333                 mg_u_long _tagDictSize) {
    334334  if (transFile != NULL) Close ();
    335335
    … …  
    374374  // open the state file
    375375  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 ());
    378378  if (!(stateFile = fopen (path, "wb+"))) {
    379379    Message ("Unable to create \"%s\"", path);
    … …  
    393393}
    394394
    395 InvfStateRec &InvfStateCache::GetRec (unsigned long num) {
     395InvfStateRec &InvfStateCache::GetRec (mg_u_long num) {
    396396  // see if cached
    397397  if ((num >= startNum) && (num < startNum + ISR_SIZE))
    … …  
    406406  startNum = num - (num % ISR_SIZE);
    407407  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  }
    409414
    410415  return recCache[num-startNum];
    … …  
    413418
    414419
    415 static void ClearCharBuf (char *buf, unsigned long size) {
     420static void ClearCharBuf (char *buf, mg_u_long size) {
    416421  char *end = buf + size;
    417422  while (buf != end) *buf++ = 0;
    … …  
    436441  fseek (dictFile, _idh.tag_dict_start, SEEK_SET);
    437442 
    438   unsigned long tagNum;
     443  mg_u_long tagNum;
    439444  dict_el thisEl;
    440445  for (tagNum = 0; tagNum < _idh.tag_dict_size; ++tagNum) {
    … …  
    456461void CheckIntOverflow (mg_ullong totalIBits, mg_ullong lastTotalIBits) {
    457462  if (totalIBits < lastTotalIBits) {
    458     fprintf(stderr, "ERROR: The totalIBits counter (%d byte 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));
    459464    if (sizeof (mg_ullong) < 8) {
    460465      fprintf(stderr, "       Try compiling with GCC to enable use of 8 bytes for this counter.\n");
    … …  
    481486  word_dict_el wordEl;
    482487  wordEl.SetNumLevels (_idh.num_levels);
    483   unsigned long dictWordNum, p;
     488  mg_u_long dictWordNum, p;
    484489  mg_ullong lastTotalIBits;
    485   unsigned long N = _idh.num_frags;
     490  mg_u_long N = _idh.num_frags;
    486491  for (dictWordNum=0; dictWordNum<_idh.word_dict_size; ++dictWordNum) {
    487492    // lastTotalIBits is used to detect integer overflow
    … …  
    521526  // add the tag entries
    522527  dict_el tagEl;
    523   unsigned long dictTagNum;
     528  mg_u_long dictTagNum;
    524529  N = _idh.num_frags;
    525530  for (dictTagNum=0; dictTagNum<_idh.tag_dict_size; ++dictTagNum) {
    … …  
    556561/*
    557562// assumes the chunk tag information has been placed in .first
    558 static void PrintChunkInfo (unsigned long chunkMem,
    559                 unsigned long numChunkWords,
    560                 unsigned long numChunkTags) {
    561   static unsigned long chunksRead = 0;
     563static void PrintChunkInfo (mg_u_long chunkMem,
     564                mg_u_long numChunkWords,
     565                mg_u_long numChunkTags) {
     566  static mg_u_long chunksRead = 0;
    562567  ++chunksRead;
    563568  cout << "Chunk Number: " << chunksRead << "\n";
    … …  
    571576  TagMapDict::iterator tagMapEnd = tagMapDict.end();
    572577  while (tagMapHere != tagMapEnd) {
    573     unsigned long tagMapNum = (*tagMapHere).second.tagNum;
     578    mg_u_long tagMapNum = (*tagMapHere).second.tagNum;
    574579    cout << (*tagMapHere).first << " " << tagMapNum << " "
    575580     << bitPtrs.GetTagBitPtr(tagMapNum).here << "\n";
    … …  
    590595
    591596  numFragsInChunk = chunkBuf.gamma_decode (NULL) - 1;
    592   unsigned long chunkMem = chunkBuf.gamma_decode (NULL) - 1;
     597  mg_u_long chunkMem = chunkBuf.gamma_decode (NULL) - 1;
    593598
    594599  if (chunkMem > ivfMemBufSize)
    595600    FatalError (1, "Chunk memory size is greater than maximum");
    596601 
    597   unsigned long numChunkWords = chunkBuf.gamma_decode (NULL) - 1;
    598   unsigned long 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;
    599604
    600605 
    … …  
    606611  // "chunkWordCount" in "start" and the "chunkFragCount"
    607612  // in "here"
    608   unsigned long numOccur;
    609   unsigned long wordNum;
     613  mg_u_long numOccur;
     614  mg_u_long wordNum;
    610615  for (numOccur=0; numOccur<numChunkWords; ++numOccur) {
    611616    wordNum = occurConvert.TranslateWord (numOccur);
    … …  
    616621    else wordPtr.here = wordPtr.start;
    617622  }
    618   unsigned long tagNum;
     623  mg_u_long tagNum;
    619624  for (numOccur=0; numOccur<numChunkTags; ++numOccur) {
    620625    tagNum = occurConvert.TranslateTag (numOccur);
    … …  
    628633 
    629634  // create the bit ptrs in dictionary order
    630   unsigned long totalIBits = 0; // only dealing with memory
    631   unsigned long chunkWordCount, chunkFragCount;
     635  mg_u_long totalIBits = 0; // only dealing with memory
     636  mg_u_long chunkWordCount, chunkFragCount;
    632637  for (wordNum=0; wordNum<_idh.word_dict_size; ++wordNum) {
    633638    BitPtr &wordPtr = bitPtrs.GetWordBitPtr (wordNum);
    … …  
    656661    tagPtr.lgB = 0;
    657662    if (chunkFragCount > 0) {
    658       unsigned long pTag = chunkFragCount*2;
     663      mg_u_long pTag = chunkFragCount*2;
    659664      tagPtr.lgB = floorlog_2 (BIO_Bblock_Init_W (numFragsInChunk+pTag,
    660665                          pTag));
    661       unsigned long bLen = BIO_Bblock_Bound (numFragsInChunk+pTag,
     666      mg_u_long bLen = BIO_Bblock_Bound (numFragsInChunk+pTag,
    662667                         pTag);
    663668//        cout << tagNum + _idh.word_dict_size << " ";
    … …  
    732737  FILE *invfFile = create_file (filename, INVF_SUFFIX, "wb",
    733738                MAGIC_INVF, MG_ABORT);
    734   totalIBits += sizeof (unsigned long) * 8; // magic number
     739  totalIBits += sizeof (mg_u_long) * 8; // magic number
    735740  totalIBits += 8 * 200;                    // 200 byte gap -- why??????
    736741  fclose (invfFile);
    … …  
    748753    // add this tag to the inverted list
    749754  BitPtr &tagBitPtr = bitPtrs.GetTagBitPtr (tInfo.tagNum);
    750   unsigned long endFrag = numFrags;
     755  mg_u_long endFrag = numFrags;
    751756  int b = 1 << tagBitPtr.lgB;
    752757
    … …  
    822827      if (wordLevelIndex) ++numFrags;
    823828
    824       unsigned long wordNum = perf_hash (wordHashDict, mgWord);
     829      mg_u_long wordNum = perf_hash (wordHashDict, mgWord);
    825830
    826831      /*
    … …  
    832837      // add this word to the inverted list
    833838      BitPtr &wordBitPtr = bitPtrs.GetWordBitPtr (wordNum);
    834       unsigned long fragNum = numFrags;
     839      mg_u_long fragNum = numFrags;
    835840      int b = 1 << wordBitPtr.lgB;
    836841 
    … …  
    881886
    882887  // write out the word information
    883   unsigned long wordNum;
     888  mg_u_long wordNum;
    884889  int b;
    885   unsigned long currFragNum;
    886   unsigned long delta;
    887   unsigned long currFreq;
     890  mg_u_long currFragNum;
     891  mg_u_long delta;
     892  mg_u_long currFreq;
    888893  for (wordNum=0; wordNum<idh.word_dict_size; ++wordNum) {
    889894    // go to the end of the last inverted file entry
    … …  
    916921
    917922  // write out the tag information
    918   unsigned long tagNum;
    919   unsigned long currTagStart;
    920   unsigned long currTagEnd;
     923  mg_u_long tagNum;
     924  mg_u_long currTagStart;
     925  mg_u_long currTagEnd;
    921926  for (tagNum=0; tagNum<idh.tag_dict_size; ++tagNum) {
    922927    // go to the end of the last inverted file entry
    … …  
    9981003
    9991004
    1000 static void CondenseInvfFile (char *filename, unsigned long &bytesOutput) {
     1005static void CondenseInvfFile (char *filename, mg_u_long &bytesOutput) {
    10011006  FILE *inInvfFile = open_file (filename, INVF_SUFFIX, "rb",
    10021007                MAGIC_INVF, MG_ABORT);
    … …  
    10051010
    10061011  // skip the magic number
    1007   fseek (outInvfFile, sizeof (unsigned long), SEEK_SET);
     1012  fseek (outInvfFile, sizeof (mg_u_long), SEEK_SET);
    10081013 
    10091014  // write the inverted file header -- use defaults for most things
    … …  
    10171022
    10181023  // process each meaningful byte in the file
    1019   unsigned long numEntries = ifh.no_of_words + ifh.no_of_tags;
    1020   unsigned long entryNum;
     1024  mg_u_long numEntries = ifh.no_of_words + ifh.no_of_tags;
     1025  mg_u_long entryNum;
    10211026  mg_ullong lastStart = 0;
    10221027  for (entryNum = 0; entryNum < numEntries; ++entryNum) {
    … …  
    10281033    lastStart = stateRec.start;
    10291034   
    1030     unsigned long oldEntryStart = stateRec.start >> 3;
    1031     unsigned long oldEntryStartOver = stateRec.start & 7; // should be 0
    1032     unsigned long oldEntryEnd = (stateRec.here + 7) >> 3;  // byte after end
    1033     unsigned long 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;
    10341039
    10351040    fseek (inInvfFile, oldEntryStart, SEEK_SET);
    … …  
    10571062    Message ("Could not truncate invf.");
    10581063#else
    1059   ftruncate (fileno (outInvfFile), bytesOutput);
     1064  if(ftruncate (fileno (outInvfFile), bytesOutput) != 0)
     1065    {
     1066      fprintf(stderr, "Could not truncate invf");
     1067    }
    10601068#endif
    10611069
    … …  
    10631071}
    10641072
    1065 static void OutputInvfIdx (char *filename, unsigned long invfNumBytes) {
     1073static void OutputInvfIdx (char *filename, mg_u_long invfNumBytes) {
    10661074  FILE *invfIdxFile = create_file (filename, INVF_IDX_SUFFIX, "wb",
    10671075                   MAGIC_INVI, MG_ABORT);
    10681076
    10691077  // process each meaningful byte in the file
    1070   unsigned long numEntries = idh.word_dict_size + idh.tag_dict_size;
    1071   unsigned long entryNum;
     1078  mg_u_long numEntries = idh.word_dict_size + idh.tag_dict_size;
     1079  mg_u_long entryNum;
    10721080  for (entryNum = 0; entryNum < numEntries; ++entryNum) {
    10731081    InvfStateRec &stateRec = invfState.GetRec (entryNum);
    … …  
    11011109  // condense the inverted file and truncate it
    11021110  // this function also writes out the inverted header
    1103   unsigned long invfNumBytes = 0;
     1111  mg_u_long invfNumBytes = 0;
    11041112  CondenseInvfFile (filename, invfNumBytes);
    11051113

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/locallib.cpp

    r16583 r25147  
    7575
    7676int
    77 huffcodebits (unsigned long *A, int n)
     77huffcodebits (mg_u_long *A, int n)
    7878{
    7979  int i, j, tot = 0, bits = 0, v1, v2, *B;
    … …  
    111111
    112112int
    113 modelbits (unsigned long *A, int n)
     113modelbits (mg_u_long *A, int n)
    114114{
    115115  int i, bits = 0, last, N = 0;
    … …  
    159159
    160160
    161 int Read_cdh (FILE * f, compression_dict_header * cdh, u_long * /*mem*/,
    162           u_long * disk) {
     161int Read_cdh (FILE * f, compression_dict_header * cdh, mg_u_long * /*mem*/,
     162          mg_u_long * disk) {
    163163  if (disk)
    164164    (*disk) += sizeof (*cdh);
    … …  
    185185
    186186int
    187 Read_cfh (FILE * f, comp_frags_header * cfh, u_long * mem, u_long * disk)
     187Read_cfh (FILE * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk)
    188188{
    189189  int i;  /* [RPAP - Jan 97: Endian Ordering] */

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/locallib.h

    r16583 r25147  
    3131int vecentropy (int *A, int n);
    3232
    33 int huffcodebits (unsigned long *A, int n);
     33int huffcodebits (mg_u_long *A, int n);
    3434
    35 int modelbits (unsigned long *A, int n);
     35int modelbits (mg_u_long *A, int n);
    3636
    3737int prime (int p);
    3838
    3939
    40 int Read_cdh (FILE * f, compression_dict_header * cdh, u_long * mem, u_long * disk);
     40int Read_cdh (FILE * f, compression_dict_header * cdh, mg_u_long * mem, mg_u_long * disk);
    4141
    42 int Read_cfh (FILE * f, comp_frags_header * cfh, u_long * mem, u_long * disk);
     42int Read_cfh (FILE * f, comp_frags_header * cfh, mg_u_long * mem, mg_u_long * disk);
    4343
    4444

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/mg_errors.cpp

    r19822 r25147  
    3333char *mg_errorstrs[] =
    3434{
    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"};
    4242
    4343

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/mg_files.cpp

    r22291 r25147  
    125125FILE *
    126126open_named_file (const char *name, const char *mode,
    127          u_long magic_num, int err_mode)
    128 {
    129   unsigned long magic;
     127         mg_u_long magic_num, int err_mode)
     128{
     129  mg_u_long magic;
    130130  FILE *f = NULL;
    131131  char *err;
    … …  
    134134  if (!f)
    135135    {
    136       err = "Unable to open \"%s\"";
     136      err = (char*)"Unable to open \"%s\"";
    137137      goto error;
    138138    }
    … …  
    142142      if (fread (&magic, sizeof (magic), 1, f) != 1)
    143143    {
    144       err = "No magic number \"%s\"";
     144      err = (char*)"No magic number \"%s\"";
    145145      goto error;
    146146    }
    … …  
    150150      if (!IS_MAGIC (magic))
    151151    {
    152       err = "No MG magic number \"%s\"";
     152      err = (char*)"No MG magic number \"%s\"";
    153153      goto error;
    154154    }
    … …  
    156156      if (magic != magic_num)
    157157    {
    158       err = "Wrong MG magic number \"%s\"";
     158      err = (char*)"Wrong MG magic number \"%s\"";
    159159      goto error;
    160160    }
    … …  
    187187FILE *
    188188open_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)
    190190{
    191191  char path[512];
    … …  
    215215FILE *
    216216create_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)
    218218{
    219219  FILE *f = NULL;
    … …  
    223223  if (!f)
    224224    {
    225       err = "Unable to open \"%s\"";
     225      err = (char*)"Unable to open \"%s\"";
    226226      goto error;
    227227    }
    … …  
    231231    if (fwrite (&magic_num, sizeof (magic_num), 1, f) != 1)
    232232      {
    233     err = "Couldn't write magic number \"%s\"";
     233    err = (char*)"Couldn't write magic number \"%s\"";
    234234    goto error;
    235235      }
    … …  
    267267FILE *
    268268create_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)
    270270{
    271271  char path[512];

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/mg_files.h

    r16583 r25147  
    2727/* Magic numbers for the different types of files */
    2828
    29 #define GEN_MAGIC(a,b,c,d) ((unsigned long)(((a)<<24) + ((b)<<16) + \
     29#define GEN_MAGIC(a,b,c,d) ((mg_u_long)(((a)<<24) + ((b)<<16) + \
    3030                        ((c)<<8) + (d)))
    3131
    … …  
    5151#define MAGIC_PARAGRAPH     GEN_MAGIC('M','G','P', 0 )
    5252#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)
    5454
    5555
    … …  
    268268   an error message.   */
    269269FILE *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);
    271271
    272272
    … …  
    286286   an error message.   */
    287287FILE *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);
    289289
    290290
    … …  
    305305   an error message.   */
    306306FILE *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);
    308308
    309309
    … …  
    322322   an error message.   */
    323323FILE *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  
    5353#include "WordData.h"
    5454
    55 #define MAXBITS (sizeof(unsigned long) * 8)
     55#define MAXBITS (sizeof(mg_u_long) * 8)
    5656
    5757#define is_power_of_two(a) ((a) != 0 && (((a) & ((a)-1)) == 0))
    … …  
    6363    float saving;
    6464    float char_bit_cost;
    65     u_long num_trans;
     65    mg_u_long num_trans;
    6666    u_char *word;
    6767  }
    … …  
    6969
    7070static DictWordData *Words[2];
    71 static u_long Num[2];
    72 static u_long chars[2];
     71static mg_u_long Num[2];
     72static mg_u_long chars[2];
    7373
    7474#define KIND(p) (((p) >= Words[0] && (p) < Words[0] + Num[0]) ? 0 : 1)
    … …  
    8080  {
    8181    DictWordData **wd;
    82     u_long num_wds;
    83     u_long chars;
     82    mg_u_long num_wds;
     83    mg_u_long chars;
    8484  }
    8585DictData;
    … …  
    9090static compression_stats_header csh;
    9191
    92 static char *file_name = "";
    93 static u_long novel_method = MG_NOVEL_HUFFMAN_CHARS;
     92static char *file_name = (char*)"";
     93static mg_u_long novel_method = MG_NOVEL_HUFFMAN_CHARS;
    9494
    9595
    … …  
    9898static void Method3 (int k);
    9999static void Select_all (void);
    100 static u_long WriteOutWords (char *, u_long, int);
     100static mg_u_long WriteOutWords (char *, mg_u_long, int);
    101101static int DecFreqIncWL (void *a, void *b);
    102102static int OccuranceOrder (void *a, void *b);
    … …  
    111111  int lookback = 2;
    112112  double k = 0;
    113   u_long mem_reqd;
     113  mg_u_long mem_reqd;
    114114  opterr = 0;
    115115  msg_prefix = argv[0];
    … …  
    224224{
    225225  FILE *f;
    226   unsigned long i;
     226  mg_u_long i;
    227227  f = open_file (filename, TEXT_STATS_DICT_SUFFIX, "rb",
    228228         MAGIC_STATS_DICT, MG_ABORT);  /* [RPAP - Feb 97: WIN32 Port] */
    … …  
    429429CalcCharCounts (DictWordData ** wd, int num,
    430430        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];
    435435  huff_data hd;
    436436  int i;
    … …  
    441441  for (i = 0; i < num; ++i, ++wd)
    442442    {
    443       u_long freq = (*wd)->documents();
     443      mg_u_long freq = (*wd)->documents();
    444444      u_char *buf = (*wd)->word;
    445445      int len = *buf++;
    … …  
    448448      escape[idx] += freq;
    449449      for (; len; --len, ++buf)
    450     char_freqs[idx][(u_long) (*buf)] += freq;
     450    char_freqs[idx][(mg_u_long) (*buf)] += freq;
    451451    }
    452452  Generate_Huffman_Data (256, char_freqs[0], &hd, NULL);
    … …  
    466466
    467467inline 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],
    469469                   char * char_lens[2], char *len_lens[2],
    470470                   double esc[2], int num_trans)
    … …  
    477477      u_char *buf = (*word)->word;
    478478      int     len = *buf++;
    479       u_long  freq = (*word)->documents();
     479      mg_u_long  freq = (*word)->documents();
    480480      int     idx = KIND (*word);
    481481
    482482      cbc = len_lens[idx][len];
    483483      for (; len; --len, ++buf)
    484     cbc += char_lens[idx][(u_long) (*buf)];
     484    cbc += char_lens[idx][(mg_u_long) (*buf)];
    485485
    486486      (*word)->char_bit_cost = (cbc + esc[idx]) * freq;
    … …  
    500500CalcBitCost (DictWordData ** discard_word, int discard_num,
    501501         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)
    503503{
    504504  char *char_lens[2];
    … …  
    544544
    545545inline 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)
    547547{
    548548  DictWordData *word = wordHeap[0];
    … …  
    573573  int recalcs = 0;
    574574  double freqs_trans[2], total;
    575   u_long escape[2];
     575  mg_u_long escape[2];
    576576  DictWordData **keep_heap, **discard_heap;
    577577
    … …  
    769769
    770770
    771 static u_long
     771static mg_u_long
    772772Write_data (FILE * f, DictData * dd, int lookback)
    773773{
    774   u_long mem_reqd;
     774  mg_u_long mem_reqd;
    775775  huff_data *hd;
    776776  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];
    781781  u_char *lastword[MAX_HUFFCODE_LEN + 1];
    782782
    783   if (!(freqs = new long [dd->num_wds]))
     783  if (!(freqs = new mg_s_long [dd->num_wds]))
    784784    FatalError (1, "Unable to allocate memory for freqs");
    785785
    … …  
    871871{
    872872  unsigned int j;
    873   long freqs[256];
     873  mg_s_long freqs[256];
    874874  DictWordData **wd = dd->wd;
    875875  huff_data *hd;
    … …  
    882882      int len = *buf++;
    883883      for (; len; --len, ++buf)
    884     freqs[(u_long) (*buf)] += (*wd)->documents();
     884    freqs[(mg_u_long) (*buf)] += (*wd)->documents();
    885885    }
    886886
    … …  
    907907{
    908908  unsigned int j;
    909   long freqs[16];
     909  mg_s_long freqs[16];
    910910  DictWordData **wd = dd->wd;
    911911  huff_data *hd;
    … …  
    934934
    935935
    936 static u_long
    937 WriteOutWords (char *file_name, u_long type, int lookback)
     936static mg_u_long
     937WriteOutWords (char *file_name, mg_u_long type, int lookback)
    938938{
    939939  FILE *f;
    940940  int i;
    941   u_long mem_reqd = 0;
     941  mg_u_long mem_reqd = 0;
    942942
    943943  compression_dict_header cdh;

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_decompress_text.cpp

    r19822 r25147  
    3939int main (int argc, char **argv) {
    4040  int ch;
    41   char *filename = "";
    42   char *basePath = "";
     41  char *filename = (char*)"";
     42  char *basePath = (char*)"";
    4343  UCArray level;
    4444  SetCStr (level, "Document", 8);
    … …  
    7878 
    7979  TextLevelInfo levelInfo = td.levels.levelInfo[level];
    80   unsigned long docNum = 1;
     80  mg_u_long docNum = 1;
    8181  UCArray docText;
    8282  while (docNum <= levelInfo.numEntries) {

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_fast_comp_dict.cpp

    r19822 r25147  
    6767
    6868
    69 static u_long mem_for_comp_dict (char *filename);
     69static mg_u_long mem_for_comp_dict (char *filename);
    7070static void load_comp_dict (char *filename);
    7171static void save_fast_dict (char *filename);
    … …  
    7676static void *cur;
    7777static u_char *fixup;
    78 static u_long mem, fixup_mem;
     78static mg_u_long mem, fixup_mem;
    7979
    8080int main (int argc, char **argv)
    8181{
    8282  int ch;
    83   char *filename = "";
     83  char *filename = (char*)"";
    8484  opterr = 0;
    8585  msg_prefix = argv[0];
    … …  
    120120#endif
    121121
    122   if ((u_long) cur > (u_long) buffer + mem)
     122  if ((uintptr_t) cur > (uintptr_t) buffer + mem)
    123123    FatalError (1, "The buffer was not big enough for the dictionary");
    124124
    … …  
    186186unfixup_buffer ()
    187187{
    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)
    190190    {
    191191      if (IS_FIXUP (p))
    192     *p = *p - (u_long) buffer;
    193     }
    194 }
    195 
    196 
    197 
    198 
    199 static u_long
     192    *p = *p - (uintptr_t) buffer;
     193    }
     194}
     195
     196
     197
     198
     199static mg_u_long
    200200mem_for_aux_dict (compression_dict_header * /*cdh*/, char *filename)
    201201{
    202202  int i;
    203   u_long mem = sizeof (auxiliary_dict);
     203  mg_u_long mem = sizeof (auxiliary_dict);
    204204  FILE *aux;
    205205
    … …  
    224224
    225225
    226 static u_long
     226static mg_u_long
    227227mem_for_words (FILE * dict, compression_dict_header * cdh,
    228228           comp_frags_header * cfh)
    229229{
    230   u_long mem = 0;
    231   long i, lookback;
     230  mg_u_long mem = 0;
     231  mg_s_long i, lookback;
    232232  int ptrs_reqd = 0;
    233233  int mem_reqd = 0;
    … …  
    254254}
    255255
    256 static u_long mem_skip_hd(FILE *dict, u_long mem)
     256static mg_u_long mem_skip_hd(FILE *dict, mg_u_long mem)
    257257{ huff_data hd;
    258258
    … …  
    261261  if (hd.clens)
    262262    delete []hd.clens;
    263   mem += hd.num_codes * sizeof (unsigned long);
    264   mem += (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *);
     263  mem += hd.num_codes * sizeof (mg_u_long);
     264  mem += (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *);
    265265  return mem;
    266266}
    267267
    268 static u_long mem_read_cfh(FILE *dict, compression_dict_header *cdh, comp_frags_header *cfh,
    269                u_long mem)
     268static mg_u_long mem_read_cfh(FILE *dict, compression_dict_header *cdh, comp_frags_header *cfh,
     269               mg_u_long mem)
    270270{
    271271  mem += sizeof (comp_frags_header);
    … …  
    282282
    283283
    284 static u_long
     284static mg_u_long
    285285mem_for_comp_dict (char *filename)
    286286{
    287   u_long mem = sizeof (compression_dict);
     287  mg_u_long mem = sizeof (compression_dict);
    288288  compression_dict_header cdh;
    289289  comp_frags_header cfh;
    … …  
    360360
    361361void *
    362 getmem (u_long size, int align)
     362getmem (mg_u_long size, int align)
    363363{
    364364  void *res;
    365   cur = (void *) (((u_long) cur + (align - 1)) & (~(align - 1)));
     365  cur = (void *) (((uintptr_t) cur + (align - 1)) & (~(align - 1)));
    366366  res = cur;
    367367  cur = (char *) cur + size;
    368   if ((u_long) cur > (u_long)buffer + mem)
     368  if ((uintptr_t) cur > (uintptr_t)buffer + mem)
    369369    FatalError (1, "The buffer was not big enough for the dictionary");
    370370  return res;
    … …  
    538538
    539539
    540 static unsigned long **
    541 Generate_Fast_Huffman_Vals (huff_data * data, u_long * mem)
     540static mg_u_long **
     541Generate_Fast_Huffman_Vals (huff_data * data, mg_u_long * mem)
    542542{
    543543  int i;
    544   unsigned long *fcode[MAX_HUFFCODE_LEN + 1];
    545   unsigned long **values;
    546   unsigned long *vals;
     544  mg_u_long *fcode[MAX_HUFFCODE_LEN + 1];
     545  mg_u_long **values;
     546  mg_u_long *vals;
    547547
    548548  if (!data)
    549549    return (NULL);
    550   vals = (unsigned long *) getmem (data->num_codes * sizeof (*vals), sizeof (long *));
    551   values = (unsigned long **) getmem ((MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *),
    552            sizeof (long *));
    553 
    554   memset (values, '\0', (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *));
     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 *));
    555555
    556556  if (mem)
    557557    *mem += data->num_codes * sizeof (*vals) +
    558       (MAX_HUFFCODE_LEN + 1) * sizeof (unsigned long *);
     558      (MAX_HUFFCODE_LEN + 1) * sizeof (mg_u_long *);
    559559
    560560  fcode[0] = values[0] = &vals[0];
    … …  
    576576{
    577577  huff_data *hd;
    578   u_long   **vals;
     578  mg_u_long   **vals;
    579579
    580580  hd = (huff_data *) getmem (sizeof (huff_data), sizeof (char *));
    … …  
    683683
    684684  {
    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)
    687687      {
    688688    if (IS_FIXUP (p))

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_invf_dict.cpp

    r19822 r25147  
    4141#include "invf.h"
    4242
    43 static void process_files (char *filename, unsigned long entriesPerBlock) {
     43static void process_files (char *filename, mg_u_long entriesPerBlock) {
    4444  // open the dictionary
    4545  FILE *dictFile = open_file (filename, INVF_DICT_SUFFIX, "rb",
    … …  
    8383 
    8484 
    85   unsigned long wordNum;
    86   unsigned long wordInvfPtr;
     85  mg_u_long wordNum;
     86  mg_u_long wordInvfPtr;
    8787  UCArray lastEl;
    8888  word_dict_el wordEl;
    … …  
    102102      // see if this block is the longest so far
    103103      if (wordIdx.size() > 0) {
    104     unsigned long blockLen = elIdx.block_ptr -
     104    mg_u_long blockLen = elIdx.block_ptr -
    105105      (*(wordIdx.end()-1)).block_ptr;
    106106    if (blockLen > bdh.max_wblk_size) bdh.max_wblk_size = blockLen;
    … …  
    116116    wordBlockEl.freq = wordEl.freq;
    117117    wordBlockEl.invf_ptr = wordInvfPtr;
    118     unsigned long tempI;
     118    mg_u_long tempI;
    119119    for (tempI=0; tempI<idh.num_levels; ++tempI)
    120120      wordBlockEl.levelFreqs[tempI] = wordEl.levelFreqs[tempI];
    … …  
    138138  block_dict_el tagBlockEl;
    139139 
    140   unsigned long tagNum;
    141   unsigned long tagInvfPtr;
     140  mg_u_long tagNum;
     141  mg_u_long tagInvfPtr;
    142142  dict_el tagEl;
    143143  lastEl.erase (lastEl.begin(), lastEl.end());
    … …  
    156156      // see if this block is the longest so far
    157157      if (tagIdx.size() > 0) {
    158     unsigned long blockLen = elIdx.block_ptr -
     158    mg_u_long blockLen = elIdx.block_ptr -
    159159      (*(tagIdx.end()-1)).block_ptr;
    160160    if (blockLen > bdh.max_tblk_size) bdh.max_tblk_size = blockLen;
    … …  
    188188
    189189  // write out the blocked dictionary header
    190   fseek (blockDictFile, sizeof(unsigned long), SEEK_SET);
     190  fseek (blockDictFile, sizeof(mg_u_long), SEEK_SET);
    191191  bdh.Write (blockDictFile);
    192192
    … …  
    208208
    209209int main (int argc, char **argv) {
    210   unsigned long entriesPerBlock = 16;
    211   char *filename = "";
     210  mg_u_long entriesPerBlock = 16;
     211  char *filename = (char*)"";
    212212  int ch;
    213213  msg_prefix = argv[0];

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_invf_dict_dump.cpp

    r19822 r25147  
    7272    fseek (dictFile, idh.word_dict_start, SEEK_SET);
    7373   
    74     unsigned long wordNum;
     74    mg_u_long wordNum;
    7575    word_dict_el wordEl;
    7676    wordEl.SetNumLevels (idh.num_levels);
    … …  
    8787    fseek (dictFile, idh.tag_dict_start, SEEK_SET);
    8888   
    89     unsigned long tagNum;
     89    mg_u_long tagNum;
    9090    dict_el tagEl;
    9191    for (tagNum=0; tagNum<idh.tag_dict_size; ++tagNum) {
    … …  
    103103
    104104int main (int argc, char **argv) {
    105   char *filename = "";
     105  char *filename = (char*)"";
    106106  int ch;
    107107  msg_prefix = argv[0];

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_invf_dump.cpp

    r19822 r25147  
    5252               invf_file_header &ifh,
    5353               word_dict_el &wordEl,
    54                unsigned long wordStart,
     54               mg_u_long wordStart,
    5555               bool printFrags) {
    5656  cout << wordEl.frag_occur << " \"" << wordEl.el << "\"\n";
    … …  
    6262    stdio_bitio_buffer buffer(invfFile);
    6363   
    64     unsigned long B = BIO_Bblock_Init (idh.num_frags, wordEl.frag_occur);
    65     unsigned long fragNum = 0;
    66     unsigned long 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;
    6767    for (i=0; i<wordEl.frag_occur; ++i) {
    68       unsigned long delta = buffer.bblock_decode (B, NULL);
     68      mg_u_long delta = buffer.bblock_decode (B, NULL);
    6969      fragNum += delta;
    7070      cout << " " << fragNum;
    7171     
    7272      if (!ifh.word_level_index ) {
    73     unsigned long count = buffer.gamma_decode (NULL);
     73    mg_u_long count = buffer.gamma_decode (NULL);
    7474    cout << "(" << count << ")";
    7575      } else {
    … …  
    8888              invf_file_header &/*ifh*/,
    8989              dict_el &tagEl,
    90               unsigned long tagStart,
     90              mg_u_long tagStart,
    9191              bool printFrags) {
    9292  cout << tagEl.frag_occur << " \"<" << tagEl.el << ">\"\n";
    … …  
    9898    stdio_bitio_buffer buffer(invfFile);
    9999   
    100     unsigned long pTag = tagEl.frag_occur*2;
    101     unsigned long B = BIO_Bblock_Init (idh.num_frags+pTag, pTag);
    102     unsigned long fragNum = 0;
    103     unsigned long 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;
    104104    for (i=0; i<tagEl.frag_occur; ++i) {
    105       unsigned long delta = buffer.bblock_decode (B, NULL)-1;
     105      mg_u_long delta = buffer.bblock_decode (B, NULL)-1;
    106106      fragNum += delta;
    107107      cout << " " << fragNum;
    … …  
    169169  // process all the words
    170170  if (printWords) {
    171     unsigned long wordNum;
    172     unsigned long wordStart;
     171    mg_u_long wordNum;
     172    mg_u_long wordStart;
    173173    word_dict_el wordEl;
    174174    wordEl.SetNumLevels (idh.num_levels);
    … …  
    182182  // process all the tags
    183183  if (printTags) {
    184     unsigned long tagNum;
    185     unsigned long tagStart;
     184    mg_u_long tagNum;
     185    mg_u_long tagStart;
    186186    dict_el tagEl;
    187187    for (tagNum=0; tagNum<idh.tag_dict_size; ++tagNum) {
    … …  
    199199
    200200int main (int argc, char **argv) {
    201   char *dir_name, *filename = "";
     201  char *dir_name, *filename = (char*)"";
    202202  int ch;
    203203  msg_prefix = argv[0];

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_passes.cpp

    r19822 r25147  
    7474
    7575
    76 unsigned long invf_buffer_size = 5 * 1024 * 1024;   /* 5Mb */
     76mg_u_long invf_buffer_size = 5 * 1024 * 1024;   /* 5Mb */
    7777
    7878static char Passes = 0;
    … …  
    9090
    9191static 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},
    9797};
    9898
    99 static char *usage_str = "\nUSAGE:\n"
     99static char *usage_str = (char*)"\nUSAGE:\n"
    100100"  %s [-J doc-tag] [-K level-tag] [-L index-level]\n"
    101101"  %*s [-m invf-memory] [-T1] [-T2] [-I1] [-I2] [-S]\n"
    … …  
    131131  int pass;
    132132
    133   unsigned long numBytes = 0;
    134   unsigned long numDocs = 0;
     133  mg_u_long numBytes = 0;
     134  mg_u_long numDocs = 0;
    135135
    136136  // initialise all the passes
    … …  
    146146  FileBuf buf;
    147147  TextElArray doc;
    148   unsigned long docLen = 0;
     148  mg_u_long docLen = 0;
    149149
    150150  // read and process each file (start with an open file)
    … …  
    222222    Passes |= IVF_PASS_2;
    223223      else
    224     Usage ("Invalid pass number");
     224    Usage ((char*)"Invalid pass number");
    225225      break;
    226226    case 'T':
    … …  
    230230    Passes |= TEXT_PASS_2;
    231231      else
    232     Usage ("Invalid pass number");
     232    Usage ((char*)"Invalid pass number");
    233233      break;
    234234    case 'S':

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_passes_4jni.cpp

    r19822 r25147  
    7676
    7777
    78 unsigned long invf_buffer_size = 5 * 1024 * 1024;   /* 5Mb */
     78mg_u_long invf_buffer_size = 5 * 1024 * 1024;   /* 5Mb */
    7979
    8080static char Passes = 0;
    … …  
    8585char *filename = NULL;
    8686
    87 unsigned long numBytes = 0;
    88 unsigned long numDocs = 0;
     87mg_u_long numBytes = 0;
     88mg_u_long numDocs = 0;
    8989int mgpp_passes_exit_value = 0;
    9090
    … …  
    9898
    9999static 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},
    105105};
    106106
    … …  
    223223 
    224224  TextElArray doc;
    225   unsigned long doc_len =  0;
     225  mg_u_long doc_len =  0;
    226226
    227227  while(ReadDoc(&buffer, tagInfo.docTag, doc, doc_len, false)) {
    … …  
    266266  int pass;
    267267
    268   unsigned long numBytes = 0;
    269   unsigned long numDocs = 0;
     268  mg_u_long numBytes = 0;
     269  mg_u_long numDocs = 0;
    270270
    271271  // initialise all the passes
    … …  
    281281  FileBuf buf;
    282282  TextElArray doc;
    283   unsigned long docLen = 0;
     283  mg_u_long docLen = 0;
    284284
    285285  // 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  
    5353static void ProcessFiles (char *filename, int r) {
    5454  FILE *dictFile, *hashFile;
    55   unsigned long i;
     55  mg_u_long i;
    5656  invf_dict_header idh;
    5757  perf_hash_data *phd;
    5858  u_char *pool;
    59   unsigned long pool_left;
     59  mg_u_long pool_left;
    6060  u_char **starts;
    6161
    … …  
    8686
    8787    // push string onto pool data
    88     register unsigned long l;
     88    register mg_u_long l;
    8989    l = wordEl.el.size() + 1;
    9090    if (pool_left < l) {
    … …  
    119119int main (int argc, char **argv) {
    120120  int r = -1;
    121   char *filename = "";
     121  char *filename = (char*)"";
    122122  int ch;
    123123  msg_prefix = argv[0];

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_stem_idx.cpp

    r19822 r25147  
    5050#endif
    5151
    52 typedef vector<unsigned long> WordNumList;
     52typedef vector<mg_u_long> WordNumList;
    5353typedef map<UCArray, WordNumList, DictLTUCArray> StemMapDict;
    5454
    … …  
    6767  fseek (dictFile, idh.word_dict_start, SEEK_SET);
    6868
    69   unsigned long wordNum;
     69  mg_u_long wordNum;
    7070  u_char mgWord[MAXSTEMLEN + 1];
    7171  word_dict_el wordEl;
    … …  
    101101            int stemMethod,
    102102            int stemmerNum,
    103             unsigned long entriesPerBlock) {
     103            mg_u_long entriesPerBlock) {
    104104 
    105105  /* [JFG - Mar 06: Accent folding patch] */
    … …  
    130130
    131131  block_idx stemIdx;
    132   unsigned long stemNum = 0;
     132  mg_u_long stemNum = 0;
    133133  stem_block_dict_el stemEl;
    134134  UCArray lastEl;
    … …  
    146146      // see if this block is the longest so far
    147147      if (stemIdx.size() > 0) {
    148     unsigned long blockLen = elIdx.block_ptr -
     148    mg_u_long blockLen = elIdx.block_ptr -
    149149      (*(stemIdx.end()-1)).block_ptr;
    150150    if (blockLen > sih.max_block_size) sih.max_block_size = blockLen;
    … …  
    172172 
    173173  // write out the stem dictionary header
    174   fseek (stemDictFile, sizeof(unsigned long), SEEK_SET);
     174  fseek (stemDictFile, sizeof(mg_u_long), SEEK_SET);
    175175  sih.Write (stemDictFile);
    176176
    … …  
    189189
    190190int main (int argc, char **argv) {
    191   unsigned long entriesPerBlock = 16;
    192   char *filename = "";
     191  mg_u_long entriesPerBlock = 16;
     192  char *filename = (char*)"";
    193193  int ch;
    194194  int stemMethod = 0; // illegal value (no translation)

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/mgpp_weights_build.cpp

    r19822 r25147  
    5252#endif
    5353
    54 #define MAXBITS (sizeof(unsigned long) * 8)
     54#define MAXBITS (sizeof(mg_u_long) * 8)
    5555
    5656struct WBTagPtr {
    57   unsigned long tagNum;
    58   unsigned long tagPtr;
    59   unsigned long fragOccur;
     57  mg_u_long tagNum;
     58  mg_u_long tagPtr;
     59  mg_u_long fragOccur;
    6060 
    6161  WBTagPtr () {
    … …  
    8080  // seek to the start of the tag information
    8181  fseek (dictFile, idh.tag_dict_start, SEEK_SET);
    82   fseek (invfIdxFile, sizeof(unsigned long) +
    83      idh.word_dict_size*sizeof(unsigned long), SEEK_SET);
    84  
    85   unsigned long tagNum;
    86   unsigned long 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;
    8787  dict_el thisEl;
    8888  for (tagNum = 0; tagNum < idh.tag_dict_size; ++tagNum) {
    … …  
    9696
    9797static void AddWeight (Weights &w,
    98                unsigned long levelDocNum,
    99                unsigned long termFreq,
     98               mg_u_long levelDocNum,
     99               mg_u_long termFreq,
    100100               float idf) {
    101101  double weight = termFreq * idf;
    … …  
    105105static void GenerateLevelWeights (const invf_dict_header &idh,
    106106                  const invf_file_header &ifh,
    107                   unsigned long numLevelDocs,
    108                   unsigned long levelNum,
     107                  mg_u_long numLevelDocs,
     108                  mg_u_long levelNum,
    109109                  FILE *dictFile,
    110110                  FILE *invfFile,
    … …  
    120120  // reset the files
    121121  fseek (dictFile, idh.word_dict_start, SEEK_SET);
    122   fseek (invfIdxFile, sizeof (unsigned long), SEEK_SET);
     122  fseek (invfIdxFile, sizeof (mg_u_long), SEEK_SET);
    123123 
    124124  // process each word adding its contributions to the document weights
    125   unsigned long wordNum;
    126   unsigned long wordStart;
     125  mg_u_long wordNum;
     126  mg_u_long wordStart;
    127127  word_dict_el wordEl;
    128128  wordEl.SetNumLevels (idh.num_levels);
    … …  
    142142    stdio_bitio_buffer buffer (invfFile);
    143143   
    144     unsigned long B = BIO_Bblock_Init (idh.num_frags, wordEl.frag_occur);
    145     unsigned long fragNum = 0;
    146     unsigned long levelDocNum = 0;
    147     unsigned long lastLevelDocNum = 0;
    148     unsigned long termFreq = 0;
    149     unsigned long checkLevelFreq = 0;
    150    
    151     unsigned long 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;
    152152    for (i=0; i<wordEl.frag_occur; ++i) {
    153153      fragNum += buffer.bblock_decode (B, NULL);
    … …  
    201201
    202202static void WriteExactWeights (FILE *weightsFile,
    203                    unsigned long &diskPtr,
     203                   mg_u_long &diskPtr,
    204204                   const Weights &w) {
    205205  diskPtr = ftell(weightsFile);
    … …  
    215215
    216216static void WriteApproxWeights (FILE *approxWeightsFile,
    217                 unsigned long &diskPtr,
     217                mg_u_long &diskPtr,
    218218                const Weights &w,
    219219                unsigned char bits) {
    … …  
    246246 
    247247
    248   unsigned long max = (bits == 32) ? 0xffffffff : (1 << bits) - 1;;
    249   unsigned long 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;
    250250  here = w.begin();
    251251  end = w.end();
    252252  while (here != end) {
    253     unsigned long fx;
     253    mg_u_long fx;
    254254    wgt = sqrt (*here);
    255255    if (wgt == 0) {
    … …  
    259259#endif
    260260    }
    261     fx = (unsigned long) floor (log (wgt / L) / log (B));
     261    fx = (mg_u_long) floor (log (wgt / L) / log (B));
    262262
    263263    if (fx > max) fx = max;
    … …  
    281281int main (int argc, char **argv) {
    282282  unsigned char bits = 8;
    283   char *filename = "";
     283  char *filename = (char*)"";
    284284  int ch;
    285285  opterr = 0;
    … …  
    354354  IvfLevelInfoMap::iterator levelHere = ivfLevel.levelInfo.begin();
    355355  IvfLevelInfoMap::iterator levelEnd = ivfLevel.levelInfo.end();
    356   unsigned long levelNum = 0;
     356  mg_u_long levelNum = 0;
    357357  while (levelHere != levelEnd) {
    358358    const UCArray &levelName = (*levelHere).first;

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/text.h

    r16583 r25147  
    109109
    110110struct 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;
    117117};
    118118
    … …  
    120120struct comp_frags_header {
    121121  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];
    124124};
    125125
    … …  
    130130
    131131struct compressed_text_header {
    132   u_long num_of_docs;
    133   u_long num_of_words; // number of words in collection
     132  mg_u_long num_of_docs;
     133  mg_u_long num_of_words; // number of words in collection
    134134  double num_of_bytes;
    135135
    … …  
    145145
    146146struct compression_stats_header {
    147   u_long num_docs;
    148   u_long dummy;     // alignment
     147  mg_u_long num_docs;
     148  mg_u_long dummy;     // alignment
    149149  double num_bytes;
    150150};
    … …  
    152152
    153153struct 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;
    156156};
    157157
    158158
    159159struct 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;
    162162};
    163163
    … …  
    180180  compression_dict_header cdh;
    181181  comp_frags_header *cfh[2];
    182   unsigned long MemForCompDict;
     182  mg_u_long MemForCompDict;
    183183  u_char ***values[2];
    184184  u_char *escape[2];
    185185  huff_data *chars_huff[2];
    186   u_long **chars_vals[2];
     186  mg_u_long **chars_vals[2];
    187187  huff_data *lens_huff[2];
    188   u_long **lens_vals[2];
     188  mg_u_long **lens_vals[2];
    189189  auxiliary_dict *ad;
    190190  int fast_loaded;

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/text.pass1.cpp

    r16583 r25147  
    5454typedef struct hash_rec
    5555  {
    56     unsigned long wcnt;     /* word frequency */
    57     unsigned long occurance_num;
     56    mg_u_long wcnt;     /* word frequency */
     57    mg_u_long occurance_num;
    5858    u_char *word;
    5959  }
    … …  
    6363  {
    6464    hash_rec *HashTable;
    65     unsigned long HashSize;
    66     unsigned long HashUsed;
    67     unsigned long wordnum;
    68     unsigned long words_read;
    69     unsigned long 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;
    7070    huff_data hd;
    7171  }
    … …  
    7474
    7575
    76 static unsigned long longestDoc = 0;
    77 static unsigned long occurance_num = 0;
     76static mg_u_long longestDoc = 0;
     77static mg_u_long occurance_num = 0;
    7878static dict_data DictData[2];
    7979
    … …  
    8181static int PoolLeft;
    8282static double inputbytes = 0; /* [RJM 07/97: 4G limit] */
    83 static unsigned long MaxMemInUse = 0;
    84 static unsigned long MemInUse = 0;
     83static mg_u_long MaxMemInUse = 0;
     84static mg_u_long MemInUse = 0;
    8585static compression_stats_header csh = {0, 0, 0.0}; /* [RJM 07/97: 4G limit] */
    8686
    … …  
    126126      register u_char *wptr;
    127127      register int hsize = dd->HashSize;
    128       register unsigned long hashval, step;
     128      register mg_u_long hashval, step;
    129129     
    130130      HASH (hashval, step, word, hsize);
    … …  
    132132      while (wptr) {
    133133    hashval += step;
    134     if (hashval >= (unsigned long)hsize)
     134    if (hashval >= (mg_u_long)hsize)
    135135      hashval -= hsize;
    136136    wptr = (dd->HashTable + hashval)->word;
    … …  
    171171    /* Search the hash table for Word */
    172172    {
    173       register unsigned long hashval, step;
     173      register mg_u_long hashval, step;
    174174      register int hsize = dd->HashSize;
    175175      HASH (hashval, step, Word, hsize);
    … …  
    210210    if (len) {
    211211      hashval = (hashval + step);
    212       if (hashval >= (unsigned long)hsize) hashval -= hsize;
     212      if (hashval >= (mg_u_long)hsize) hashval -= hsize;
    213213    } else {
    214214      ++ent->wcnt;
    … …  
    221221    if (dd->HashUsed >= dd->HashSize >> 1) {
    222222      hash_rec *ht;
    223       unsigned long size;
    224       unsigned long i;
     223      mg_u_long size;
     224      mg_u_long i;
    225225      size = prime (dd->HashSize * 2);
    226226      if (!(ht = (hash_rec *) Xmalloc (sizeof (hash_rec) * size))) {
    … …  
    234234    if (dd->HashTable[i].word) {
    235235      register u_char *wptr;
    236       register unsigned long hashval, step;
     236      register mg_u_long hashval, step;
    237237     
    238238      wptr = dd->HashTable[i].word;
    … …  
    258258
    259259int process_text_1 (const TagInfo &/*tagInfo*/, const TextElArray &doc) {
    260   unsigned long textLen = 0;
    261   unsigned long docLen = 0;
     260  mg_u_long textLen = 0;
     261  mg_u_long docLen = 0;
    262262  int retValue;
    263263
    … …  
    312312static void WriteHashTable (FILE * fp, dict_data * dd) {
    313313  frags_stats_header fsh;
    314   u_long j = 0;
     314  mg_u_long j = 0;
    315315  u_char *curr;
    316316
    … …  
    369369
    370370  temp_str = msg_prefix;
    371   msg_prefix = "text.pass1";
     371  msg_prefix = (char*)"text.pass1";
    372372 
    373373  /* [RPAP - Jan 97: Endian Ordering] */

  • main/trunk/greenstone2/common-src/indexers/mgpp/text/text.pass2.cpp

    r16583 r25147  
    5757struct char_pool {
    5858  struct char_pool *next;
    59   u_long left;
     59  mg_u_long left;
    6060  u_char *ptr;
    6161  u_char pool[POOL_SIZE];
    … …  
    6363
    6464struct novel_hash_rec {
    65   u_long ordinal_num;
     65  mg_u_long ordinal_num;
    6666  u_char *word;
    6767};
    … …  
    7272struct novel_hash_table {
    7373  novel_hash_rec *HashTable;
    74   u_long HashSize, HashUsed;
     74  mg_u_long HashSize, HashUsed;
    7575  char_pool *first_pool;
    7676  char_pool *pool;
    77   u_long next_num, binary_start;
     77  mg_u_long next_num, binary_start;
    7878  novel_hash_rec **code_to_nhr;
    7979};
    … …  
    8282static FILE *text;
    8383static stdio_bitio_buffer textOutBuf;
    84 static u_long headLen;
     84static mg_u_long headLen;
    8585
    8686static novel_hash_table nht[2];
    … …  
    128128  // the length of the compressed header is the size of the
    129129  // 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);
    131131
    132132  // start off with non-word
    … …  
    173173static int compress_text (bitio_buffer &buffer, const u_char *s_in,
    174174              int l_in, unsigned char &which,
    175               unsigned long &numWords) {
     175              mg_u_long &numWords) {
    176176  const u_char *end = s_in + l_in - 1;
    177177
    … …  
    188188    /* Search the hash table for Word */
    189189    if (ht[which]) {
    190       register unsigned long hashval, step;
     190      register mg_u_long hashval, step;
    191191      register int tsize = ht[which]->size;
    192192      register u_char **wptr;
    … …  
    211211    if (len) {
    212212      hashval += step;
    213       if (hashval >= (unsigned long)tsize) hashval -= tsize;
     213      if (hashval >= (mg_u_long)tsize) hashval -= tsize;
    214214     
    215215    } else {
    … …  
    231231    if (cdh.dict_type == MG_PARTIAL_DICTIONARY)
    232232      {
    233         u_long i;
     233        mg_u_long i;
    234234        if (ht[which])
    235235          {
    … …  
    253253          case MG_NOVEL_HUFFMAN_CHARS:
    254254        {
    255           u_long i;
     255          mg_u_long i;
    256256          buffer.huff_encode (Word[0], lens_codes[which],
    257257                      lens_huff[which].clens, NULL);
    … …  
    264264          case MG_NOVEL_HYBRID:
    265265        {
    266           register unsigned long hashval, step;
     266          register mg_u_long hashval, step;
    267267          register novel_hash_table *h = &nht[which];
    268268          register int hsize = h->HashSize;
    … …  
    325325            {
    326326              novel_hash_rec *ht;
    327               unsigned long size;
    328               unsigned long i;
     327              mg_u_long size;
     328              mg_u_long i;
    329329              size = prime (h->HashSize * 2);
    330330              if (!(ht = (novel_hash_rec *) Xmalloc (sizeof (novel_hash_rec) * size)))
    … …  
    339339              {
    340340                register u_char *wptr;
    341                 register unsigned long hashval, step;
     341                register mg_u_long hashval, step;
    342342               
    343343                wptr = h->HashTable[i].word;
    … …  
    375375  // we need to remember where the last text element ends
    376376  unsigned char endBit = textOutBuf.GetBtg (); // 8=high bit, 1=low bit
    377   unsigned long endPos = textOutBuf.GetBytesWritten () + headLen;
     377  mg_u_long endPos = textOutBuf.GetBytesWritten () + headLen;
    378378
    379379  // process each text element
    … …  
    384384    unsigned char startWhich = whichWordType;
    385385    unsigned char startBit = textOutBuf.GetBtg (); // 8=high bit, 1=low bit
    386     unsigned long startPos = textOutBuf.GetBytesWritten () + headLen;
     386    mg_u_long startPos = textOutBuf.GetBytesWritten () + headLen;
    387387
    388388    // compress the text
    … …  
    464464static void estimate_compressed_aux_dict (void) {
    465465  int i;
    466   u_long aux_compressed = 0, total_uncomp = 0;
     466  mg_u_long aux_compressed = 0, total_uncomp = 0;
    467467  for (i = 0; i <= 1; ++i)
    468468    {
    469469      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];
    472472      char_pool *cp;
    473473      memset (chars, '\0', sizeof (chars));
    … …  
    496496      flens[j] = lens[j];
    497497     
    498       aux_compressed += (long unsigned int) ((Calculate_Huffman_Size (16, flens, lens) +
     498      aux_compressed += (mg_u_long) ((Calculate_Huffman_Size (16, flens, lens) +
    499499                          Calculate_Huffman_Size (256, fchars, chars)) / 8);
    500500     
    … …  
    560560
    561561  // 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))
    563563    return COMPERROR;
    564564  fclose (text);
Note: See TracChangeset for help on using the changeset viewer.