Changeset 18508 for gsdl

Timestamp:

2009-02-11T17:42:17+13:00 (15 years ago)

Author:

davidb

Message:

Had to move location of where deletion of archive files was done

Location:

gsdl/trunk/perllib

Files:

• basebuildproc.pm (modified) (1 diff)
• classify/BaseClassifier.pm (modified) (2 diffs)
• classify/GenericList.pm (modified) (1 diff)
• doc.pm (modified) (1 diff)
• inexport.pm (modified) (2 diffs)
• plugins/ArchivesInfPlugin.pm (modified) (5 diffs)

gsdl/trunk/perllib/basebuildproc.pm

@@ -1 @@
-###########################################################################
+##########################################################################
 #
 # basebuildproc.pm -- 

gsdl/trunk/perllib/classify/BaseClassifier.pm

@@ -308 +308 @@
     foreach my $existing_oid (@{$self->{$field}}) {
     if ($existing_oid eq $delete_oid) {
-        print $outhandle "  Deleting $delete_oid\n";
+        print $outhandle "  Deleting $delete_oid for ", ref $self, "\n";
     }
     else {
@@ -324 +324 @@
     my $outhandle = $self->{'outhandle'};
 
-    print $outhandle "  Deleting $delete_oid\n";
+    print $outhandle "  Deleting $delete_oid for ", ref $self, "\n";
     delete $self->{$field}->{$delete_oid};
 }

gsdl/trunk/perllib/classify/GenericList.pm

@@ -233 +233 @@
     return if (!$classify_section);
 
-    if ($edit_mode eq "delete") {
+
+    if (($edit_mode eq "delete") || ($edit_mode eq "update")) {
     $self->oid_array_delete($section_OID,'OIDs');
-    return;
+    if ($edit_mode eq "delete") {
+        return;
+    }
     }
    

gsdl/trunk/perllib/doc.pm

@@ -67 +67 @@
     if (defined $source_filename) {
     $source_filename = &util::filename_within_collection($source_filename);
-    print STDERR "******doc.pm::new(): no file rename method provided\n" unless $rename_method;
+    print STDERR "****** doc.pm::new(): no file rename method provided\n" unless $rename_method;
     $self->set_source_filename ($source_filename, $rename_method);
     }

gsdl/trunk/perllib/inexport.pm

@@ -169 +169 @@
             $val =~ s/^<index-status>(.*)$/<index-status>D/m;
             &GDBMUtils::gdbmDatabaseSet($arcinfo_doc_filename,$oid,$val);
-            my $doc_file = $doc_rec->{'doc-file'}->[0];
-
-            my $doc_filename = &util::filename_cat($archivedir,$doc_file);
-
-
-            my ($doc_tailname, $doc_dirname, $suffix) 
-            = File::Basename::fileparse($doc_filename, "\\.[^\\.]+\$");
-
-            print STDERR "Removing $doc_dirname\n" if ($verbosity>2);
-
-            &util::rm_r($doc_dirname);
-            
         }
         }
@@ -258 +246 @@
 
 
+
 1;

gsdl/trunk/perllib/plugins/ArchivesInfPlugin.pm

@@ -88 +88 @@
 
     my $archive_info = $self->{'archive_info'};
+    my $verbosity = $self->{'verbosity'};
+    my $outhandle = $self->{'outhandle'};
 
     if (defined $archive_info) {
@@ -98 +100 @@
 
         my $index_status = $archive_info->get_status_info($doc_oid);
-####        print STDERR "*** Away to Update $doc_oid $index_status\n";
 
         if ($index_status eq "D") {
@@ -104 +105 @@
         $archive_info->delete_info($doc_oid);
         &GDBMUtils::gdbmDatabaseRemove($archive_info_filename,$doc_oid);
+
+        my $doc_file = $subfile->[0];
+        my $base_dir =$self->{'base_dir'};
+
+        my $doc_filename = &util::filename_cat($base_dir,$doc_file);
+
+        my ($doc_tailname, $doc_dirname, $suffix) 
+            = File::Basename::fileparse($doc_filename, "\\.[^\\.]+\$");
+
+        print STDERR "Removing $doc_dirname\n" if ($verbosity>2);
+
+        &util::rm_r($doc_dirname);
+
+
         }
         elsif ($index_status =~ m/^(I|R)$/) {
@@ -120 +135 @@
     my ($pluginfo, $base_dir, $processor, $maxdocs) = @_;
 
+    $self->{'base_dir'} = $base_dir;
 }
 
@@ -257 +273 @@
         }
 
-
-
         if ($process_file) {
         # note: metadata is not carried on to the next level