Changeset 23144 for main/trunk/greenstone2/cgi-bin/talkback-transfer.pl

Timestamp:

2010-10-17T14:43:08+13:00 (14 years ago)

Author:

davidb

Message:

Script now correctly determines the infodb type by parsing the collect.cfg file

File:

• main/trunk/greenstone2/cgi-bin/talkback-transfer.pl (modified) (5 diffs)

main/trunk/greenstone2/cgi-bin/talkback-transfer.pl

@@ -20 +20 @@
 sub get_infodb_type
 {
-    my ($collect_home,$collect) = @_;
+    my ($opt_site,$collect_home,$collect) = @_;
 
-    print STDERR "*** Need to implement extracting infodb_type from collect.cfg\n";
-    return "gdbm";
+    my $out = "STDERR";
+
+    $collect = &colcfg::use_collection($opt_site, $collect, $collect_home);
+
+    if ($collect eq "") {
+    print STDERR "Error: failed to find collection $collect in $collect_home\n";
+    print STDOUT "Content-type:text/plain\n\n";
+    print STDOUT "ERROR: Failed to find collection $collect\n";
+    exit 0;
+    
+    }
+
+    # Read in the collection configuration file.
+    my ($config_filename, $gs_mode) = &colcfg::get_collect_cfg_name($out);
+    my $collectcfg = &colcfg::read_collection_cfg ($config_filename, $gs_mode);
+
+    return $collectcfg->{'infodbtype'};
 }
 
@@ -29 +44 @@
 sub oid_to_docxml_filename
 {
-    my ($collect_home,$collect,$docid) = @_;
+    my ($opt_site,$collect_home,$collect,$docid) = @_;
 
-    my $infodb_type = get_infodb_type($collect_home,$collect);
+    my $infodb_type = get_infodb_type($opt_site,$collect_home,$collect);
 
-    # Obtain the collect and archive dir    
-    my $archive_dir = &util::filename_cat($collect_home,$collect,"archives");
+    # Obtain the collect and archives dir    
+    my $archives_dir = &util::filename_cat($collect_home,$collect,"archives");
 
     # Obtain the doc.xml path for the specified docID
     my $arcinfo_doc_filename 
     = &dbutil::get_infodb_file_path($infodb_type, "archiveinf-doc", 
-                    $archive_dir);
+                    $archives_dir);
     my $doc_rec_string 
     = &dbutil::read_infodb_entry($infodb_type, $arcinfo_doc_filename, 
@@ -48 +63 @@
     # The $doc_xml_file is relative to the archives, so now let's get the 
     # full path
-    my $archives_dir = &util::filename_cat($collect_home,$collect,"archives");    
     my $doc_xml_filename = &util::filename_cat($archives_dir,$doc_xml_file);
 
@@ -68 +82 @@
     my $oid     = $gsdl_cgi->param('oid');
     my $collect = $gsdl_cgi->param('collect');
+    my $site    = $gsdl_cgi->param('site');
 
     # sanity check
@@ -78 +93 @@
     my $uniq_prefix = "$collect-$oid";
 
-    my $docxml_filename = oid_to_docxml_filename($collect_home,$collect,$oid);
+    my $docxml_filename = oid_to_docxml_filename($site,$collect_home,$collect,$oid);
 
     my $talktoUploadURL = $gsdl_cgi->param('talktoUpload');