Changeset 8843

Timestamp:

2004-12-17T11:35:42+13:00 (19 years ago)

Author:

jrm21

Message:

fix problem for -metadata_fields if tag1<Tag2> given for mapping to a
different metadata field in greenstone (if Tag2 != tag1).

File:

• trunk/gsdl/perllib/plugins/HTMLPlug.pm (modified) (5 diffs)

trunk/gsdl/perllib/plugins/HTMLPlug.pm

@@ -648 +648 @@
     return if (!defined $self->{'metadata_fields'});
 
-    my %find_fields = (); # metadata fields to extract/save
+    # metadata fields to extract/save. 'key' is the (lowercase) name of the
+    # html meta, 'value' is the metadata name for greenstone to use
+    my %find_fields = ();
 
     my %creator_fields = (); # short-cut for lookups
@@ -658 +660 @@
         # "$2" is the user's preferred gs metadata name
         $find_fields{lc($1)}=$2; # lc = lowercase
-    }
-    # "$field" is the user's preferred gs metadata name
-    $find_fields{lc($field)}=$field; # lc = lowercase
+    } else { # no <tagname> for mapping
+        # "$field" is the user's preferred gs metadata name
+        $find_fields{lc($field)}=$field; # lc = lowercase
+    }
     }
 
@@ -702 +705 @@
     # in case they're not using " or ', but they should...
     if (! $tag) {
-        $metatag =~ /(?:name|http-equiv)\s*=\s*(.*?)(?!\w)/is;
+        $metatag =~ /(?:name|http-equiv)\s*=\s*([^\s\>]+)/is;
         $tag=$1;
     }
@@ -719 +722 @@
     $value=$2;
     if (! $value) {
-        $metatag =~ /(?:name|http-equiv)\s*=\s*(.*?)(?!\w)/is;
+        $metatag =~ /(?:name|http-equiv)\s*=\s*([^\s\>]+)/is;
         $value=$1;
     }
@@ -753 +756 @@
     # see if there's a <title> tag
     my $title;
-    my $from = "";
+    my $from = ""; # for debugging output only
     if ($html_header =~ /<title[^>]*>([^<]+)<\/title[^>]*>/is) {
         $title = $1;