Ignore:
Timestamp:
2006-09-01T11:05:08+12:00 (18 years ago)
Author:
mdewsnip
Message:

Now returns valid XML instead of an error when -listall and -describeall is specified and the directory doesn't exist (usually collection-specific).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/bin/script/pluginfo.pl

    r12639 r12640  
    161161
    162162    if ($listall || $describeall) {
    163     my $plugin_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "perllib", "plugins");
    164     if (!opendir (INDIR, $plugin_dir)) {
    165         print STDERR "pluginfo.pl: could not open directory $plugin_dir\n";
    166     }
    167     else {
    168         my @plugin_list = grep (/Plug\.pm$/, readdir (INDIR));
     163    my $plugins_dir = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "perllib", "plugins");
     164    my @plugin_list = ();
     165    if (opendir (INDIR, $plugins_dir)) {
     166        @plugin_list = grep (/Plug\.pm$/, readdir (INDIR));
    169167        closedir (INDIR);
    170 
    171         print STDERR "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
    172         print STDERR "<PluginList length=\"" . scalar(@plugin_list) . "\">\n";
    173         foreach my $plugin (@plugin_list) {
    174         $plugin =~ s/\.pm$//;
    175         my $plugobj = &plugin::load_plugin_for_info ($plugin);
    176         if ($describeall) {
    177             $plugobj->print_xml_usage(0);
    178         }
    179         else {
    180             $plugobj->print_xml_usage(0, 1);
    181         }
     168    }
     169
     170    print STDERR "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
     171    print STDERR "<PluginList length=\"" . scalar(@plugin_list) . "\">\n";
     172    foreach my $plugin (@plugin_list) {
     173        $plugin =~ s/\.pm$//;
     174        my $plugobj = &plugin::load_plugin_for_info ($plugin);
     175        if ($describeall) {
     176        $plugobj->print_xml_usage(0);
    182177        }
    183         print STDERR "</PluginList>\n";
    184     }
     178        else {
     179        $plugobj->print_xml_usage(0, 1);
     180        }
     181    }
     182    print STDERR "</PluginList>\n";
    185183    }
    186184    else {
Note: See TracChangeset for help on using the changeset viewer.