Changeset 2327

Timestamp:

2001-04-20T11:44:50+12:00 (23 years ago)

Author:

sjboddie

Message:

* empty log message *

Location:

trunk/gsdl/perllib

Files:

• doc.pm (modified) (5 diffs)
• docproc.pm (modified) (2 diffs)
• plugins/BasPlug.pm (modified) (1 diff)
• plugins/ConvertToPlug.pm (modified) (1 diff)
• plugins/FOXPlug.pm (modified) (1 diff)
• plugins/HBPlug.pm (modified) (1 diff)
• plugins/ImagePlug.pm (modified) (1 diff)
• plugins/SplitPlug.pm (modified) (1 diff)

trunk/gsdl/perllib/doc.pm

@@ -41 +41 @@
 # classification
 
+my $OIDcount = 0;
+
 sub new {
     my $class = shift (@_);
@@ -50 +52 @@
               'subsections'=>{},
               'metadata'=>[],
-              'text'=>""}, $class;
+              'text'=>"",
+              'OIDtype'=>"hash"}, $class;
 
     $self->set_source_filename ($source_filename) if defined $source_filename;
@@ -93 +96 @@
 }
 
+sub set_OIDtype {
+    my $self = shift (@_);
+    my ($type) = @_;
+
+    if ($type eq "incremental") {
+    $self->{'OIDtype'} = $type;
+    } else {
+    $self->{'OIDtype'} = "hash";
+    }
+}
 
 sub set_source_filename {
@@ -285 +298 @@
 }
 
+# calculate OID by hashing the contents of the document
 sub _calc_OID {
     my $self = shift (@_);
@@ -309 +323 @@
 # methods dealing with OID, not groups of them.
 
-# if $OID is not provided one is calculated from hashing the
-# current contents of the document
-# An OID are actually stored as metadata of the document
+# if $OID is not provided one is calculated
 sub set_OID {
     my $self = shift (@_);
     my ($OID) = @_;
 
-    # if an OID wasn't provided then feed this document to 
-    # hashfile.exe
+    # if an OID wasn't provided claculate one
     if (!defined $OID) {
     $OID = "NULL";
 
-    my $filename = $self->get_source_filename();
-    if (defined($filename) && -e $filename) {
-
-        $OID = $self->_calc_OID ($filename);
-
+    if ($self->{'OIDtype'} eq "incremental") {
+        $OID = "D" . $OIDcount;
+        $OIDcount ++;
+        
     } else {
-
-        # this warning causes more confusion than it's worth I think
-        # -- sorry Gordon.
-#       print STDERR "doc::set_OID source filename undefined/non-existant (continuing)\n";
+        # "hash" OID - feed file to hashfile.exe
+        my $filename = $self->get_source_filename();
+        if (defined($filename) && -e $filename) {
+
+        $OID = $self->_calc_OID ($filename);
+
+        } else {
+        $filename = &util::get_tmp_filename();
+        if (!open (OUTFILE, ">$filename")) {
+            print STDERR "doc::set_OID could not write to $filename\n";
+        } else {
+            $self->output_section('OUTFILE', $self->get_top_section(), 
+                      undef, 1);
+            close (OUTFILE);
+        }
         
-        $filename = &util::get_tmp_filename();
-        if (!open (OUTFILE, ">$filename")) {
-        print STDERR "doc::set_OID could not write to $filename\n";
-        } else {
-        $self->output_section('OUTFILE', $self->get_top_section(), 
-                      undef, 1);
-        close (OUTFILE);
+        $OID = $self->_calc_OID ($filename);
+        &util::rm ($filename);
         }
-        
-        $OID = $self->_calc_OID ($filename);
-        &util::rm ($filename);
     }
     }

trunk/gsdl/perllib/docproc.pm

@@ -33 +33 @@
     my $self = {};
 
+    $self->{'OIDtype'} = "hash";
+
     return bless $self, $class;
 }
@@ -43 +45 @@
 }
 
+# OIDtype may be "hash" or "incremental"
+sub set_OIDtype {
+    my $self = shift (@_);
+    my ($type) = @_;
+
+    if ($type eq "incremental") {
+    $self->{'OIDtype'} = $type;
+    } else {
+    $self->{'OIDtype'} = "hash";
+    }
+}
+
+
 1;
 

trunk/gsdl/perllib/plugins/BasPlug.pm

@@ -285 +285 @@
     # create a new document
     my $doc_obj = new doc ($filename, "indexed_doc");
+    $doc_obj->set_OIDtype ($processor->{'OIDtype'});
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Language", $language);
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Encoding", $encoding);

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -265 +265 @@
     # create a new document
     my $doc_obj = new doc ($conv_filename, "indexed_doc");
-
+    $doc_obj->set_OIDtype ($processor->{'OIDtype'});
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Language", 
                 $language);

trunk/gsdl/perllib/plugins/FOXPlug.pm

@@ -229 +229 @@
     # create a new document
     my $doc_obj = new doc ($file, "indexed_doc");
+    $doc_obj->set_OIDtype ($processor->{'OIDtype'});
     my $section = $doc_obj->get_top_section();
 

trunk/gsdl/perllib/plugins/HBPlug.pm

@@ -227 +227 @@
     # create a new document
     my $doc_obj = new doc ($file, "indexed_doc");
+    $doc_obj->set_OIDtype ($processor->{'OIDtype'});
 
     # copy the book cover if it exists

trunk/gsdl/perllib/plugins/ImagePlug.pm

@@ -272 +272 @@
     # create a new document
     my $doc_obj = new doc ($filename, "indexed_doc");
-    
+    $doc_obj->set_OIDtype ($processor->{'OIDtype'});    
+
     #run convert to get the thumbnail and extract size and type info
     my $result = run_convert($self, $filename, $file, $doc_obj);

trunk/gsdl/perllib/plugins/SplitPlug.pm

@@ -165 +165 @@
     # create a new document
     my $doc_obj = new doc ($filename, "indexed_doc");
+    $doc_obj->set_OIDtype ($processor->{'OIDtype'});
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Language", $language);
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Encoding", $encoding);