Changeset 15911 for gsdl/trunk/perllib

Timestamp:

2008-06-09T13:12:28+12:00 (16 years ago)

Author:

kjdon

Message:

tidy up a couple of places using dummy text and NoText metadata

Location:

gsdl/trunk/perllib/plugins

Files:

• MP3Plugin.pm (modified) (3 diffs)
• OggVorbisPlugin.pm (modified) (1 diff)
• PagedImagePlugin.pm (modified) (1 diff)

gsdl/trunk/perllib/plugins/MP3Plugin.pm

@@ -105 +105 @@
     }
    
-    #whats this crap?
-   my $text = &gsprintf::lookup_string("{BasePlugin.dummy_text}",1);
+    my $text = &gsprintf::lookup_string("{BasePlugin.dummy_text}",1);
     if ($self->{'assoc_images'}) {
     $text .= "[img1]<br>";
@@ -112 +111 @@
     }
     $doc_obj->add_utf8_text($doc_obj->get_top_section(), $text);
+    $doc_obj->add_metadata ($doc_obj->get_top_section(), "NoText",    "1");
 
 }
@@ -188 +188 @@
     $doc_obj->add_metadata ($section, $assoc_field, $assoc_name);
     $doc_obj->add_metadata ($section, "srcurl", $assoc_url);
-    $doc_obj->add_metadata ($section, "NoText",    "1");
 
     my $mp3_info = get_mp3info($filename);

gsdl/trunk/perllib/plugins/OggVorbisPlugin.pm

@@ -130 +130 @@
     $doc_obj->add_metadata ($top_section, "srcicon", "<img src=\"_httpprefix_/images/iogg.gif\" title=\"Download\" border=0>");
 
-    # add NoText metadata which can be used to suppress the dummy text
-    $doc_obj->add_metadata ($top_section, "NoText", "1");
+    # add dummy text and NoText metadata which can be used to suppress the dummy text
+    $self->add_dummy_text($doc_obj, $top_section);
 
     # Add the actual file as an associated file

gsdl/trunk/perllib/plugins/PagedImagePlugin.pm

@@ -547 +547 @@
     # if we want a header page, we need to add some text into the top section, otherwise this section will become invisible
     if ($self->{'headerpage'}) {
-    $doc_obj->add_text($topsection, &gsprintf::lookup_string("{BasePlugin.dummy_text}"));
+    $self->add_dummy_text($doc_obj, $topsection);
     }