Changeset 15699 for gsdl/trunk/perllib/basebuildproc.pm

Timestamp:

2008-05-26T15:49:58+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Moving the write_infodb_entry() functions from basebuildproc.pm into a new dbutil.pm file, since we need to use these from basebuilder.pm and classify.pm too.

File:

• gsdl/trunk/perllib/basebuildproc.pm (modified) (5 diffs)

gsdl/trunk/perllib/basebuildproc.pm

@@ -32 +32 @@
 
 use classify;
+use dbutil;
 use doc;
 use docproc;
@@ -374 +375 @@
     my $doc_OID = $doc_obj->get_OID();
     my $first = 1;
+    my $infodb_handle = $self->{'output_handle'};
 
     $self->{'doc_mdprefix_fields'} = {};
@@ -427 +429 @@
         # special case for URL metadata
         if ($field =~ /^URL$/i) {
-            $self->write_infodb_entry($value, { 'section' => [ $section_OID ] });
+            &dbutil::write_infodb_entry($infodb_handle, $value, { 'section' => [ $section_OID ] });
         }
 
@@ -504 +506 @@
     } 
     
-    $self->write_infodb_entry($section_OID, \%section_infodb);
+    &dbutil::write_infodb_entry($infodb_handle, $section_OID, \%section_infodb);
     
     # output a database entry for the document number
     if ($self->{'db_level'} eq "document") {
-        $self->write_infodb_entry($self->{'num_docs'}, { 'section' => [ $doc_OID ] });
+        &dbutil::write_infodb_entry($infodb_handle, $self->{'num_docs'}, { 'section' => [ $doc_OID ] });
     }
     else {
-        $self->write_infodb_entry($self->{'num_sections'}, { 'section' => [ $section_OID ] });
+        &dbutil::write_infodb_entry($infodb_handle, $self->{'num_sections'}, { 'section' => [ $section_OID ] });
     }
 
@@ -518 +520 @@
     last if ($self->{'db_level'} eq "document"); # if no sections wanted, only add the docs
     }
-}
-
-
-sub write_infodb_entry
-{
-    my $self = shift(@_);
-
-    $self->write_infodb_entry_gdbm(@_);
-}
-
-    
-sub write_infodb_entry_gdbm
-{
-    my $self = shift(@_);
-    my $infodb_key = shift(@_);
-    my $infodb_map = shift(@_);
-
-    my $handle = $self->{'output_handle'};
-
-    print $handle "[$infodb_key]\n";
-    foreach my $infodb_value_key (keys(%$infodb_map))
-    {
-    foreach my $infodb_value (@{$infodb_map->{$infodb_value_key}})
-    {
-        if ($infodb_value =~ /-{70,}/)
-        {
-        # if value contains 70 or more hyphens in a row we need to escape them
-        # to prevent txt2db from treating them as a separator
-        $infodb_value =~ s/-/&\#045;/gi;
-        }
-        print $handle "<$infodb_value_key>" . $infodb_value . "\n";
-    }
-    }
-    print $handle '-' x 70, "\n";
 }