Changeset 14962

Timestamp:

2008-02-12T15:18:32+13:00 (16 years ago)

Author:

davidb

Message:

local variable $top_section to tidy up setting metadata code

Location:

gsdl/trunk/perllib/plugins

Files:

• NULPlug.pm (modified) (1 diff)
• UnknownPlug.pm (modified) (2 diffs)

gsdl/trunk/perllib/plugins/NULPlug.pm

@@ -118 +118 @@
     # create a new document
     my $doc_obj = new doc ($filename, "indexed_doc");
+    my $top_section = $doc_obj->get_top_section();
+
     $doc_obj->set_OIDtype ($processor->{'OIDtype'}, $processor->{'OIDmetadata'});    
     #$doc_obj->set_OIDtype ("incremental");
-    $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Plugin", "$self->{'plugin_type'}");
-    $doc_obj->add_metadata($doc_obj->get_top_section(), "Source", &ghtml::dmsafe($file)); # set the filename as Source metadata to be consistent with other plugins
+    $doc_obj->add_utf8_metadata($top_section, "Plugin", "$self->{'plugin_type'}");
+    $doc_obj->add_metadata($top_section, "Source", $file); # set the filename as Source metadata to be consistent with other plugins
 
-    $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "FileSize", (-s $filename));
+    $doc_obj->add_utf8_metadata($top_section, "FileSize", (-s $filename));
 
     # the metadata NoText is used to suppress the dummy text 'This document has no text.'
-    $doc_obj->add_metadata ($doc_obj->get_top_section(), "NoText",    "1");
+    $doc_obj->add_metadata ($top_section, "NoText",    "1");
 
     my $assoc_field = $self->{'assoc_field'} || "null_file";
-    $doc_obj->add_metadata ($doc_obj->get_top_section(), $assoc_field, $file);
+    $doc_obj->add_metadata ($top_section, $assoc_field, $file);
     
      if ($self->{'cover_image'}) {

gsdl/trunk/perllib/plugins/UnknownPlug.pm

@@ -194 +194 @@
     # create a new document
     my $doc_obj = new doc ($filename, "indexed_doc");
+    my $top_section = $doc_obj->get_top_section();
+
     $doc_obj->set_OIDtype ($processor->{'OIDtype'}, $processor->{'OIDmetadata'});    
-    $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Plugin", "$self->{'plugin_type'}");
-    $doc_obj->add_metadata($doc_obj->get_top_section(), "Source", &ghtml::dmsafe($file)); # set the filename as Source metadata to be consistent with other plugins
-    $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "FileSize", (-s $filename));
+    $doc_obj->add_utf8_metadata($top_section, "Plugin", "$self->{'plugin_type'}");
+    $doc_obj->add_metadata($top_section, "Source", $file); # set the filename as Source metadata to be consistent with other plugins
+    $doc_obj->add_utf8_metadata($top_section, "FileSize", (-s $filename));
 
     # URL metadata (even invalid ones) are used to support internal
@@ -203 +205 @@
 
     my $web_url = "http://$file";
-    $doc_obj->add_metadata($doc_obj->get_top_section(), "URL", $web_url);
+    $doc_obj->add_metadata($top_section, "URL", $web_url);