Changeset 732 for trunk/gsdl

Timestamp:

1999-10-20T17:23:48+13:00 (25 years ago)

Author:

sjboddie

Message:

prevent from overriding Title metadata that may have been passed
in from another plugin (e.g. IndexPlug)

Location:

trunk/gsdl/perllib/plugins

Files:

• HTMLPlug.pm (modified) (1 diff)
• TEXTPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/plugins/HTMLPlug.pm

@@ -263 +263 @@
     $text =~ s/\s+/ /g;
 
-    # see if there's a <title> tag
     my $foundtitle = 0;
-    if ($text =~ /<title[^>]*>([^<]*)<\/title[^>]*>/i) {
-    if (defined $1) {
-        my $title = $1;
-        if ($title =~ /\w/) {
-        $doc_obj->add_metadata ($cursection, "Title", $title);
-        $foundtitle = 1;
+    # don't use title tag if Title has been passed
+    # in from another plugin
+    if (defined $metadata->{'Title'}) {
+    $foundtitle = 1;
+    }
+    if (!$foundtitle) {
+    # see if there's a <title> tag
+    if ($text =~ /<title[^>]*>([^<]*)<\/title[^>]*>/i) {
+        if (defined $1) {
+        my $title = $1;
+        if ($title =~ /\w/) {
+            $doc_obj->add_metadata ($cursection, "Title", $title);
+            $foundtitle = 1;
+        }
         }
     }

trunk/gsdl/perllib/plugins/TEXTPlug.pm

@@ -82 +82 @@
     my $text = "";
     my $line = "";
-    my $first = 1;
+    my $foundtitle = 0;
+    # don't need to get title if it has been passed
+    # in from another plugin
+    if (defined $metadata->{'Title'}) {
+    $foundtitle = 1;
+    }
     while (defined ($line = <FILE>)) {
     # use first line as title (or first 100 characters if it's long)
-    if ($first && length($line) > 5) {
+    if (!$foundtitle && length($line) > 5) {
         my $title = "";
         if (length($line) > 100) {
@@ -93 +98 @@
         }
         $doc_obj->add_metadata ($cursection, "Title", $title);
-        $first = 0;
+        $foundtitle = 1;
     }
     $text .= $line;