Changeset 2484 for trunk

Timestamp:

2001-05-29T23:52:32+12:00 (23 years ago)

Author:

say1

Message:

Changed SplitPlug to allow control over the OID. Changed BibTexPlug to be more permissive in the Bibtex format it accepts. Changed BibTexPlug to use the BibTex key as the OID.

Location:

trunk/gsdl/perllib

Files:

• doc.pm (modified) (1 diff)
• plugins/BibTexPlug.pm (modified) (5 diffs)
• plugins/SplitPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/doc.pm

@@ -358 +358 @@
     }
     }
-
     $self->set_metadata_element ($self->get_top_section(), "Identifier", $OID);
 }

trunk/gsdl/perllib/plugins/BibTexPlug.pm

@@ -57 +57 @@
 }
 
-
 # The process function reads a single bibliographic record and stores
 # it as a new document.
@@ -65 +64 @@
     my ($textref, $pluginfo, $base_dir, $file, $metadata, $doc_obj) = @_;
     my $outhandle = $self->{'outhandle'};
+
+    $self->{'key'} = "default";
 
     # Check that we're dealing with a valid BibTex record
@@ -125 +126 @@
     $text .= "$line\n";
 
+    
     # The first line is special, it contains the reference type and OID
-    if ($line =~ /\@(\w+)\{([\w\d]*),/) {
+    if ($line =~ /\@(\w+)\W*\{\W*([\*\.\w\d:-]+)\W*$/) {
         $EntryType = $1;
         $EntryID = $2;
-        print "** $EntryType - $EntryID \n";
+        print "** $EntryType - \"$EntryID\" \n"
+        if ($verbosity >= 4);
+        $self->{'key'} = $EntryID;
         next;
+    }
+    if ($line =~ /\@/) {
+        print "bibtexplug: suspect line in bibtex file: $line\n"
+        if ($verbosity >= 2);
+        print "bibtexplug: if that's the start of a new bibtex record ammend regexp in bibtexplug::process()\n"
+        if ($verbosity >= 2);
     }
     
@@ -227 +237 @@
 }
 
-1;
-
 
 # Convert a text string into HTML.
@@ -269 +277 @@
 }
 
-
+sub set_OID {
+    my $self = shift (@_);
+    my ($doc_obj, $id, $segment_number) = @_;
+    
+    if ( $self->{'key'} eq "default") {
+    $doc_obj->set_OID();
+    } else {
+    $doc_obj->set_OID($self->{'key'});
+    }
+}
+
+1;

trunk/gsdl/perllib/plugins/SplitPlug.pm

@@ -193 +193 @@
 
     # add an OID
-    $doc_obj->set_OID($id . "s" . $segment);
+    $self->set_OID($doc_obj, $id, $segment);
+
     
     # process the document
@@ -203 +204 @@
 }
 
+sub set_OID {
+    my $self = shift (@_);
+    my ($doc_obj, $id, $segment_number) = @_;
+    
+    $doc_obj->set_OID($id . "s" . $segment);
+
+}
 
 1;