Changeset 9228

Timestamp:

2005-03-01T15:21:11+13:00 (19 years ago)

Author:

davidb

Message:

Changed setting URL metadata back to always being done (regardless of
whether -file_is_url is set or not. This is because URL metadata is used
elsewhere in runtime Greenstone to resolve internal links. Setting
"weblink" and "webicon" are still only done if -file_is_url is true.

File:

• trunk/gsdl/perllib/plugins/HTMLPlug.pm (modified) (1 diff)

trunk/gsdl/perllib/plugins/HTMLPlug.pm

@@ -233 +233 @@
     unless $self->{'no_metadata'} || $self->{'description_tags'};
 
+    # Store URL for page as metadata - this can be used for an
+    # altavista style search interface. The URL won't be valid
+    # unless the file structure contains the domain name (i.e.
+    # like when w3mir is used to download a website).
+
+    # URL metadata (even invalid ones) are used to support internal
+    # links, so even if 'file_is_url' is off, still need to store info
+
+    my $web_url = "http://$file";
+    $doc_obj->add_metadata($cursection, "URL", $web_url);
+
     if ($self->{'file_is_url'}) {
-    # Store URL for page as metadata - this can be used for an
-    # altavista style search interface. The URL won't be valid
-    # unless the file structure contains the domain name (i.e.
-    # like when w3mir is used to download a website).
-    my $web_url = "http://$file";
-    $doc_obj->add_metadata($cursection, "URL", $web_url);
     $doc_obj->add_metadata($cursection, "weblink", "<a href=\"$web_url\">");
     $doc_obj->add_metadata($cursection, "webicon", "_iconworld_");