Changeset 13343

Timestamp:

2006-11-27T10:49:42+13:00 (17 years ago)

Author:

kjdon

Message:

small tidy up changes

File:

• trunk/gsdl/perllib/plugins/OpenDocumentPlug.pm (modified) (4 diffs)

trunk/gsdl/perllib/plugins/OpenDocumentPlug.pm

@@ -51 +51 @@
            'deft' =>  &get_default_process_exp() }
          ];
+
 my $options = { 'name'     => "OpenDocumentPlug",
         'desc'     => "{OpenDocumentPlug.desc}",
         'abstract' => "no",
-        'inherits' => "yes" };
+        'inherits' => "yes",
+        'args'     => $arguments};
 
 sub get_default_process_exp { return q^(?i)\.o(?:d|t)(?:t|s|p|g)$^; }
@@ -127 +129 @@
     }elsif($element eq 'office:body'){
     #some documents have text in other places that should probably be indexed if we can't find any doc text
-    if( $self->{'collectedText'} ne "" && $self->{'doc_obj'}->get_text("") eq "") {
+    
+    if( defined $self->{'collectedText'} && $self->{'collectedText'} ne "" && $self->{'doc_obj'}->get_text("") eq "") {
         $self->{'doc_obj'}->add_utf8_text("",$self->{'collectedText'});
     }
@@ -136 +139 @@
     my $self = shift(@_);
     my ($expat) = @_;
-    
     if($_ =~ m/\w/i) {
     $self->{'collectedText'} .= "<br/>" if $self->{'collectedText'} ne "";
@@ -176 +178 @@
     
     $self->unzip ("\"$file_only\"");
-    
     foreach my $xmlFile (@OpenDocumentPlug::filesProcess) {
-        print getcwd();
-        print $xmlFile;
-        $self->parse_file($xmlFile);
-    }
-        
+        if (-e $xmlFile) {
+        $self->parse_file($xmlFile);
+        }
+    }
     $self->close_document($filename,$file_only);