Changeset 7101 for trunk/gsdl


Ignore:
Timestamp:
2004-03-22T13:27:17+12:00 (20 years ago)
Author:
kjdon
Message:

removed the old commented out print usage stuff, added gli arg if it didn't have it, if gli arg is set, output strings in utf-8

Location:
trunk/gsdl/bin/script
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/bin/script/buildcol.pl

    r6945 r7101  
    156156    return &gsprintf::gsprintf(@_);
    157157}
    158 
    159 
    160 #  sub print_usage {
    161 #      print STDOUT "\n";
    162 #      print STDOUT "buildcol.pl: Builds the indexes of a Greenstone collection.\n\n";
    163 #      print STDOUT "  usage: $0 [options] collection-name\n\n";
    164 #      print STDOUT "  options:\n";
    165 #      print STDOUT "   -verbosity number     0=none, 3=lots\n";
    166 #      print STDOUT "   -archivedir directory Where the archives live\n";
    167 #      print STDOUT "   -builddir directory   Where to put the built indexes\n";
    168 #      print STDOUT "   -maxdocs number       Maximum number of documents to build\n";
    169 #      print STDOUT "   -debug                Print output to STDOUT\n";
    170 #      print STDOUT "   -mode all|compress_text|build_index|infodb\n";
    171 #      print STDOUT "   -index indexname      Index to build (will build all in\n";
    172 #      print STDOUT "                         config file if not set)\n";
    173 #      print STDOUT "   -keepold              will not destroy the current contents of the\n";
    174 #      print STDOUT "                         building directory\n";
    175 #      print STDOUT "   -no_text              Don't store compressed text. This option is\n";
    176 #      print STDOUT "                         useful for minimizing the size of the built\n";
    177 #      print STDOUT "                         indexes if you intend always to display the\n";
    178 #      print STDOUT "                         original documents at run time (i.e. you won't\n";
    179 #      print STDOUT "                         be able to retrieve the compressed text version)\n";
    180 #      print STDOUT "   -allclassifications   Don't remove empty classifications\n";
    181 #      print STDOUT "   -create_images        Attempt to create default images for new\n";
    182 #      print STDOUT "                         collection. This relies on the Gimp being\n";
    183 #      print STDOUT "                         installed along with relevant perl modules\n";
    184 #      print STDOUT "                         to allow scripting from perl\n";
    185 #      print STDOUT "   -collectdir directory Collection directory (defaults to " .
    186 #   &util::filename_cat ($ENV{'GSDLHOME'}, "collect") . ")\n";
    187 #      print STDOUT "   -out                  Filename or handle to print output status to.\n";
    188 #      print STDOUT "                         The default is STDERR\n";
    189 #      print STDOUT "   -no_strip_html        Do not strip the html tags from the indexed text\n";
    190 #      print STDOUT "                         (only used for mgpp collections).\n\n";
    191 #      print STDOUT "   -faillog name         Fail log filename. This log receives the filenames\n";
    192 #      print STDOUT "                         of any files which fail to be processed (defaults.\n";
    193 #      print STDOUT "                         to " .
    194 #   &util::filename_cat("<collectdir>", "colname", "etc", "fail.log") . ")\n";
    195 #      print STDOUT "  [Type \"perl -S buildcol.pl | more\" if this help text scrolled off your screen]";
    196 #      print STDOUT "\n" unless $ENV{'GSDLOS'} =~ /^windows$/i;
    197 #  }
    198158
    199159
    … …  
    249209    }
    250210
     211    if ($gli) { # the gli wants strings to be in UTF-8
     212    &gsprintf::output_strings_in_UTF8;
     213    }
     214
    251215    $textindex = "";
    252216    my $close_out = 0;

  • trunk/gsdl/bin/script/exportcol.pl

    r6945 r7101  
    6161
    6262
    63 #sub print_usage {
    64 #    print STDERR "\n";
    65 #    print STDERR "exportcol.pl: Exports  collection for writing to CD-ROM.\n\n";
    66 #    print STDERR "  usage: $0 [options] collection-name\n\n";
    67 #    print STDERR "   -out    Filename or handle to print debug info to.\n";
    68 #    print STDERR "           The default is STDERR\n";
    69 #    print STDERR "   -cdname The name of the cd - this is what will appear in the start menu once the cd is installed.\n";
    70 #    print STDERR "           The default is 'Greenstone Collections'.\n\n";
    71 #}
    72 
    7363&main();
    7464
    7565sub main {
    76     my ($out, $cdname);
     66    my ($language, $out, $cdname, $gli);
    7767
    7868    my $xml = 0;
    … …  
    8272             'out/.*/STDERR', \$out,
    8373             'cdname/.*/', \$cdname,
     74             'gli', \$gli,
    8475             q^xml^, \$xml)) {
    8576
    … …  
    9990    }
    10091
     92    if ($gli) { # the gli wants strings to be in UTF-8
     93    &gsprintf::output_strings_in_UTF8;
     94    }
     95   
    10196    my $dirname="";
    10297    if ($cdname eq "") {

  • trunk/gsdl/bin/script/import.pl

    r7063 r7101  
    165165}
    166166
    167 
    168 #  sub print_usage {
    169 #      print STDOUT "\n";
    170 #      print STDOUT "import.pl: Converts documents in collections -importdir directory into\n";
    171 #      print STDOUT "           xml documents which are written to the -archivedir directory.\n\n";
    172 #      print STDOUT "  usage: $0 [options] collection-name\n\n";
    173 #      print STDOUT "  options:\n";
    174 #      print STDOUT "   -verbosity number      0=none, 3=lots\n";
    175 #      print STDOUT "   -importdir directory   Where the original material lives\n";
    176 #      print STDOUT "   -archivedir directory  Where the converted material ends up\n";
    177 #      print STDOUT "   -keepold               Will not destroy the current contents of the\n";
    178 #      print STDOUT "                          archives directory (the default)\n";
    179 #      print STDOUT "   -removeold             Will remove the old contents of the archives\n";
    180 #      print STDOUT "                          directory -- use with care\n";
    181 #      print STDOUT "   -gzip                  Use gzip to compress resulting xml documents\n";
    182 #      print STDOUT "                          (don't forget to include ZIPPlug in your plugin\n";
    183 #      print STDOUT "                          list when building from compressed documents)\n";
    184 #      print STDOUT "   -maxdocs number        Maximum number of documents to import\n";
    185 #      print STDOUT "   -groupsize number      Number of import documents to group into one XML file\n";
    186 #      print STDOUT "   -OIDtype hash|incremental The method to use when generating unique\n";
    187 #      print STDOUT "                          identifiers for each document. \"hash\" (the\n";
    188 #      print STDOUT "                          default) hashes the contents of the file and so\n";
    189 #      print STDOUT "                          will be the same every time the collection is\n";
    190 #      print STDOUT "                          imported. \"incremental\" is a simple document\n";
    191 #      print STDOUT "                          count and so will be significantly faster than\n";
    192 #      print STDOUT "                          \"hash\". It is not guaranteed to always assign\n";
    193 #      print STDOUT "                          the same identifier to a given document though\n";
    194 #      print STDOUT "                          and does not allow further documents to be added\n";
    195 #      print STDOUT "                          to existing xml archives\n";
    196 #      print STDOUT "   -sortmeta metadata     Sort documents alphabetically by metadata for\n";
    197 #      print STDOUT "                          building. This will be disabled if groupsize > 1\n";
    198 #      print STDOUT "   -debug                 Print imported text to STDOUT\n";
    199 #      print STDOUT "   -collectdir directory  Collection directory (defaults to " .
    200 #   &util::filename_cat ($ENV{'GSDLHOME'}, "collect") . ")\n";
    201 #      print STDOUT "   -out name              Filename or handle to print output status to.\n";
    202 #      print STDOUT "                          The default is STDERR\n";
    203 #      print STDOUT "   -statsfile name        Filename or handle to print import statistics to.\n";
    204 #      print STDOUT "                          The default is STDERR\n";
    205 #      print STDOUT "   -faillog name          Fail log filename. This log receives the filenames\n";
    206 #      print STDOUT "                          of any files which fail to be processed (defaults\n";
    207 #      print STDOUT "                          to " .
    208 #   &util::filename_cat("<collectdir>", "colname", "etc", "fail.log") . ")\n";
    209 #      print STDOUT "  [Type \"perl -S import.pl | more\" if this help text scrolled off your screen]";
    210 #      print STDOUT "\n" unless $ENV{'GSDLOS'} =~ /^windows$/i;
    211 #  }
    212167
    213168&main();
    … …  
    260215    }
    261216
     217    if ($gli) { # the gli wants strings to be in UTF-8
     218    &gsprintf::output_strings_in_UTF8;
     219    }
    262220    my $close_out = 0;
    263221    if ($out !~ /^(STDERR|STDOUT)$/i) {

  • trunk/gsdl/bin/script/mkcol.pl

    r6945 r7101  
    9898}
    9999
    100 
    101 #  sub print_usage {
    102 #      print STDOUT "\n";
    103 #      print STDOUT "mkcol.pl: Creates the directory structure for a new\n";
    104 #      print STDOUT "          Greenstone collection.\n\n";
    105 #      print STDOUT "  usage: $0 -creator email [options] collection-name\n\n";
    106 #      print STDOUT "  options:\n";
    107 #      print STDOUT "   -optionfile file    Get options from file, useful on systems where\n";
    108 #      print STDOUT "                       long command lines may cause problems\n";
    109 #      print STDOUT "   -collectdir         Directory where new collection will be created.\n";
    110 #      print STDOUT "                       Default is " .
    111 #   &util::filename_cat($ENV{'GSDLHOME'}, "collect") . "\n";
    112 #      print STDOUT "   -maintainer email   The collection maintainer's email address (if\n";
    113 #      print STDOUT "                       different from the creator)\n";
    114 #      print STDOUT "   -public true|false  If this collection has anonymous access\n";
    115 #      print STDOUT "   -title text         The title for the collection\n";
    116 #      print STDOUT "   -about text         The about text for the collection\n";
    117 #      print STDOUT "   -plugin text        perl plugin module to use (there may be multiple\n";
    118 #      print STDOUT "                       plugin entries)\n";
    119 #      print STDOUT "   -quiet              Operate quietly\n";
    120 #      print STDOUT "  Note that -creator must be specified. You can make changes to all\n";
    121 #      print STDOUT "  options later by editing the collect.cfg configuration file for your\n";
    122 #      print STDOUT "  new collection (it'll be in the \"etc\" directory).\n\n";
    123 #      print STDOUT "  [Type \"perl -S mkcol.pl | more\" if this help text scrolled off your screen]";
    124 #      print STDOUT "\n" unless $ENV{'GSDLOS'} =~ /^windows$/i;
    125 #  }
    126100
    127101sub traverse_dir
    … …  
    200174              'plugin/.+', \@plugin,
    201175              'quiet', \$quiet,
     176              'gli', \$gli,
    202177              q^xml^, \$xml
    203178              )) {
    … …  
    222197    }
    223198
     199    if ($gli) { # the gli wants strings to be in UTF-8
     200    &gsprintf::output_strings_in_UTF8;
     201    }
     202   
    224203    if ($optionfile =~ /\w/) {
    225204    open (OPTIONS, $optionfile) ||
Note: See TracChangeset for help on using the changeset viewer.