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

Timestamp:

2008-05-26T14:00:14+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Fixed previous change to work with multiple values assigned to one element.

File:

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

gsdl/trunk/perllib/basebuildproc.pm

@@ -394 +394 @@
     my $dtype = $doc_obj->get_metadata_element ($section, "doctype");
     if (!defined $dtype || $dtype !~ /\w/) {
-        $section_infodb{"doctype"} = "doc";
+        $section_infodb{"doctype"} = [ "doc" ];
     }
 
@@ -406 +406 @@
         # doc_obj derived directly from file
         if ($doc_obj->get_text_length($section) > 0) {
-        $section_infodb{"hastxt"} = "1";
+        $section_infodb{"hastxt"} = [ "1" ];
         } else {
-        $section_infodb{"hastxt"} = "0";
+        $section_infodb{"hastxt"} = [ "0" ];
         }
     }
@@ -433 +433 @@
         # special case for URL metadata
         if ($field =~ /^URL$/i) {
-            $self->write_infodb_entry($value, { 'section'  => $section_OID });
+            $self->write_infodb_entry($value, { 'section' => [ $section_OID ] });
         }
 
         if (!defined $self->{'dontdb'}->{$field}) {
-            $section_infodb{$field} = $value;
+            push(@{$section_infodb{$field}}, $value);
 
             if ($section eq "")
@@ -453 +453 @@
         foreach my $prefix (keys %$doc_mdprefix_fields)
         {
-        $section_infodb{"metadataset"} = $prefix;
+        push(@{$section_infodb{"metadataset"}}, $prefix);
 
         foreach my $field (keys %{$doc_mdprefix_fields->{$prefix}})
@@ -459 +459 @@
             my $val = $doc_mdprefix_fields->{$prefix}->{$field};
 
-            $section_infodb{"metadatalist-$prefix"} = $field;
-            $section_infodb{"metadatafreq-$prefix-$field"} = $val;
+            push(@{$section_infodb{"metadatalist-$prefix"}}, $field);
+            push(@{$section_infodb{"metadatafreq-$prefix-$field"}}, $val);
         }
         }
@@ -472 +472 @@
         # output archivedir if at top level
         if ($section eq $doc_obj->get_top_section()) {
-        $section_infodb{"archivedir"} = $archivedir;
+        $section_infodb{"archivedir"} = [ $archivedir ];
         }
     }
@@ -478 +478 @@
     # output document display type
     if ($first) {
-        $section_infodb{"thistype"} = $thistype;
+        $section_infodb{"thistype"} = [ $thistype ];
     }
 
@@ -484 +484 @@
         # doc num is num_docs not num_sections
         # output the matching document number
-        $section_infodb{"docnum"} = $self->{'num_docs'};
+        $section_infodb{"docnum"} = [ $self->{'num_docs'} ];
     }
     else {
@@ -490 +490 @@
         my $children = $doc_obj->get_children ($section);
         if (scalar(@$children) > 0) {
-        $section_infodb{"childtype"} = $childtype;
+        $section_infodb{"childtype"} = [ $childtype ];
         my $contains = "";
         foreach my $child (@$children)
@@ -503 +503 @@
             }
         }
-        $section_infodb{"contains"} = $contains;
+        $section_infodb{"contains"} = [ $contains ];
         }
         # output the matching doc number
-        $section_infodb{"docnum"} = $self->{'num_sections'};
+        $section_infodb{"docnum"} = [ $self->{'num_sections'} ];
     } 
     
@@ -513 +513 @@
     # output a database entry for the document number
     if ($self->{'db_level'} eq "document") {
-        $self->write_infodb_entry($self->{'num_docs'}, { 'section'  => $doc_OID });
+        $self->write_infodb_entry($self->{'num_docs'}, { 'section' => [ $doc_OID ] });
     }
     else {
-        $self->write_infodb_entry($self->{'num_sections'}, { 'section'  => $section_OID });
+        $self->write_infodb_entry($self->{'num_sections'}, { 'section' => [ $section_OID ] });
     }
 
@@ -545 +545 @@
     foreach my $infodb_value_key (keys(%$infodb_map))
     {
-    print $handle "<$infodb_value_key>" . $infodb_map->{$infodb_value_key} . "\n";
+    foreach my $infodb_value (@{$infodb_map->{$infodb_value_key}})
+    {
+        print $handle "<$infodb_value_key>" . $infodb_value . "\n";
+    }
     }
     print $handle '-' x 70, "\n";