Changeset 1396 for trunk

Timestamp:

2000-08-11T13:46:39+12:00 (24 years ago)

Author:

say1

Message:

changed initialisation code for acronyms

Location:

trunk/gsdl/perllib

Files:

• acronym.pm (modified) (8 diffs)
• plugins/BasPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/acronym.pm

@@ -50 +50 @@
 #allow recusive acronyms
 my $allow_recursive = "";
+#let definitions be all capitals
+my $allow_all_caps = 0;
 
 my @stop_words = split / /, "OF AT THE IN TO AND";
@@ -75 +77 @@
 ###########################################################################
 
-sub init_acronyms {
+sub initialise_acronyms {
     
     my $file_text = "";
@@ -102 +104 @@
     print ACRONYM_HANDLE "#minimum acronym length (raise to raise precision)\n";
     print ACRONYM_HANDLE "\$min_def_length = 3;\n\n";
+    print ACRONYM_HANDLE "#let definitions be all capitals\n";
+    print ACRONYM_HANDLE "\$allow_all_caps = 0;\n\n";
     print ACRONYM_HANDLE "#minimum acronym length (raise to raise precision)\n";
     print ACRONYM_HANDLE "\$min_acro_length = 3;\n\n";
@@ -149 +153 @@
 
 #close the list of accumulated acronyms
-END {
+sub finalise_acronyms {
     if ($writing_acronyms)
     {
@@ -160 +164 @@
 sub read_all_acronyms_from_file {
     
-    my $file_text = "";
+    my $file_text = " ";
     if (open ACRONYM_HANDLE, "<$acronym_accumulate_file")
     {
@@ -415 +419 @@
 #       "|" . $self->letters_in_acronym() .
 #       "|" . $self->letters_in_acronym_definition() . "\n";
+    return 0;
+    }
+    if (!$allow_all_caps && 
+    $self->to_def_string() eq uc($self->to_def_string()))
+    {
+#   print "acronym " . $self->to_string() . " rejected (all upper)\n";
     return 0;
     }
@@ -514 +524 @@
     $$processed_text =~ s/[^A-Za-z]/ /g;
     $$processed_text =~ s/\s+/ /g;
+    $$processed_text =~ s/(\n|\>)References.*/ /g;
+    $$processed_text =~ s/(\n|\>)Bibliography.*/ /g;
 
     #clear some global variables
@@ -633 +645 @@
 #&test();
 
-&init_acronyms();
-
 1;
 

trunk/gsdl/perllib/plugins/BasPlug.pm

@@ -137 +137 @@
     my $self = shift (@_);
     my ($pluginfo, $base_dir, $processor, $maxdocs) = @_;
+    $self->initialise_extractors();
 }
 
 sub end {
     my ($self) = @_;
+    $self->finalise_extractors();
 }
 
@@ -282 +284 @@
         $doc_obj->add_utf8_metadata ($cursection, $field, $metadata->{$field}); 
     }
+    }
+}
+
+# initialise metadata extractors
+sub initialise_extractors {
+    my $self = shift (@_);
+
+    if ($self->{'extract_acronyms'} || $self->{'markup_acronyms'}) {
+    &acronym::initialise_acronyms();
+    }
+}
+
+# finalise metadata extractors
+sub finalise_extractors {
+    my $self = shift (@_);
+
+    if ($self->{'extract_acronyms'} || $self->{'markup_acronyms'}) {
+    &acronym::finalise_acronyms();
     }
 }