Changeset 1374 for trunk/gsdl/perllib/doc.pm

Timestamp:

2000-08-08T16:36:49+12:00 (24 years ago)

Author:

sjboddie

Message:

made set_OID use original document text instead of document object

File:

• trunk/gsdl/perllib/doc.pm (modified) (3 diffs)

trunk/gsdl/perllib/doc.pm

@@ -43 +43 @@
 sub new {
     my $class = shift (@_);
-    
+    my ($source_filename, $doc_type) = @_;
+
     my $self = bless {'associated_files'=>[],
               'subsection_order'=>[],
@@ -51 +52 @@
               'text'=>""}, $class;
 
-#    $self->set_source_filename ($source_filename) if defined $source_filename;
-    push (@{$self->{'metadata'}}, ["gsdlsourcefilename", $source_filename]) if defined $source_filename;
-#    $self->set_doc_type ($doc_type) if defined $doc_type;
-    push (@{$self->{'metadata'}}, ["gsdldoctype", $doc_type]) if defined $doc_type;
+    $self->set_source_filename ($source_filename) if defined $source_filename;
+    $self->set_doc_type ($doc_type) if defined $doc_type;
 
     return $self;
@@ -246 +245 @@
     if (!defined $OID) {
     $OID = "NULL";
-    my $tmp_filename = &util::get_tmp_filename();
-    if (!open (OUTFILE, ">$tmp_filename")) {
-        print STDERR "doc::set_OID could not write to $tmp_filename\n";
+
+    my $filename = $self->get_source_filename();
+    if (defined ($filename)) {
+
+        $OID = $self->_calc_OID ($filename);
+
     } else {
-        $self->output_section('OUTFILE', $self->get_top_section(), 1);
-        close (OUTFILE);
-
-        $OID = $self->_calc_OID ($tmp_filename);
+        
+        print STDERR "doc::set_OID WARNING source filename undefined (continuing)\n";
+        
+        $filename = &util::get_tmp_filename();
+        if (!open (OUTFILE, ">$tmp_filename")) {
+        print STDERR "doc::set_OID could not write to $tmp_filename\n";
+        } else {
+        $self->output_section('OUTFILE', $self->get_top_section(), 1);
+        close (OUTFILE);
+        }
+        
+        $OID = $self->_calc_OID ($filename);
         &util::rm ($tmp_filename);
     }