Changeset 5682
- Timestamp:
- 2003-10-20T15:08:01+13:00 (20 years ago)
- Location:
- trunk/gsdl/perllib
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/perllib/classify.pm
r2024 r5682 29 29 30 30 require util; 31 use gsprintf; 32 33 34 sub gsprintf 35 { 36 return &gsprintf::gsprintf(@_); 37 } 31 38 32 39 … … 51 58 if (-e $colclassname) { require $colclassname; } 52 59 elsif (-e $mainclassname) { require $mainclassname; } 53 else { die "ERROR - couldn't find classifier \"$classname\"\n"; } 60 else { &gsprintf(STDERR, "{classify.could_not_find_classifier}\n", $classname) && die "\n"; 61 # die "ERROR - couldn't find classifier \"$classname\"\n"; 62 } 54 63 55 64 # create the classify object -
trunk/gsdl/perllib/plugin.pm
r3402 r5682 27 27 28 28 require util; 29 use gsprintf; 29 30 30 31 my $stats = {'num_processed' => 0, … … 33 34 'num_archives' => 0 34 35 }; 36 37 38 sub gsprintf 39 { 40 return &gsprintf::gsprintf(@_); 41 } 42 35 43 36 44 sub load_plugins { … … 54 62 if (-e $colplugname) { require $colplugname; } 55 63 elsif (-e $mainplugname) { require $mainplugname; } 56 else { die "ERROR - couldn't find plugin \"$pluginname\"\n"; } 64 else { &gsprintf(STDERR, "{plugin.could_not_find_plugin}\n", $pluginname) && die "\n"; 65 # die "ERROR - couldn't find plugin \"$pluginname\"\n"; 66 } 57 67 58 68 # create a plugin object … … 90 100 # an import.pl or buildcol.pl process 91 101 if (-e &util::filename_cat ($ENV{'GSDLCOLLECTDIR'}, ".kill")) { 92 print $outhandle "Process killed by .kill file\n"; 102 &gsprintf($outhandle, "{plugin.kill_file}\n"); 103 # print $outhandle "Process killed by .kill file\n"; 93 104 die "\n"; 94 105 } … … 103 114 104 115 if ($verbosity >= 2) { 105 print $outhandle "WARNING - no plugin could process $file\n"; 116 &gsprintf($outhandle, "{plugin.no_plugin_could_process}\n", $file); 117 # print $outhandle "WARNING - no plugin could process $file\n"; 106 118 } 107 119 108 120 $file =~ s/.*?([^\\\/]+)$/$1/; 109 print $failhandle "$file: no plugin could process this file\n"; 121 &gsprintf($failhandle, "$file: {plugin.no_plugin_could_process_this_file}\n"); 122 # print $failhandle "$file: no plugin could process this file\n"; 110 123 $stats->{'num_not_processed'} ++; 111 124 … … 127 140 128 141 if ($total == 1) { 129 print $statshandle "* 1 document was considered for processing\n"; 142 &gsprintf($statshandle, "* {plugin.one_considered}\n"); 143 # print $statshandle "* 1 document was considered for processing\n"; 130 144 } else { 131 print $statshandle "* $total documents were considered for processing\n"; 145 &gsprintf($statshandle, "* {plugin.n_considered}\n", $total); 146 # print $statshandle "* $total documents were considered for processing\n"; 132 147 } 133 148 if ($stats->{'num_archives'}) { 134 print $statshandle " (including the contents of " . $stats->{'num_archives'} . 135 " ZIP/TAR archive"; 136 if ($stats->{'num_archives'} == 1) {print $statshandle ")\n";} 137 else {print $statshandle "s)\n";} 149 # print $statshandle " (including the contents of " . $stats->{'num_archives'} . 150 # " ZIP/TAR archive"; 151 if ($stats->{'num_archives'} == 1) { 152 &gsprintf($statshandle, " ({plugin.including_archive})\n"); 153 # print $statshandle ")\n";} 154 } 155 else { 156 &gsprintf($statshandle, " ({plugin.including_archives})\n", $stats->{'num_archives'}); 157 # print $statshandle "s)\n";} 158 } 138 159 } 139 160 if ($stats->{'num_processed'} == 1) { 140 print $statshandle "* 1 was processed and included in the collection\n"; 161 &gsprintf($statshandle, "* {plugin.one_included}\n"); 162 # print $statshandle "* 1 was processed and included in the collection\n"; 141 163 } else { 142 print $statshandle "* " . $stats->{'num_processed'} . " were processed and included in the collection\n"; 164 &gsprintf($statshandle, "* {plugin.n_included}\n", $stats->{'num_processed'}); 165 # print $statshandle "* " . $stats->{'num_processed'} . " were processed and included in the collection\n"; 143 166 } 144 167 if ($stats->{'num_not_processed'}) { 145 168 if ($stats->{'num_not_processed'} == 1) { 146 print $statshandle "* 1 was rejected."; 169 &gsprintf($statshandle, "* {plugin.one_rejected}\n"); 170 # print $statshandle "* 1 was rejected."; 147 171 } else { 148 print $statshandle "* " . $stats->{'num_not_processed'} . " were rejected."; 149 } 150 print $statshandle " See $faillog for a list of rejected documents\n"; 172 &gsprintf($statshandle, "* {plugin.n_rejected}\n", $stats->{'num_not_processed'}); 173 # print $statshandle "* " . $stats->{'num_not_processed'} . " were rejected."; 174 } 175 &gsprintf($statshandle, " {plugin.see_faillog}\n", $faillog); 176 # print $statshandle " See $faillog for a list of rejected documents\n"; 151 177 } 152 178 } -
trunk/gsdl/perllib/printusage.pm
r4873 r5682 26 26 27 27 package PrintUsage; 28 29 30 use gsprintf; 28 31 29 32 … … 53 56 foreach $option (@$options) { 54 57 local $optionname = $option->{'name'}; 55 local $optiondesc = & lookup_string($language, $option->{'desc'});58 local $optiondesc = &gsprintf::lookup_string($language, $option->{'desc'}); 56 59 57 60 # Escape '<' and '>' characters … … 78 81 print STDERR " <Name>$optionvalue->{'name'}</Name>\n"; 79 82 if (defined $optionvalue->{'desc'}) { 80 local $optionvaluedesc = & lookup_string($language, $optionvalue->{'desc'});83 local $optionvaluedesc = &gsprintf::lookup_string($language, $optionvalue->{'desc'}); 81 84 82 85 # Escape '<' and '>' characters … … 156 159 157 160 # Display the option description 158 local $optiondesc = & lookup_string($language, $option->{'desc'});161 local $optiondesc = &gsprintf::lookup_string($language, $option->{'desc'}); 159 162 local $optionreqd = $option->{'reqd'}; 160 163 if (defined($optionreqd) && $optionreqd eq "yes") { 161 $optiondesc = "( REQUIRED) " . $optiondesc;164 $optiondesc = "(" . &gsprintf::lookup_string($language, "{PrintUsage.required}") . ") " . $optiondesc; 162 165 } 163 166 &display_text_in_column($optiondesc, $optiondescoffset, $optionstringlength, 80); … … 167 170 if (defined($optiondefault)) { 168 171 print STDERR " " x $optiondescoffset; 169 print STDERR "Default: " . $optiondefault . "\n"; 172 print STDERR &gsprintf::lookup_string($language, "{PrintUsage.default}"); 173 print STDERR ": " . $optiondefault . "\n"; 170 174 } 171 175 … … 179 183 print STDERR "$optionvaluename:"; 180 184 181 local $optionvaluedesc = & lookup_string($language, $optionvalue->{'desc'});185 local $optionvaluedesc = &gsprintf::lookup_string($language, $optionvalue->{'desc'}); 182 186 &display_text_in_column($optionvaluedesc, $optiondescoffset + 2, 183 187 $optiondescoffset + length($optionvaluename), 80); … … 204 208 205 209 206 sub lookup_string207 {208 local ($language, $stringkey) = @_;209 210 # Load the appropriate resource bundle211 local %resourcebundle = &load_resource_bundle($language);212 213 # Return the text matching the key (or just the key, if no match was found)214 return $resourcebundle{$stringkey} || $stringkey;215 }216 217 218 my $cachedlanguage = "<none>";219 my %cachedresourcebundle = ();220 221 sub load_resource_bundle222 {223 local $language = shift(@_);224 225 # If the desired resource bundle is the one cached, return it226 if ($language eq $cachedlanguage) {227 return %cachedresourcebundle;228 }229 230 # Open the appropriate resource bundle231 local $resourcebundlehome = &util::filename_cat("$ENV{'GSDLHOME'}", "perllib");232 local $resourcebundlename = "strings_" . $language . ".rb";233 local $resourcebundlefile = &util::filename_cat($resourcebundlehome, $resourcebundlename);234 235 # If the specific resource bundle cannot be opened, use the generic (English) one236 if (!open(RESOURCE_BUNDLE, "<$resourcebundlefile")) {237 $resourcebundlename = "strings.rb";238 $resourcebundlefile = &util::filename_cat($resourcebundlehome, $resourcebundlename);239 open(RESOURCE_BUNDLE, "<$resourcebundlefile")240 or die "Error: Could not open generic resource bundle $resourcebundlefile.\n";241 }242 243 local @resourcebundlelines = <RESOURCE_BUNDLE>;244 close(RESOURCE_BUNDLE);245 246 # Load and cache this resource bundle247 $cachedlanguage = $language;248 %cachedresourcebundle = ();249 foreach $line (@resourcebundlelines) {250 # Remove any trailing whitespace251 $line =~ s/(\s*)$//;252 253 # Ignore comments and empty lines254 if ($line !~ /^\#/ && $line ne "") {255 # Parse key (everything up to the first colon)256 $line =~ /^([^:]+):(.+)$/;257 local $linekey = "{" . $1 . "}";258 local $linetext = $2;259 260 # Map key to text261 $cachedresourcebundle{$linekey} = $linetext;262 }263 }264 265 return %cachedresourcebundle;266 }267 268 269 210 sub display_text_in_column 270 211 {
Note:
See TracChangeset
for help on using the changeset viewer.