Changeset 900 for trunk/gsdl/perllib/mgbuildproc.pm

Timestamp:

2000-02-03T10:06:40+13:00 (24 years ago)

Author:

sjboddie

Message:

tweaked the way associated files are handled at build time - some
individual plugins may still need catching up.

File:

• trunk/gsdl/perllib/mgbuildproc.pm (modified) (8 diffs)

trunk/gsdl/perllib/mgbuildproc.pm

@@ -34 +34 @@
 use docproc;
 use util;
-
 
 BEGIN {
@@ -187 +186 @@
 sub assoc_files {
     my $self = shift (@_);
-    my ($doc_obj) = @_;
+    my ($doc_obj, $archivedir) = @_;
+    my ($afile);
     
-    foreach $assoc_file (@{$doc_obj->get_assoc_files()}) {
-    $afile = &util::filename_cat($self->{'assocdir'}, $assoc_file->[1]);
+    foreach my $assoc_file (@{$doc_obj->get_assoc_files()}) {
+    # if assoc file contains directory structure of
+    # its own use it, otherwise use HASH... directory
+    if ($assoc_file->[1] =~ /[\/\\]/) {
+        $afile = &util::filename_cat($self->{'assocdir'}, $assoc_file->[1]);
+    } else {
+        $afile = &util::filename_cat($self->{'assocdir'}, $archivedir, $assoc_file->[1]);
+    }
     &util::hard_link ($assoc_file->[0], $afile);
     }
@@ -201 +207 @@
 #    $handle = "main::STDOUT";
 
-    $self->assoc_files ($doc_obj);
-
     my $doctype = $doc_obj->get_doc_type();
 
     # only output this document if it is one to be indexed
     return if ($doctype ne "indexed_doc");
+
+    my ($archivedir) = $filename =~ /^(.*?)(?:\/|\\)[^\/\\]*$/;
+    $archivedir = "" unless defined $archivedir;
+    $archivedir =~ s/\\/\//g;
+    $archivedir =~ s/^\/+//;
+    $archivedir =~ s/\/+$//;
+
+    $self->assoc_files ($doc_obj, $archivedir);
 
     # this is another document
@@ -239 +251 @@
     # output all the section metadata
     my $metadata = $doc_obj->get_all_metadata ($section);
-    foreach $pair (@$metadata) {
+    foreach my $pair (@$metadata) {
         my ($field, $value) = (@$pair);
 
@@ -266 +278 @@
     # output archivedir if at top level
     if ($section eq $doc_obj->get_top_section()) {
-        my ($archivedir) = $filename =~ /^(.*?)(?:\/|\\)[^\/\\]*$/;
-        $archivedir = "" unless defined $archivedir;
-        $archivedir =~ s/\\/\//g;
-        $archivedir =~ s/^\/+//;
-        $archivedir =~ s/\/+$//;
         print $handle "<archivedir>$archivedir\n";
     }
@@ -285 +292 @@
         print $handle "<contains>";
         my $firstchild = 1;
-        foreach $child (@$children) {
+        foreach my $child (@$children) {
         print $handle ";" unless $firstchild;
         $firstchild = 0;
@@ -348 +355 @@
 
     # see if this document belongs to this subcollection
-    foreach $indexexp (@{$self->{'indexexparr'}}) {
+    foreach my $indexexp (@{$self->{'indexexparr'}}) {
     $indexed_doc = 0;
     my ($field, $exp, $options) = split /\//, $indexexp;
@@ -397 +404 @@
     if ($indexed_doc) {
         $self->{'num_bytes'} += $doc_obj->get_text_length ($section);
-        foreach $field (split (/,/, $fields)) {
+        foreach my $field (split (/,/, $fields)) {
         # only deal with this field if it doesn't start with top or
         # this is the first section