Changeset 10154

Timestamp:

2005-06-23T11:15:08+12:00 (19 years ago)

Author:

davidb

Message:

Elimination of expinfo package, and its use in docsave.

Reasoning: expinfo package was added in when export.pl was devised. expinfo i
in fact is no different to the original arcinfo (that it was based on).
Having the two classes used in docsave therefore clutters things somewhat
with no real benefit. docsave code collapes back to use only arcinfo.

File:

• trunk/gsdl/perllib/docsave.pm (modified) (7 diffs)

trunk/gsdl/perllib/docsave.pm

@@ -35 +35 @@
 
 use arcinfo;
-use expinfo;
 use docproc;
 use util;
@@ -43 +42 @@
     @docsave::ISA = ('docproc');
 }
+
+
+sub calcoutputdir 
+{
+    my ($service,$collectdir,$outhandle) = @_;
+
+    my $output_dir = undef;
+
+    if (($service eq "import") || ($service eq "unbuild")) {
+    $output_dir = &util::filename_cat ($collectdir, "archives");
+    }
+    elsif ($service eq "export") {
+    $output_dir = &util::filename_cat($collectdir, "export");
+    }
+    else {
+    print $outhandle "docsave::calcoutputdir did not recognise service ";
+    print $outhandle " '$service'. No output directory set.\n";
+    }
+
+    return $output_dir;
+}
+
 
 sub new {
@@ -57 +78 @@
 
     $self->{'collection'} = $collection;
-    if (($service eq "import") || ($service eq "unbuild")) {
-    $self->{'archive_info'} = $info;
-    # set a default for the archive directory
-    $self->{'archive_dir'} = &util::filename_cat ($collectdir, "archives");
-    } elsif ($service eq "export"){ 
-    $self->{'export_info'} = $info;
-    # set a default for the export directory
-    $self->{'export_dir'} = &util::filename_cat($collectdir, "export");
-    } else {
-    print $outhandle "docsave::new Unrecongised service: $service\n";
-    return;
-    }
+
+    $self->{'output_info'} = $info;
+    $self->{'output_dir'} = undef;
 
     $self->{'verbosity'} = $verbosity;
@@ -85 +97 @@
 }
 
-sub setarchivedir {
-    my $self = shift (@_);
-    my ($archive_dir) = @_;
-    
-    &util::mk_all_dir ($archive_dir) unless -e $archive_dir;
-    $self->{'archive_dir'} = $archive_dir;
-}
-
-sub setexportdir {
-    my $self = shift (@_);
-    my ($export_dir) = @_;
- 
-    &util::mk_all_dir ($export_dir) unless -e $export_dir;
-    $self->{'export_dir'} = $export_dir;
-}
-
-sub getoutputdir {
-    my $self = shift (@_);
-
-    my $output_dir = undef;
-
-    my $service = $self->{'service'};
-
-    if (($service eq "import") || ($service eq "unbuild")) {
-    $output_dir = $self->{'archive_dir'};
-    }
-    elsif ($service eq "export") {
-    $output_dir = $self->{'export_dir'};
-    }
-    else {
-    my $outhandle = $self->{'outhandle'};
-
-    print $outhandle "docsave::getoutputdir did not recognise service ";
-    print $outhandle " '$service'. No output directory set.\n";
-    }
-
-    return $output_dir;
-}
-
-
-sub getoutputinfo {
-    my $self = shift (@_);
-
-    my $output_info = undef;
-
-    my $service = $self->{'service'};
-
-    if (($service eq "import") || ($service eq "unbuild")) {
-    $output_info = $self->{'archive_info'};
-    }
-    elsif ($service eq "export") {
-    $output_info = $self->{'export_info'};
-    }
-    else {
-    my $outhandle = $self->{'outhandle'};
-
-    print $outhandle "docsave::getoutputinfo did not recognise service ";
-    print $outhandle " '$service'. No output information available.\n";
-    }
-
-    return $output_info;
+
+
+sub setoutputdir 
+{
+    my $self = shift @_;
+    my ($output_dir) = @_;
+
+    &util::mk_all_dir ($output_dir) unless -e $output_dir;
+
+    $self->{'output_dir'} = $output_dir;
+}
+
+sub getoutputinfo 
+{
+    my $self = shift (@_);
+
+    return $self->{'output_info'};
+}
+
+sub getoutputdir 
+{
+    my $self = shift (@_);
+
+    return $self->{'output_dir'};
 }
 
@@ -352 +327 @@
     }
 
-    # store reference in the relevant info object (archive_info,export_info,...)
-    $output_info->add_info($OID, $short_doc_file, $metadata);
+    # store reference in the output_info
+    $output_info->add_info($OID, $short_doc_file, undef, $metadata);
 }
 
@@ -383 +358 @@
     if ($open_new_file) {
         # only if opening new file
+        my $output_dir = $self->getoutputdir();
         my $doc_file 
-        = &util::filename_cat ($self->{'archive_dir'}, $doc_dir, "doc.xml");
+        = &util::filename_cat ($output_dir, $doc_dir, "doc.xml");
         my $short_doc_file = &util::filename_cat ($doc_dir, "doc.xml");
         
@@ -593 +569 @@
     }
 
-    # store reference in relevant info object (archive_info,export_info,...)
+    # store reference in output_info
     my $output_info = $self->getoutputinfo();
     return 0 if (!defined $output_info);
-    $output_info->add_info($OID, $short_doc_file);
+    $output_info->add_info($OID, $short_doc_file, undef, undef);
 
     return 1;