Changeset 12844 for trunk/gsdl/perllib/plugins/GAPlug.pm

Timestamp:

2006-09-25T14:17:10+12:00 (18 years ago)

Author:

mdewsnip

Message:

Incremental building and dynamic GDBM updating code, many thanks to John Rowe and John Thompson at DL Consulting Ltd.

File:

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

trunk/gsdl/perllib/plugins/GAPlug.pm

@@ -70 +70 @@
     $self->{'metadata_value'} = "";
     $self->{'content'} = "";
+
+#    # Currently used to store information for previous values controls. In
+#    # the next contract I'll move to using information directly from Lucene.
+#    $self->{'sqlfh'} = 0;
    
     return bless $self, $class;
@@ -128 +132 @@
     elsif ($element eq "Metadata") {
     $self->{'doc_obj'}->add_utf8_metadata($self->{'section'}, $self->{'metadata_name'},$self->{'metadata_value'});
+        # Ensure this value is added to the allvalues database in gseditor.
+        # Note that the database constraints prevent multiple occurances of the
+        # same key-value pair.
+        # We write these out to a file, so they can all be commited in one
+        # transaction
+        #if (!$self->{'sqlfh'})
+        #  {
+        #    my $sql_file = $ENV{'GSDLHOME'} . "/collect/lld/tmp/gseditor.sql";
+        #    # If the file doesn't already exist, open it and begin a transaction
+        #    my $sql_fh;
+        #    if (!-e $sql_file)
+        #      {
+        #        open($sql_fh, ">" . $sql_file);
+        #        print $sql_fh "BEGIN TRANSACTION;\n";
+        #      }
+        #    else
+        #      {
+        #        open($sql_fh, ">>" . $sql_file);
+        #      }
+        #    print STDERR "Opened SQL log\n";
+        #    $self->{'sqlfh'} = $sql_fh;
+        #  }
+
+        #my $mvalue = $self->{'metadata_value'};
+        #$mvalue =~ s/\'/\'\'/g;
+        #$mvalue =~ s/_claimantsep_/ \& /g;
+
+        #my $fh = $self->{'sqlfh'};
+        #if ($fh)
+        #  {
+        #    print $fh "INSERT INTO allvalues (mkey, mvalue) VALUES ('" . $self->{'metadata_name'} . "', '" . $mvalue . "');\n";
+        #  }
+
+        # Clean Up
     $self->{'metadata_name'} = "";
     $self->{'metadata_value'} = "";
@@ -135 +173 @@
     $self->{'content'} = "";
     }
-    
     $self->{'element'} = "";
 }
@@ -161 +198 @@
 sub close_document {
     my $self = shift(@_);
-    
+
     # add the associated files
     my $assoc_files = 
@@ -170 +207 @@
 
     my $assoc_filepath=shift (@$assoc_filepath_list);
-    if (defined ($assoc_filepath)) {
-    # make absolute rather than relative...
-    $self->{'filename'} =~ m@^(.*[\\/]archives)@;
-    $assoc_filepath = "$1/$assoc_filepath/";
-    } else {
+
+    #rint STDERR "Filename is: " . $self->{'filename'} . "\n";
+    #rint STDERR "Initially my assoc_filepath is: $assoc_filepath\n";
+    #rint STDERR "Custom archive dir is: " . $self->{'base_dir'} . "\n";
+    # Correct the assoc filepath if one is defined
+    if (defined ($assoc_filepath))
+      {
+        # Check whether the assoc_filepath already includes the base dir
+        if (index($assoc_filepath, $self->{'base_dir'}) == -1)
+          {
+            # And if not, append it so as to make this absolute
+            $assoc_filepath = &util::filename_cat($self->{'base_dir'}, $assoc_filepath);
+          }
+      }
+    else
+      {
     $assoc_filepath = $self->{'filename'};
     $assoc_filepath =~ s/[^\\\/]*$//;
-    }
+      }
+    #rint STDERR "Goned and made it absolute: $assoc_filepath\n";
 
     foreach my $assoc_file_info (@$assoc_files) {
     my ($assoc_file, $mime_type, $dir) = split (":", $assoc_file_info);
+        #rint STDERR "assoc_file: $assoc_file\n";
+        #rint STDERR "mime_type: $mime_type\n";
+        #rint STDERR "dir: $dir\n";
     my $real_dir = &util::filename_cat($assoc_filepath, $assoc_file),
     my $assoc_dir = (defined $dir && $dir ne "") 
         ? &util::filename_cat($dir, $assoc_file) : $assoc_file;
     $self->{'doc_obj'}->associate_file($real_dir, $assoc_dir, $mime_type);
+        #rint STDERR "According to me the real assoc_filepath is: $real_dir\n";
     }
     $self->{'doc_obj'}->delete_metadata($self->{'doc_obj'}->get_top_section(), "gsdlassocfile");