Changeset 12628

Timestamp:

2006-08-31T14:03:55+12:00 (18 years ago)

Author:

mdewsnip

Message:

Added an extra argument to print_xml_usage for specifying whether to display just the top-level information (name, description, abstract, etc.) or whether to display everything (top-level information, plus arguments, super plugins/classifiers, etc.)

Location:

trunk/gsdl/perllib

Files:

• downloaders/BasDownload.pm (modified) (4 diffs)
• plugouts/BasPlugout.pm (modified) (4 diffs)

trunk/gsdl/perllib/downloaders/BasDownload.pm

@@ -99 +99 @@
     my $self = shift(@_);
     my $header = shift(@_);
+    my $high_level_information_only = shift(@_);
     
     # XML output is always in UTF-8
@@ -106 +107 @@
     &PrintUsage::print_xml_header("download");
     }
-    $self->print_xml();
+    $self->print_xml($high_level_information_only);
 }
 
@@ -113 +114 @@
 {
     my $self = shift(@_);
+    my $high_level_information_only = shift(@_);
+
     my $optionlistref = $self->{'option_list'};
     my @optionlist = @$optionlistref;
@@ -126 +129 @@
     gsprintf(STDERR, "  <Abstract>$downloadoptions->{'abstract'}</Abstract>\n");
     gsprintf(STDERR, "  <Inherits>$downloadoptions->{'inherits'}</Inherits>\n");
-    gsprintf(STDERR, "  <Arguments>\n");
-    if (defined($downloadoptions->{'args'})) {
-    &PrintUsage::print_options_xml($downloadoptions->{'args'});
-    }
-    gsprintf(STDERR, "  </Arguments>\n");
-    # Recurse up the download hierarchy
-    $self->print_xml();
+    unless (defined($high_level_information_only)) {
+    gsprintf(STDERR, "  <Arguments>\n");
+    if (defined($downloadoptions->{'args'})) {
+        &PrintUsage::print_options_xml($downloadoptions->{'args'});
+    }
+    gsprintf(STDERR, "  </Arguments>\n");
+
+    # Recurse up the download hierarchy
+    $self->print_xml();
+    }
     gsprintf(STDERR, "</DownloadInfo>\n");
 }

trunk/gsdl/perllib/plugouts/BasPlugout.pm

@@ -140 +140 @@
     my $self = shift(@_);
     my $header = shift(@_);
+    my $high_level_information_only = shift(@_);
     
     # XML output is always in UTF-8
@@ -147 +148 @@
     &PrintUsage::print_xml_header("plugout");
     }
-    $self->print_xml();
+    $self->print_xml($high_level_information_only);
 }
 
@@ -154 +155 @@
 {
     my $self = shift(@_);
+    my $high_level_information_only = shift(@_);
+
     my $optionlistref = $self->{'option_list'};
     my @optionlist = @$optionlistref;
@@ -167 +170 @@
     gsprintf(STDERR, "  <Abstract>$plugoutoptions->{'abstract'}</Abstract>\n");
     gsprintf(STDERR, "  <Inherits>$plugoutoptions->{'inherits'}</Inherits>\n");
-    gsprintf(STDERR, "  <Arguments>\n");
-
-    if (defined($plugoutoptions->{'args'})) {
-    &PrintUsage::print_options_xml($plugoutoptions->{'args'});
-    }
-
-    gsprintf(STDERR, "  </Arguments>\n");
-    # Recurse up the plugout hierarchy
-    $self->print_xml();
+    unless (defined($high_level_information_only)) {
+    gsprintf(STDERR, "  <Arguments>\n");
+    if (defined($plugoutoptions->{'args'})) {
+        &PrintUsage::print_options_xml($plugoutoptions->{'args'});
+    }
+    gsprintf(STDERR, "  </Arguments>\n");
+
+    # Recurse up the plugout hierarchy
+    $self->print_xml();
+    }
     gsprintf(STDERR, "</PlugoutInfo>\n");
 }