Changeset 11686

Timestamp:

2006-04-21T16:11:32+12:00 (18 years ago)

Author:

kjdon

Message:

print out the displayname if there is one in the print_xml and print_txt bits

File:

• trunk/gsdl/perllib/printusage.pm (modified) (4 diffs)

trunk/gsdl/perllib/printusage.pm

@@ -101 +101 @@
     }
     &gsprintf(STDERR, "  <!ELEMENT Arguments (Option*)>\n");
-    &gsprintf(STDERR, "  <!ELEMENT Option    (Name, Desc, Type, Required?, CharactorLength?, Range?, List?, Default?, HiddenGLI?, ModeGLI?)>\n");
+    &gsprintf(STDERR, "  <!ELEMENT Option    (Name, DisplayName?, Desc, Type, Required?, CharactorLength?, Range?, List?, Default?, HiddenGLI?, ModeGLI?)>\n");
     &gsprintf(STDERR, "  <!ELEMENT Name      (#PCDATA)>\n");
+    &gsprintf(STDERR, "  <!ELEMENT DisplayName  (#PCDATA)>\n");
     &gsprintf(STDERR, "  <!ELEMENT Desc      (#PCDATA)>\n");
     &gsprintf(STDERR, "  <!ELEMENT Type      (#PCDATA)>\n");
@@ -123 +124 @@
     foreach my $option (@$options) {
     my $optionname = $option->{'name'};
+    my $displayname = $option->{'disp'};
+    
     my $optiondesc = &gsprintf::lookup_string($option->{'desc'});
 
@@ -132 +135 @@
     &gsprintf(STDERR, "    <Option>\n");
     &gsprintf(STDERR, "      <Name>$optionname</Name>\n");
+    if (defined($option->{'disp'})) {
+        my $displayname = &gsprintf::lookup_string($option->{'disp'});
+        # Escape '<' and '>' characters
+        $displayname =~ s/</&amp;lt;/g; # doubly escaped
+        $displayname =~ s/>/&amp;gt;/g;
+        &gsprintf(STDERR, "      <DisplayName>$displayname</Name>\n");
+    }
     &gsprintf(STDERR, "      <Desc>$optiondesc</Desc>\n");
     &gsprintf(STDERR, "      <Type>$option->{'type'}</Type>\n");
@@ -279 +289 @@
     }
 
-    # Display the option description
+    # Display the option description    
+    if (defined($option->{'disp'})) {
+        my $optiondisp = &gsprintf::lookup_string($option->{'disp'});
+        &display_text_in_column($optiondisp, $optiondescoffset, $optionstringlength, 80);
+        &gsprintf(STDERR, " " x $optionstringlength);
+    }
     my $optiondesc = &gsprintf::lookup_string($option->{'desc'});
     my $optionreqd = $option->{'reqd'};