Changeset 834 for trunk

Timestamp:

1999-12-13T16:53:21+13:00 (24 years ago)

Author:

davidb

Message:

'groupsize' added

File:

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

trunk/gsdl/perllib/docsave.pm

@@ -40 +40 @@
 
 sub new {
-    my ($class, $collection, $archive_info, $verbosity, $gzip) = @_;
+    my ($class, $collection,$archive_info,$verbosity,$gzip,$groupsize) = @_;
     my $self = new docproc ();
 
@@ -47 +47 @@
     $self->{'verbosity'} = $verbosity;
     $self->{'gzip'} = $gzip;
+    $self->{'groupsize'} = $groupsize;
+    $self->{'gs_count'} = 0;
 
     # set a default for the archive directory
@@ -69 +71 @@
     $OID = "NULL" unless defined $OID;
 
-    # get the document's directory.
-    my $doc_info = $self->{'archive_info'}->get_info($OID);
-    my $doc_dir = "";
-    if (defined $doc_info && scalar(@$doc_info) >= 1) {
-    # this OID already has an assigned directory, use the
-    # same one.
-    $doc_dir = $doc_info->[0];
-    $doc_dir =~ s/\/?doc\.gml(\.gz)?$//;
+    my $groupsize = $self->{'groupsize'};
+    my $gs_count = $self->{'gs_count'};
+    my $open_new_file = (($gs_count % $groupsize)==0);
 
-    } else {
-    # have to get a new document directory
-    my $doc_dir_rest = $OID;
-    my $doc_dir_num = 0;
-    do {
-        $doc_dir .= "/" if $doc_dir_num > 0;
-        if ($doc_dir_rest =~ s/^(.{1,8})//) {
-        $doc_dir .= $1;
-        $doc_dir_num++;
+    # opening a new file, or document has assoicated files => directory needed
+    if (($open_new_file) || (scalar(@{$doc_obj->get_assoc_files()})>0))
+    {
+    # get the document's directory.
+    my $doc_info = $self->{'archive_info'}->get_info($OID);
+    my $doc_dir = "";
+    if (defined $doc_info && scalar(@$doc_info) >= 1) {
+        # this OID already has an assigned directory, use the
+        # same one.
+        $doc_dir = $doc_info->[0];
+        $doc_dir =~ s/\/?doc\.gml(\.gz)?$//;
+    } else {
+        # have to get a new document directory
+        my $doc_dir_rest = $OID;
+        my $doc_dir_num = 0;
+        do {
+        $doc_dir .= "/" if $doc_dir_num > 0;
+        if ($doc_dir_rest =~ s/^(.{1,8})//) {
+            $doc_dir .= $1;
+            $doc_dir_num++;
+        }
+        } while ($doc_dir_rest ne "" && 
+             ((-d &util::filename_cat ($archive_dir, "$doc_dir.dir")) || 
+              ($self->{'archive_info'}->size() >= 1024 && $doc_dir_num < 2)));
+        $doc_dir .= ".dir";
+        
+    }
+    
+    &util::mk_all_dir ("$archive_dir/$doc_dir");
+    
+    # copy all the associated files, add this information as metadata
+    # to the document
+    my @assoc_files = ();
+    foreach $assoc_file (@{$doc_obj->get_assoc_files()}) {
+        my ($dir, $afile) = $assoc_file->[1] =~ /^(.*?)([^\/\\]+)$/;
+        $dir = "" unless defined $dir;
+        if (-e $assoc_file->[0]) {
+        my $filepath = &util::filename_cat($archive_dir, $doc_dir, $afile);
+        &util::hard_link ($assoc_file->[0], $filepath);
+        $doc_obj->add_metadata ($doc_obj->get_top_section(),
+                    "gsdlassocfile",
+                    "$afile:$assoc_file->[2]:$dir");
+        } else {
+        print STDERR "docsave::process couldn't copy the associated file " .
+            "$assoc_file->[0] to $afile\n";
         }
-    } while ($doc_dir_rest ne "" && 
-         ((-d &util::filename_cat ($archive_dir, "$doc_dir.dir")) || 
-          ($self->{'archive_info'}->size() >= 1024 && $doc_dir_num < 2)));
-    $doc_dir .= ".dir";
-    }
+    }
 
-    &util::mk_all_dir ("$archive_dir/$doc_dir");
-
-    # copy all the associated files, add this information as metadata
-    # to the document
-    my @assoc_files = ();
-    foreach $assoc_file (@{$doc_obj->get_assoc_files()}) {
-    my ($dir, $afile) = $assoc_file->[1] =~ /^(.*?)([^\/\\]+)$/;
-    $dir = "" unless defined $dir;
-    if (-e $assoc_file->[0]) {
-        my $filepath = &util::filename_cat($archive_dir, $doc_dir, $afile);
-        &util::hard_link ($assoc_file->[0], $filepath);
-        $doc_obj->add_metadata ($doc_obj->get_top_section(), 
-                    "gsdlassocfile", 
-                    "$afile:$assoc_file->[2]:$dir");
-    } else {
-        print STDERR "docsave::process couldn't copy the associated file " .
-        "$assoc_file->[0] to $afile\n";
+    if ($open_new_file)
+    {
+        # only if opening new file
+        my $doc_file 
+        = &util::filename_cat ($archive_dir, $doc_dir, "doc.gml");
+        my $short_doc_file = &util::filename_cat ($doc_dir, "doc.gml");
+        
+        if ($gs_count>0)
+        {
+        return if (!$self->close_file_output());
+        }
+        
+        if (!open (OUTDOC, ">$doc_file")) {
+        print STDERR "docsave::process could not write to file $docfile\n";
+        return;
+        }
+        $self->{'gs_filename'} = $doc_file;
+        $self->{'gs_short_filename'} = $short_doc_file;
+        $self->{'gs_OID'} = $OID;
     }
     }
 
     # save this document
-    my $doc_file = &util::filename_cat ($archive_dir, $doc_dir, "doc.gml");
-    my $short_doc_file = &util::filename_cat ($doc_dir, "doc.gml");
+    $doc_obj->output_section('docsave::OUTDOC', $doc_obj->get_top_section());
 
-    if (!open (OUTDOC, ">$doc_file")) {
-    print STDERR "docsave::process could not write to file $docfile\n";
-    return;
-    }
-    $doc_obj->output_section('docsave::OUTDOC', $doc_obj->get_top_section());
+    $self->{'gs_count'}++;
+}
+
+sub close_file_output
+{
+    my ($self) = @_;
+
     close OUTDOC;
 
+    my $OID = $self->{'gs_OID'};
+    my $short_doc_file = $self->{'gs_short_filename'};
+
     if ($self->{'gzip'}) {
+    my $doc_file = $self->{'gs_filename'};
     `gzip $doc_file`;
     $doc_file .= ".gz";
@@ -131 +167 @@
     if (!-e $doc_file) {
         print STDERR "error while gzipping: $doc_file doesn't exist\n";
-        return;
+        return 0;
     }
     }
@@ -137 +173 @@
     # store reference in the archive_info
     $self->{'archive_info'}->add_info($OID, $short_doc_file);
-    
+
+    return 1;
 }
 
-
 1;