Changeset 28802

Timestamp:

2014-01-30T15:11:04+13:00 (9 years ago)

Author:

ak19

Message:

Removed 'die' statements in favour of rint to STDERR to allow the perl process to continue, rather than stopping abruptly.

Location:

gs2-extensions/apache-jena/trunk/src/perllib

Files:

• jenaTDBBuilder.pm (modified) (1 diff)
• jenaTDBBuildproc.pm (modified) (5 diffs)

gs2-extensions/apache-jena/trunk/src/perllib/jenaTDBBuilder.pm

@@ -98 +98 @@
 
     }
-
+    
     # Run the docs through the jenaTDB document processor
 
     $self->{'buildproc'}->set_mode ('text');
     $self->{'buildproc'}->reset();
+
+    # If '-removeold' in effect (i.e. *not* keepold), then clear out
+    # the triple-store graph for this collection
+
+    if (!$self->{'keepold'}) {
+    my $collection = $self->{'collection'};
+    my $cmd = "gs-triplestore-reset $collection";
+        
+    my $status = system($cmd);
+    if ($status == 0) {
+        print $outhandle "    => removeold: Deleting triplestore graph for $collection\n";
+    }
+    else {
+        print STDERR "Error: failed to run:\n  $cmd\n$!\n";
+        print STDERR "       Graph has not been deleted\n";
+    }
+    }
+
     &plugin::begin($self->{'pluginfo'}, $self->{'source_dir'},
            $self->{'buildproc'}, $self->{'maxdocs'});

gs2-extensions/apache-jena/trunk/src/perllib/jenaTDBBuildproc.pm

@@ -148 +148 @@
     }
     
-    open(*XMLWRITER, $cmd)
-    or die "can't open pipe to xslt: $!";
-    
-    $self->{'xslt_writer'} = *XMLWRITER;
-
-    print XMLWRITER "<?DocStart?>\n";       
-    print XMLWRITER "$output_file_name\n";
- 
+    if (!open(*XMLWRITER, $cmd)) {
+    print STDERR "Can't open pipe to xslt: $!";
+    print STDERR "Command was:\n  $cmd\n";
+    $self->{'xslt_writer'} = undef;
+    }
+    else {
+    $self->{'xslt_writer'} = *XMLWRITER;
+    
+    print XMLWRITER "<?DocStart?>\n";       
+    print XMLWRITER "$output_file_name\n";
+    }
   }
   
@@ -163 +166 @@
   my $self = shift @_;
 
-  
   return unless defined $self->{'xslt_writer'} ;
     
@@ -203 +205 @@
     $self->open_xslt_pipe($tmp_doc_filename_cc, $xslt_filename); # stops with error if not able to open pipe
 
-    my $outhandler = $self->{'xslt_writer'};
-    binmode($outhandler,":utf8");
-
-    my $section_text = &docprint::get_section_xml($doc_obj,$doc_obj->get_top_section());
+    my $xml_outhandler = $self->{'xslt_writer'};
+
+    if (defined $xml_outhandler) {
+    binmode($xml_outhandler,":utf8");
+
+    my $section_text = &docprint::get_section_xml($doc_obj,$doc_obj->get_top_section());
 
 #    $section_text =~ s/[\r\n]+$//s; # remove very last newline char
@@ -229 +233 @@
 #    exit -1;
 
-    $section_text =~ s/(<Metadata[^>]*>)(.*?)(<\/Metadata>)/&make_ttl_safe($1,$2,$3)/gse;
+    $section_text =~ s/(<Metadata[^>]*>)(.*?)(<\/Metadata>)/&make_ttl_safe($1,$2,$3)/gse;
 
 ## $1&make_ttl_safe($2)$3
@@ -236 +240 @@
 
 
-    print $outhandler $section_text;
+    print $xml_outhandler $section_text;
+    }
 
     $self->close_xslt_pipe();
 
-    # now feed to generated file to jena's (TDB) tripple store
+    # now feed the generated file to jena's (TDB) tripple store
 
     my $outhandle = $self->{'outhandle'};