Changeset 15704

Timestamp:

2008-05-26T16:36:04+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding new DB support) Changed a whole lot of "gdbm"s to "database"s or "infodb"s.

File:

• gsdl/trunk/perllib/classify.pm (modified) (9 diffs)

gsdl/trunk/perllib/classify.pm

@@ -153 +153 @@
 
 
-# takes a hashref containing the metadata for a gdbmfile entry, and extracts 
+# takes a hashref containing the metadata for an infodb entry, and extracts 
 # the childrens numbers (from the 'contains' entry).    
 # assumes format is ".1;".2;".3
@@ -173 +173 @@
     
 sub recurse_sections {
-    my ($doc_obj, $children, $parentoid, $parentsection, $gdbm_recs) = @_;
+    my ($doc_obj, $children, $parentoid, $parentsection, $database_recs) = @_;
 
     return if (!defined $children);
@@ -179 +179 @@
     foreach my $child (sort { $a <=> $b} @$children) {
     $doc_obj->create_named_section("$parentsection.$child");
-    my $doc_db_rec = $gdbm_recs->{"$parentoid.$child"};
+    my $doc_db_rec = $database_recs->{"$parentoid.$child"};
     my $doc_db_hash = db_rec_to_hash($doc_db_rec);
 
@@ -192 +192 @@
     {
         recurse_sections($doc_obj, $newchildren, "$parentoid.$child", 
-                 "$parentsection.$child", $gdbm_recs);
+                 "$parentsection.$child", $database_recs);
     }
     }
@@ -212 +212 @@
 
 
-# gets all the metadata from a gdbm file entry, and puts it into a hashref
+# gets all the metadata from an infodb entry, and puts it into a hashref
 sub db_rec_to_hash {
     
@@ -235 +235 @@
     my ($fulldbname) = @_;
 
-#   tie %gdbm_recs, 'GDBM_File', $fulldbname, &GDBM_WRCREAT, 0640;
-
-    my %gdbm_recs;
-    &unbuildutil::read_gdbm($fulldbname,\%gdbm_recs);
+    my %database_recs;
+    &unbuildutil::read_gdbm($fulldbname, \%database_recs);
 
 
@@ -244 +242 @@
     my %top_sections = ();
     my %top_docnums = ();
-    foreach my $key ( keys %gdbm_recs )
+    foreach my $key ( keys %database_recs )
     {
-    my $md_rec = $gdbm_recs{$key};
+    my $md_rec = $database_recs{$key};
     my $md_hash = db_rec_to_hash($md_rec);
 
@@ -256 +254 @@
     }
 
-    # for greenstone document objects based on metadata in gdbm file
+    # for greenstone document objects based on metadata in database file
     my @all_docs = ();
     # we need to make sure the documents were processed in the same order as
@@ -269 +267 @@
         add_section_content ($doc_obj, $top, $doc_db_hash);
         my $children = &get_children($doc_db_hash);
-        recurse_sections($doc_obj, $children, $oid, $top, \%gdbm_recs);
+        recurse_sections($doc_obj, $children, $oid, $top, \%database_recs);
 
     push(@all_docs,$doc_obj);
     }    
-
-#    untie %gdbm_recs;
 
     return \@all_docs;