Changeset 7023

Timestamp:

2004-03-12T11:47:22+13:00 (20 years ago)

Author:

kjdon

Message:

fixed up the <tag> display for pluginfo and clasinfo. < and > should not be escaped in the strings, but they are doubly escaped (&amp;lt;) in the xml output

Location:

trunk/gsdl/perllib

Files:

• classify/BasClas.pm (modified) (1 diff)
• plugins/BasPlug.pm (modified) (1 diff)
• printusage.pm (modified) (3 diffs)

trunk/gsdl/perllib/classify/BasClas.pm

@@ -113 +113 @@
     &gsprintf(STDERR, "<ClassInfo>\n");
     &gsprintf(STDERR, "  <Name>$classifieroptions->{'name'}</Name>\n");
-    &gsprintf(STDERR, "  <Desc>$classifieroptions->{'desc'}</Desc>\n");
+    my $desc = &gsprintf::lookup_string($classifieroptions->{'desc'});
+    $desc =~ s/</&amp;lt;/g; # doubly escaped
+    $desc =~ s/>/&amp;gt;/g;
+    &gsprintf(STDERR, "  <Desc>$desc</Desc>\n");
     &gsprintf(STDERR, "  <Abstract>$classifieroptions->{'abstract'}</Abstract>\n");
     &gsprintf(STDERR, "  <Inherits>$classifieroptions->{'inherits'}</Inherits>\n");

trunk/gsdl/perllib/plugins/BasPlug.pm

@@ -175 +175 @@
     &gsprintf(STDERR, "<PlugInfo>\n");
     &gsprintf(STDERR, "  <Name>$pluginoptions->{'name'}</Name>\n");
-    &gsprintf(STDERR, "  <Desc>$pluginoptions->{'desc'}</Desc>\n");
+    my $desc = &gsprintf::lookup_string($pluginoptions->{'desc'});
+    $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");

trunk/gsdl/perllib/printusage.pm

@@ -87 +87 @@
 
     # Escape '<' and '>' characters
-    $optiondesc =~ s/</&lt;/g;
-    $optiondesc =~ s/>/&gt;/g;
+    $optiondesc =~ s/</&amp;lt;/g; # doubly escaped
+    $optiondesc =~ s/>/&amp;gt;/g;
 
     # Display option name, description and type
@@ -117 +117 @@
 
             # Escape '<' and '>' characters
-            $optionvaluedesc =~ s/</&lt;/g;
-            $optionvaluedesc =~ s/>/&gt;/g;
+            $optionvaluedesc =~ s/</&amp;lt;/g; #doubly escaped
+            $optionvaluedesc =~ s/>/&amp;gt;/g;
 
             &gsprintf(STDERR, "          <Desc>$optionvaluedesc</Desc>\n");
@@ -144 +144 @@
 
         # Escape '<' and '>' characters
-        $optiondeftvalue =~ s/</&lt;/g;
-        $optiondeftvalue =~ s/>/&gt;/g;
+        $optiondeftvalue =~ s/</&amp;lt;/g; #doubly escaped
+        $optiondeftvalue =~ s/>/&amp;gt;/g;
 
         &gsprintf(STDERR, "      <Default>$optiondeftvalue</Default>\n");