Changeset 23147

Timestamp:

2010-10-17T23:54:21+13:00 (14 years ago)

Author:

davidb

Message:

Added routine for zipping up doc_xml and its associated files from the archives directory

File:

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

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

@@ -8 +8 @@
 use CGI::Carp qw(fatalsToBrowser); 
 use CGI; 
+
+use File::Basename;
 
 BEGIN {
@@ -56 +58 @@
     my $infodb_type = get_infodb_type($opt_site,$collect_home,$collect);
 
-    # Obtain the collect and archives dir    
-    my $archives_dir = &util::filename_cat($collect_home,$collect,"archives");
+    # Derive the archives dir    
+    my $archive_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", 
-                    $archives_dir);
+                    $archive_dir);
     my $doc_rec_string 
     = &dbutil::read_infodb_entry($infodb_type, $arcinfo_doc_filename, 
@@ -68 +70 @@
     my $doc_rec = &dbutil::convert_infodb_string_to_hash($doc_rec_string);    
     my $doc_xml_file = $doc_rec->{'doc-file'}->[0];
-    
+    my $assoc_path = dirname($doc_xml_file);
+
     # The $doc_xml_file is relative to the archives, so now let's get the 
     # full path
-    my $doc_xml_filename = &util::filename_cat($archives_dir,$doc_xml_file);
+    my $doc_xml_filename = &util::filename_cat($archive_dir,$doc_xml_file);
 
-    return $doc_xml_filename;
+    return ($doc_xml_filename,$assoc_path);
+}
+
+sub zip_up_archives_doc
+{
+    my ($gsdl_cgi,$collect_home,$collect,$doc_xml_filename,$assoc_path) = @_;
+
+    my $timestamp = time(); 
+    my $lang_env = $gsdl_cgi->clean_param("lr") || "";
+
+    my $archive_dir = &util::filename_cat($collect_home,$collect,"archives");
+
+    # Zip up the doc_xml file and all the files associated with it
+    my $java = $gsdl_cgi->get_java_path();
+    my $jar_dir= &util::filename_cat($ENV{'GSDLHOME'}, "bin", "java");
+    my $java_classpath = &util::filename_cat($jar_dir,"GLIServer.jar");
+
+    my $zip_file = "$collect-$timestamp.zip";
+    my $zip_file_path = &util::filename_cat($archive_dir,$zip_file);
+
+    my $java_args = "\"$zip_file_path\" \"$archive_dir\" \"$assoc_path\"";
+    if($gsdl_cgi->greenstone_version() != 2) {
+    $java_args .= " gsdl3"; 
+    }
+
+    $ENV{'LANG'} = $lang_env;
+    my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionShell $java_args"; 
+
+    my $java_output = `$java_command`;
+    my $java_status = $?;
+    if ($java_status > 0) {
+    $gsdl_cgi->generate_error("Java failed: $java_command\n--\n$java_output\nExit status: " . ($java_status / 256) . "\n" . $gsdl_cgi->check_java_home());
+    }
+
+    # Check that the zip file was created successfully
+    if (!-e $zip_file_path || -z $zip_file_path) {
+    $gsdl_cgi->generate_error("Collection zip file $zip_file_path could not be created.");
+    }
+
+    return $zip_file_path;
+
 }
 
@@ -102 +145 @@
     my $uniq_prefix = "$collect-$oid";
 
-    my $docxml_filename = oid_to_docxml_filename($site,$collect_home,$collect,$oid);
+    my ($docxml_filename,$assoc_path) 
+    = oid_to_docxml_filename($site,$collect_home,$collect,$oid);
+
+    my $zip_filename 
+    = zip_up_archives_doc($gsdl_cgi,$collect_home,$collect,
+                  $docxml_filename,$assoc_path);
 
     my $talktoUploadURL = $gsdl_cgi->param('talktoUpload');
@@ -114 +162 @@
          'oid'          => $oid,
          'collect'      => $collect,
-         'uploadedfile' => [$docxml_filename, "$uniq_prefix-doc.xml"] 
+         'uploadedfile' => [$zip_filename, "$uniq_prefix-doc.xml"] 
          ],
        'Content_Type' => 'form-data'