Changeset 17026 for gsdl/trunk/perllib/plugins/SplitTextFile.pm

Timestamp:

2008-08-27T20:40:20+12:00 (16 years ago)

Author:

kjdon

Message:

OID generation modifications: OIDtype and OIDmetadata options now available for plugins as well as import. OIDtype for plugins defaults to auto - if set to auto, then use the values from import. All plugins now call self->add_OID instead of doc_obj->set_OID. This sets the doc_obj OIDtype so that doesn't need to be donein other places any more. all plugins have the get_oid_hash_type method - normally returns hash_on_file, but can be overridden to return hash_on_ga_xml for those plugins that don't want hashing on file (MP3,OggVorbis...)

File:

• gsdl/trunk/perllib/plugins/SplitTextFile.pm (modified) (4 diffs)

gsdl/trunk/perllib/plugins/SplitTextFile.pm

@@ -234 +234 @@
     # create a new document
     my $doc_obj = new doc ($filename_full_path, "indexed_doc");
-    $doc_obj->set_OIDtype ($processor->{'OIDtype'}, $processor->{'OIDmetadata'});
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Language", $language);
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Encoding", $encoding);
@@ -248 +247 @@
     # Calculate a "base" document ID.
     if (!defined $id) {
-        $doc_obj->set_OID();
-        $id = $doc_obj->get_OID();
+        $id = $self->get_base_OID($doc_obj);
     }
     
@@ -274 +272 @@
 
     # add an OID
-    $self->set_OID($doc_obj, $id, $segment);
+    $self->add_OID($doc_obj, $id, $segment);
 
     # process the document
@@ -288 +286 @@
 }
 
-sub set_OID {
+sub get_base_OID {
+    my $self = shift(@_);
+    my ($doc_obj) = @_;
+
+    $self->SUPER::add_OID($doc_obj);
+    return $doc_obj->get_OID();
+}
+
+sub add_OID {
     my $self = shift (@_);
-    my ($doc_obj, $id, $segment_number) = @_;
-    
-    $doc_obj->set_OID($id . "s" . $segment_number);
-}
+    my ($doc_obj, $id, $segment) = @_;
+
+    my $full_id = $id . "s" . $segment;
+    if ($self->{'OIDtype'} eq "assigned") {
+    my $identifier = $doc_obj->get_metadata_element ($doc_obj->get_top_section(), $self->{'OIDmetadata'});
+    if (defined $identifier && $identifier ne "") {
+        $full_id = $identifier;
+        $full_id =~ s/\.//; #remove any periods
+        if ($full_id =~ /^[\d]*$/) {
+        $full_id = "D" . $full_id;
+        print STDERR "OID only contains numbers, adding a D\n";
+        }
+    }
+    }
+    $doc_obj->set_OID($full_id);
+}
+
 
 1;