Changeset 3148

Timestamp:

2002-06-17T10:28:16+12:00 (21 years ago)

Author:

jrm21

Message:

If a document has associated files that are also given a subdirectory, that subdirectory is now a subdir of the HASH... dir and not just a subdir of the assoc dir. If the given subdir starts with a '/' then it will be a subdir of the assoc dir.

Eg
"1.jpg" will be put into building/assoc/HASHnnn.dir/1.jpg
"0/1.jpg" will be put into building/assoc/HASHnnn.dir/0/1.jpg
"/foo/1.jpg" -> building/assoc/foo/1.jpg

This is because HTMLPlug was putting first 1000 assoc files into "assoc/0", next thousand into "assoc/1", etc. But this meant that if you updated a collection, files in "0" would get overridden.

The only change to HTMLPlug is to use the _httpdocimg_ macro instead of the _httpcolling_ so we link to the right place.

Location:

trunk/gsdl/perllib

Files:

• mgbuildproc.pm (modified) (1 diff)
• mgppbuildproc.pm (modified) (1 diff)
• plugins/HTMLPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/mgbuildproc.pm

@@ -239 +239 @@
     
     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]);
+    # if assoc file starts with a slash, we put it relative to the assoc
+    # dir, otherwise it is relative to the HASH... directory
+    if ($assoc_file->[1] =~ m@^[/\\]@) {
+        $afile = &util::filename_cat($self->{'assocdir'},$assoc_file->[1]);
     } else {
         $afile = &util::filename_cat($self->{'assocdir'}, $archivedir, $assoc_file->[1]);

trunk/gsdl/perllib/mgppbuildproc.pm

@@ -272 +272 @@
     
     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]);
+    # if assoc file starts with a slash, we put it relative to the assoc
+    # dir, otherwise it is relative to the HASH... directory
+    if ($assoc_file->[1] =~ m@^[/\\]@) {
+        $afile = &util::filename_cat($self->{'assocdir'},$assoc_file->[1]);
     } else {
         $afile = &util::filename_cat($self->{'assocdir'}, $archivedir, $assoc_file->[1]);

trunk/gsdl/perllib/plugins/HTMLPlug.pm

@@ -149 +149 @@
       $file =~ s@(\\)+@/@g; 
     }
+
+    # reset per-doc stuff...
+    $self->{'aux_files'} = {};
+    $self->{'dir_num'} = 0;
+    $self->{'file_num'} = 0;
+
     my $cursection = $doc_obj->get_top_section();
 
@@ -372 +378 @@
     }
     $doc_obj->associate_file($filename, $newname, undef, $section);
-    return "_httpcollimg_/$newname";
+    return "_httpdocimg_/$newname";
 
     } else {