Changeset 8079

Timestamp:

2004-08-26T16:54:42+12:00 (20 years ago)

Author:

davidb

Message:

docsave.pm had been saving both GA and METS format. if-statement added to
choose one or other based on -saveas flag.

File:

• trunk/gsdl/perllib/docsave.pm (modified) (1 diff)

trunk/gsdl/perllib/docsave.pm

@@ -123 +123 @@
         my $short_mets_doc_file=&util::filename_cat ($doc_dir, "docmets.xml");
     
-
-    if (!open (OUTDOC, ">$doc_file")) {
-        print $outhandle "docsave::process could not write to file $doc_file\n";
+    my $save_as = $self->{'saveas'};
+
+    if ($save_as eq "GA") {
+        if (!open (OUTDOC, ">$doc_file")) {
+        print $outhandle "docsave::process could not write to file $doc_file\n";
+        return;
+        }
+        
+        # save this document
+        $self->output_xml_header('docsave::OUTDOC');
+        $doc_obj->output_section('docsave::OUTDOC', $doc_obj->get_top_section());
+        $self->output_xml_footer('docsave::OUTDOC');
+
+        close OUTDOC;
+    }
+    elsif ($save_as eq "METS") {
+        # save the document without metadata:doctxt.xml
+
+        if (!open(OUTDOC_TXT, ">$doc_txt_file")){
+        print $outhandle "docsave::process could not write to file $doc_mets_file\n";
+        return;
+        }
+
+        $self->output_txt_xml_header('docsave::OUTDOC_TXT');
+        $doc_obj->output_txt_section('docsave::OUTDOC_TXT', $doc_obj->get_top_section());
+        #$self->output_txt_xml_footer('docsave::OUTDOC_TXT');
+                
+        # Convert doctxt.xml file to docmets.xml
+        if (!open(OUTDOC_METS,">$doc_mets_file")){
+        print $outhandle "docsave::process could not write to file $doc_mets_file\n";
+        return;
+        }
+        
+        $self->output_mets_xml_header('docsave::OUTDOC_METS', $OID);
+        $doc_obj->output_mets_section('docsave::OUTDOC_METS',$doc_obj->get_top_section(), $working_dir);
+        $self->output_mets_xml_footer('docsave::OUTDOC_METS');
+
+        close OUTDOC_TXT;
+        close OUTDOC_METS;
+    }
+    else {
+        print $outhandle "docsave::process unrecognised saveas type, $save_as\n";
         return;
     }
-
-    # save this document
-    $self->output_xml_header('docsave::OUTDOC');
-    $doc_obj->output_section('docsave::OUTDOC', $doc_obj->get_top_section());
-    $self->output_xml_footer('docsave::OUTDOC');
-
-        #***save the document without metadata:doctxt.xml: Chi-Yu Huang
-
-    if (!open(OUTDOC_TXT, ">$doc_txt_file")){
-            print $outhandle "docsave::process could not write to file $doc_mets_file\n";
-            return;
-        }
-
-        $self->output_txt_xml_header('docsave::OUTDOC_TXT');
-        $doc_obj->output_txt_section('docsave::OUTDOC_TXT', $doc_obj->get_top_section());
-    #$self->output_txt_xml_footer('docsave::OUTDOC_TXT');
-                
-        #***Convert doctxt.xml file to docmets.xml: Chi-Yu Huang
-        if (!open(OUTDOC_METS,">$doc_mets_file")){
-        print $outhandle "docsave::process could not write to file $doc_mets_file\n";
-            return;
-    }
-         
-        $self->output_mets_xml_header('docsave::OUTDOC_METS', $OID);
-        $doc_obj->output_mets_section('docsave::OUTDOC_METS',$doc_obj->get_top_section(), $working_dir);
-        $self->output_mets_xml_footer('docsave::OUTDOC_METS');
-
-        close OUTDOC;
-        close OUTDOC_TXT;
-    close OUTDOC_METS;
 
     if ($self->{'gzip'}) {