Changeset 32533
- Timestamp:
- 2018-10-23T17:27:36+13:00 (6 years ago)
- Location:
- main/trunk/greenstone2/perllib/plugouts
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/plugouts/GreenstoneSQLPlugout.pm
r32531 r32533 185 185 } 186 186 187 # produce files called docsql.xml instead of doc.xml 188 sub get_short_doc_file { 189 my $self = shift (@_); 190 my ($doc_dir) = @_; 191 return &FileUtils::filenameConcatenate($doc_dir, "docsql.xml"); 192 } 193 194 # produce files called docsql.xml instead of doc.xml 195 sub get_output_file { 196 my $self = shift (@_); 197 my ($doc_dir) = @_; 198 return &FileUtils::filenameConcatenate($self->{'output_dir'}, $doc_dir, "docsql.xml"); 199 } 187 200 188 201 # TODO: check arc-inf.db for whether each entry is to be deleted/indexed/reindexed/been indexed … … 290 303 } 291 304 else { 292 293 $metadata_table_sth->execute($doc_oid, $section_name, $meta_name, $escaped_meta_value) || warn ("Unable to write metadata row to db:\n\tOID $doc_oid, section $section_name,\n\tmeta name: $meta_name, val: $escaped_meta_value"); 305 306 $metadata_table_sth->execute($doc_oid, $section_name, $meta_name, $escaped_meta_value) 307 || warn ("Unable to write metadata row to db:\n\tOID $doc_oid, section $section_name,\n\tmeta name: $meta_name, val: $escaped_meta_value"); 294 308 # Execution failure will print out info anyway: since db connection sets PrintError 295 309 } … … 311 325 312 326 # Write out the current section's text to collection db's FULLTeXT table 313 $fulltxt_table_sth->execute($doc_oid, $section_name, $section_text) || warn ("Unable to write fulltxt row to db for row:\n\tOID $doc_oid, section $section_name"); 327 $fulltxt_table_sth->execute($doc_oid, $section_name, $section_text) 328 || warn ("Unable to write fulltxt row to db for row:\n\tOID $doc_oid, section $section_name"); 314 329 # Execution failure will print out info anyway: since db connection sets PrintError 315 330 } -
main/trunk/greenstone2/perllib/plugouts/GreenstoneXMLPlugout.pm
r32513 r32533 134 134 } 135 135 } 136 $self->{'short_doc_file'} = &FileUtils::filenameConcatenate($doc_dir, "doc.xml");136 $self->{'short_doc_file'} = $self->get_short_doc_file($doc_dir); #&FileUtils::filenameConcatenate($doc_dir, "doc.xml"); 137 137 138 138 $self->store_output_info_reference($doc_obj); 139 139 140 } 141 142 # can be overridden in subclasses, for instance by GreenstoneSQLPlugout, to produce a different filename 143 # like docsql.xml 144 sub get_short_doc_file { 145 my $self = shift (@_); 146 my ($doc_dir) = @_; 147 return &FileUtils::filenameConcatenate($doc_dir, "doc.xml"); 148 } 149 150 # can be overridden in subclasses, for instance by GreenstoneSQLPlugout, to produce a different filename 151 # like docsql.xml 152 sub get_output_file { 153 my $self = shift (@_); 154 my ($doc_dir) = @_; 155 return &FileUtils::filenameConcatenate($self->{'output_dir'}, $doc_dir, "doc.xml"); 140 156 } 141 157 … … 159 175 $outhandler = $self->{'group_outhandler'}; 160 176 } else { 161 $output_file = &FileUtils::filenameConcatenate($self->{'output_dir'}, $doc_dir, "doc.xml");177 $output_file = $self->get_output_file($doc_dir); #&FileUtils::filenameConcatenate($self->{'output_dir'}, $doc_dir, "doc.xml"); 162 178 # open the new handle 163 179 $self->open_xslt_pipe($output_file, $self->{'xslt_file'});
Note:
See TracChangeset
for help on using the changeset viewer.