Changeset 7904

Timestamp:

2004-08-06T16:38:44+12:00 (20 years ago)

Author:

chi

Message:

Minor changes to layout of code.

Location:

trunk/gsdl/perllib

Files:

• arcinfo.pm (modified) (4 diffs)
• mgbuilder.pm (modified) (10 diffs)
• mgppbuilder.pm (modified) (1 diff)
• plugin.pm (modified) (5 diffs)

trunk/gsdl/perllib/arcinfo.pm

@@ -48 +48 @@
 
     $self->{'info'} = {};
-
+ 
     if (-e $filename) {
     open (INFILE, $filename) || 
@@ -61 +61 @@
         }
     }
-
     close (INFILE);
     }
@@ -74 +73 @@
     open (OUTFILE, ">$filename") || 
     die "arcinfo::save_info couldn't write $filename\n";
-
+  
     foreach $info (@{$self->get_OID_list()}) {
     if (defined $info) {
@@ -80 +79 @@
     }
     }
-    
     close (OUTFILE);
 }

trunk/gsdl/perllib/mgbuilder.pm

@@ -158 +158 @@
     }
     $self->{'pluginfo'} = &plugin::load_plugins ($plugins, $verbosity, $outhandle, $failhandle, \@global_opts);
+   
     if (scalar(@{$self->{'pluginfo'}}) == 0) {
     print $outhandle "No plugins were loaded.\n";
@@ -191 +192 @@
     $buildproctype = "mgbuildproc";
     }
+ 
     require "$buildprocdir/$buildproctype.pm";
 
@@ -264 +266 @@
     $self->{'buildproc'}->set_index ($textindex);
     $self->{'buildproc'}->set_indexing_text (0);
+
+
     if ($self->{'no_text'}) {
     $self->{'buildproc'}->set_store_text(0);
@@ -270 +274 @@
     }
     $self->{'buildproc'}->reset();
+
     &plugin::begin($self->{'pluginfo'}, $self->{'source_dir'}, 
            $self->{'buildproc'}, $self->{'maxdocs'});
@@ -275 +280 @@
            "", {}, $self->{'buildproc'}, $self->{'maxdocs'});
     &plugin::end($self->{'pluginfo'});
+    
 
     close ($handle) unless $self->{'debug'};
@@ -311 +317 @@
     &plugin::read ($self->{'pluginfo'}, $self->{'source_dir'}, 
            "", {}, $self->{'buildproc'}, $self->{'maxdocs'});
+
     close ($handle) unless $self->{'debug'};
 
@@ -635 +642 @@
            "", {}, $self->{'buildproc'}, $self->{'maxdocs'});
 
+   
     $self->print_stats ();
 
@@ -925 +933 @@
     my $num_bytes = $self->{'buildproc'}->get_num_bytes();
     my $num_processed_bytes = $self->{'buildproc'}->get_num_processed_bytes();
-
+    
     if ($indexing_text) {
     print $outhandle "Stats (Creating index $index)\n";
@@ -933 +941 @@
     print $outhandle "Total bytes in collection: $num_bytes\n";
     print $outhandle "Total bytes in $index: $num_processed_bytes\n";
-
+    
     if ($num_processed_bytes < 50 && ($indexing_text || !$self->{'no_text'})) {
     print $outhandle "***************\n";
@@ -948 +956 @@
 
 1;
+
+
+

trunk/gsdl/perllib/mgppbuilder.pm

@@ -305 +305 @@
     my $basefilename = "text/$self->{'collection'}";
     my $fulltextprefix = &util::filename_cat ($self->{'build_dir'}, $basefilename);
-
+    
    my $osextra = "";
     if ($ENV{'GSDLOS'} =~ /^windows$/i) {

trunk/gsdl/perllib/plugin.pm

@@ -83 +83 @@
     }
     $options =~ s/\$/\\\$/g;
-    
+
     eval ("\$plugobj = new \$pluginname($options)");
     die "$@" if $@;
@@ -100 +100 @@
 sub begin {
     my ($pluginfo, $base_dir, $processor, $maxdocs) = @_;
+   
 
     map { $_->begin($pluginfo, $base_dir, $processor, $maxdocs); } @$pluginfo;
@@ -106 +107 @@
 sub read {
     my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $gli, $aux) = @_;
+  
 
     $maxdocs = -1 unless defined $maxdocs && $maxdocs =~ /\d/;
     $gli = 0 unless defined $gli;
 
+ 
     my $rv = 0;
     my $glifile = $file;
+    
     $glifile =~ s/^[\/\\]+//; # file sometimes starts with a / so get rid of it
     # Announce to GLI that we are handling a file
     print STDERR "<File n='$glifile'>\n" if $gli;
 
+ 
     # the .kill file is a handy (if not very elegant) way of aborting 
     # an import.pl or buildcol.pl process
@@ -134 +139 @@
     $rv = $plugobj->read($pluginfo, $base_dir, $file, 
                  $metadata, $processor, $maxdocs, $gli, $aux);
-    if (defined $rv) {
+        if (defined $rv) {
         if ($rv == -1) {
-        # an error has occurred
+            # an error has occurred
         $had_error = 1;
         print STDERR "<ProcessingError n='$glifile'>\n" if $gli;
         } else {
-        return $rv;
+            return $rv;
         }
     } # else undefined - was not recognised by the plugin
     }
-    
+
     if ($had_error) {
     # was recognised but couldn't be processed
@@ -152 +157 @@
     # tell the GLI that it was not processed
     print STDERR "<NonProcessedFile n='$glifile'>\n" if $gli;
-    
+      
     $file =~ s/.*?([^\\\/]+)$/$1/;
     gsprintf($failhandle, "$file: {plugin.no_plugin_could_process_this_file}\n");