Changeset 9582 for trunk/gsdl

Timestamp:

2005-04-07T14:04:37+12:00 (19 years ago)

Author:

jrm21

Message:

couple of fixes:

" and others" in the author field => 'et. al.'
make whitespace optional around the = sign

use the booktitle or journal name if the entry has no 'title'

File:

• trunk/gsdl/perllib/plugins/BibTexPlug.pm (modified) (6 diffs)

trunk/gsdl/perllib/plugins/BibTexPlug.pm

@@ -117 +117 @@
     # BibTex names are taken from the "Local Guide to Latex" Graeme
     # McKinstry.  Metadata names are consistent with ReferPlug.
+
+    # The author metadata will be stored as one "Creator" entry, but will
+    # also be split up into several individual "Author" fields.
 
     my %field = (
@@ -203 +206 @@
     
     # otherwise, parse the metadata out of this line
-    next unless ($line =~ /^\s*(\w+)\s+=\s+(.*)/);
+    next unless ($line =~ /^\s*(\w+)\s*=\s*(.*)/);
     $entryname = lc($1);
     $value = $2;
@@ -261 +264 @@
        
         # take care of "et al."...
-        $value =~ s/(\s+et\.?\s+al\.?)\s*$//;
-        my $etal=$1;
-        $etal="" if (!defined ($etal));
+        my $etal='';
+        if ($value =~ s/\s+(and\s+others|et\.?\s+al\.?)\s*$//i) {
+        $etal=' <em>et. al.</em>';
+        }
         # und here for german language...
         # don't use brackets in pattern, else the matched bit becomes
@@ -322 +326 @@
         }
         my $wholename="$first $von $last $jr";
-        $wholename =~ s/ $//; $wholename =~ s/\s+/ /g;
+        $wholename =~ s/\s+/ /g; # squeeze multiple spaces
+        $wholename =~ s/ $//;
         push (@formattedlist, $wholename);
         my $fullname = "$last";
@@ -330 +335 @@
 
         # Add each name to set of Authors
-        # force utf8 pragma so that \w matches in this scope
-        use utf8;
         $doc_obj->add_utf8_metadata ($cursection, "Author", $fullname);
         }
@@ -353 +356 @@
     }
 
-
     # Add the various fields as metadata    
     $doc_obj->add_utf8_metadata ($cursection, $name, $value); 
+    }
+
+    # for books and journals...
+    if (!exists $metadata{'title'}) {
+    my $name=$field{'title'}; # get Greenstone metadata name
+    my $value;
+    if (exists $metadata{'booktitle'}) {
+        $value=$metadata{'booktitle'};
+    } elsif (exists $metadata{'journal'}) {
+        $value=$metadata{'journal'};
+    }
+    if ($value) {
+        $doc_obj->add_utf8_metadata ($cursection, $name, $value); 
+    }
     }