Changeset 15709

Timestamp:

2008-05-27T11:44:00+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Updated the output_collection_meta() functions to use dbutil::write_infodb_entry(), so it isn't GDBM-specific.

Location:

gsdl/trunk/perllib

Files:

• basebuilder.pm (modified) (2 diffs)
• mgppbuilder.pm (modified) (7 diffs)

gsdl/trunk/perllib/basebuilder.pm

@@ -32 +32 @@
 use cfgread;
 use colcfg;
+use dbutil;
 use plugin;
 use util;
-use FileHandle;
+
 
 BEGIN {
@@ -564 +565 @@
 
 
-
-sub output_collection_meta_start {
+sub get_collection_meta_sets
+{
     my $self = shift(@_);
-    my ($handle) = @_;
-    
-    print $handle "[collection]\n";
-
-}  
-
-sub output_collection_meta_sets {
-    my $self = shift(@_);
-    my ($handle) = @_;
+    my $collection_infodb = shift(@_);
 
     my $mdprefix_fields = $self->{'buildproc'}->{'mdprefix_fields'};
-
     foreach my $prefix (keys %$mdprefix_fields)
     {
-    print $handle "<metadataset>$prefix\n";
+    push(@{$collection_infodb->{"metadataset"}}, $prefix);
 
     foreach my $field (keys %{$mdprefix_fields->{$prefix}})
     {
+        push(@{$collection_infodb->{"metadatalist-$prefix"}}, $field);
+
         my $val = $mdprefix_fields->{$prefix}->{$field};
-
-        print $handle "<metadatalist-$prefix>$field\n";
-        print $handle "<metadatafreq-$prefix-$field>$val\n";
-    }
-
-    }
-
-}  
-
-sub output_collection_meta_end {
+        push(@{$collection_infodb->{"metadatafreq-$prefix-$field"}}, $val);
+    }
+    }
+}
+
+
+# default is to output the metadata sets (prefixes) used in collection
+sub output_collection_meta
+{
     my $self = shift(@_);
-    my ($handle) = @_;
-    
-    print $handle ('-' x 70) . "\n";;
-
-}  
-
-
-# default is to output the metadata sets (prefixes) used in collection
-
-sub output_collection_meta {
-    my $self = shift(@_);
-    my ($handle) = @_;
-
-    $self->output_collection_meta_start($handle);
-    $self->output_collection_meta_sets($handle);
-    $self->output_collection_meta_end($handle);
-
-}  
+    my $infodb_handle = shift(@_);
+
+    my %collection_infodb = ();
+    $self->get_collection_meta_sets(\%collection_infodb);
+    &dbutil::write_infodb_entry($infodb_handle, "collection", \%collection_infodb);
+}
+
 
 sub print_stats {

gsdl/trunk/perllib/mgppbuilder.pm

@@ -626 +626 @@
 }   
 
-# now only outputs stuff if you can't generate it from collectionmeta - e.g. if someone has specified 'metadata' as an index.
-sub output_collection_meta {
+
+sub get_collection_meta_indexes
+{
     my $self = shift(@_);
-    my ($handle) = @_;
+    my $collection_infodb = shift(@_);
 
     # define the indexed field mapping if not already done so (ie if infodb called separately from build_index)
@@ -635 +636 @@
     $self->read_final_field_list();
     }
-
-    # do the collection info
-    $self->output_collection_meta_start($handle);
-    $self->output_collection_meta_sets($handle);
 
     # first do the collection meta stuff - everything without a dot
@@ -651 +648 @@
     #    <SU>Subject
     # these now come from collection meta. if that is not defined, usses the metadata name
-    my $field_entry="";
     my $collmeta = "";
     foreach my $longfield (@{$self->{'build_cfg'}->{'indexfields'}}){
@@ -662 +658 @@
     if (!$collmetadefined || !defined $self->{'collect_cfg'}->{'collectionmeta'}->{$collmeta}) {
         if ($longfield eq "allfields") {
-        $field_entry .= "<$shortfield>_query:textallfields_\n";
+        $collection_infodb->{$shortfield} = [ "_query:textallfields_" ];
         } elsif ($longfield eq "text") {
-        $field_entry .= "<$shortfield>_query:texttextonly_\n";
+        $collection_infodb->{$shortfield} = [ "_query:texttextonly_" ];
         } else {
-        $field_entry .= "<$shortfield>$longfield\n";
-        }
-    }
-    }
-    print $handle $field_entry;
+        $collection_infodb->{$shortfield} = [ $longfield ];
+        }
+    }
+    }
     
     # now add the level names
@@ -680 +675 @@
     if (!$collmetadefined || !defined $self->{'collect_cfg'}->{'collectionmeta'}->{$collmeta}) {
         # use the default macro
-        $level_entry .= "<$levelid>" . $level_map{$levelid} . "\n";
-    }
-    }
-    print $handle $level_entry;
+        $collection_infodb->{$levelid} = [ $level_map{$levelid} ];
+    }
+    }
     
     # now add subcoll meta
@@ -692 +686 @@
     $shortname = $self->{'index_mapping'}->{$subcoll};
     if (!$collmetadefined || !defined $self->{'collect_cfg'}->{'collectionmeta'}->{".$subcoll"}) {
-        $subcoll_entry .= "<$shortname>$subcoll\n";
-    }
-    }
-    print $handle $subcoll_entry;
+        $collection_infodb->{$shortname} = [ $subcoll ];
+    }
+    }
 
     # now add language meta
@@ -702 +695 @@
     $shortname = $self->{'index_mapping'}->{$lang};
     if (!$collmetadefined || !defined $self->{'collect_cfg'}->{'collectionmeta'}->{".$lang"}) {
-        $lang_entry .= "<$shortname>$lang\n";
-    }
-    }
-    print $handle "$lang_entry\n";
-
-    $self->output_collection_meta_end($handle);
-}
+        $collection_infodb->{$shortname} = [ $lang ];
+    }
+    }
+}
+
+
+# default is to output the metadata sets (prefixes) used in collection
+sub output_collection_meta
+{
+    my $self = shift(@_);
+    my $infodb_handle = shift(@_);
+
+    my %collection_infodb = ();
+    $self->get_collection_meta_sets(\%collection_infodb);
+    $self->get_collection_meta_indexes(\%collection_infodb);
+    &dbutil::write_infodb_entry($infodb_handle, "collection", \%collection_infodb);
+}
+
 
 # at the end of building, we have an indexfieldmap with all the mappings,