Changeset 12624 for trunk/gsdl

Timestamp:

2006-08-31T13:10:34+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:

• classify/BasClas.pm (modified) (4 diffs)
• plugins/BasPlug.pm (modified) (4 diffs)

trunk/gsdl/perllib/classify/BasClas.pm

@@ -112 +112 @@
     my $self = shift(@_);
     my $header = shift(@_);
+    my $high_level_information_only = shift(@_);
     
     # XML output is always in UTF-8
@@ -119 +120 @@
     &PrintUsage::print_xml_header("classify");
     }
-    $self->print_xml();
+    $self->print_xml($high_level_information_only);
 }
 
@@ -126 +127 @@
 {
     my $self = shift(@_);
+    my $high_level_information_only = shift(@_);
 
     my $optionlistref = $self->{'option_list'};
@@ -140 +142 @@
     &gsprintf(STDERR, "  <Abstract>$classifieroptions->{'abstract'}</Abstract>\n");
     &gsprintf(STDERR, "  <Inherits>$classifieroptions->{'inherits'}</Inherits>\n");
-    &gsprintf(STDERR, "  <Arguments>\n");
-    if (defined($classifieroptions->{'args'})) {
-    &PrintUsage::print_options_xml($classifieroptions->{'args'});
-    }
-    &gsprintf(STDERR, "  </Arguments>\n");
-
-    # Recurse up the classifier hierarchy
-    $self->print_xml();
-
+    unless (defined($high_level_information_only)) {
+    &gsprintf(STDERR, "  <Arguments>\n");
+    if (defined($classifieroptions->{'args'})) {
+        &PrintUsage::print_options_xml($classifieroptions->{'args'});
+    }
+    &gsprintf(STDERR, "  </Arguments>\n");
+
+    # Recurse up the classifier hierarchy
+    $self->print_xml();
+    }
     &gsprintf(STDERR, "</ClassInfo>\n");
 }

trunk/gsdl/perllib/plugins/BasPlug.pm

@@ -238 +238 @@
     my $self = shift(@_);
     my $header = shift(@_);
+    my $high_level_information_only = shift(@_);
     
     # XML output is always in UTF-8
@@ -245 +246 @@
     &PrintUsage::print_xml_header("plugin");
     }
-    $self->print_xml();
+    $self->print_xml($high_level_information_only);
 }
 
@@ -252 +253 @@
 {
     my $self = shift(@_);
+    my $high_level_information_only = shift(@_);
 
     my $optionlistref = $self->{'option_list'};
@@ -263 +265 @@
     $desc =~ s/</&amp;lt;/g; # doubly escaped
     $desc =~ s/>/&amp;gt;/g;
-    
     gsprintf(STDERR, "  <Desc>$desc</Desc>\n");
     gsprintf(STDERR, "  <Abstract>$pluginoptions->{'abstract'}</Abstract>\n");
     gsprintf(STDERR, "  <Inherits>$pluginoptions->{'inherits'}</Inherits>\n");
     gsprintf(STDERR, "  <Explodes>" . ($pluginoptions->{'explodes'} || "no") . "</Explodes>\n");
-    gsprintf(STDERR, "  <Arguments>\n");
-    if (defined($pluginoptions->{'args'})) {
-    &PrintUsage::print_options_xml($pluginoptions->{'args'});
-    }
-    gsprintf(STDERR, "  </Arguments>\n");
-    # Recurse up the plugin hierarchy
-    $self->print_xml();
+    unless (defined($high_level_information_only)) {
+    gsprintf(STDERR, "  <Arguments>\n");
+    if (defined($pluginoptions->{'args'})) {
+        &PrintUsage::print_options_xml($pluginoptions->{'args'});
+    }
+    gsprintf(STDERR, "  </Arguments>\n");
+
+    # Recurse up the plugin hierarchy
+    $self->print_xml();
+    }
     gsprintf(STDERR, "</PlugInfo>\n");
 }