Changeset 38802 for main/trunk/greenstone2

Timestamp:

2024-02-28T13:18:31+13:00 (3 months ago)

Author:

kjdon

Message:

when investigating how OIDs are set I noticed we have this add_OID code which is never called - the new name should be add_segment_OID. Secondly, back in 2017 setting the self->{'key'} was removed - accidentally? I have put it back. This is so that is a citekey is included in hte bibtex entry, we can use that for the doc ID

File:

• main/trunk/greenstone2/perllib/plugins/BibTexPlugin.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugins/BibTexPlugin.pm

@@ -190 +190 @@
 
 
-    print "Processing line = $line \n" if $verbosity>=4;
-
-    # The first line is special, it contains the reference type and OID
-    if ($line =~ /\@(\w+)\W*\{\W*([\*\.\w\d:-]*)\W*$/) {
-        $EntryType = $1;
-        my $EntryID = (defined $2) ? $2 : "default";
-        print "** $EntryType - \"$EntryID\" \n"
-        if ($verbosity >= 4);
-
+    print STDERR "Processing line = $line \n" if $verbosity>=4;
+
+    # The first line is special, it contains the reference type and optional OID
+        # oid (citekey) can contain alphanumeric, _, - and :
+    if ($line =~ /\@(\w+)\W*\{\W*([\*\.\w:-]*)\W*$/) {
+        $EntryType = $1; # eg @workingpaper
+            my $EntryID = $2; # eg {Witen2020,
+        print "** $EntryType - \"$EntryID\" \n" if ($verbosity >= 4);
+            if (defined $EntryID && $EntryID =~ /\w+/) {
+                $self->{'key'} = $EntryID;
+            } 
         next;
     }
@@ -816 +818 @@
 }
 
-sub add_OID {
+sub add_segment_OID {
     my $self = shift (@_);
     my ($doc_obj, $id, $segment_number) = @_;
-    
     if ( $self->{'key'} eq "default") {
-    $self->SUPER::add_OID(@_);
-#   $doc_obj->set_OID("$id\_$segment_number");
+    $self->SUPER::add_segment_OID(@_);
     } else {
     $doc_obj->set_OID($self->{'key'});