/[drupal]/contributions/modules/apachesolr_attachments/apachesolr_attachments.module
ViewVC logotype

Diff of /contributions/modules/apachesolr_attachments/apachesolr_attachments.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.15 by pwolanin, Tue Oct 27 23:56:58 2009 UTC revision 1.16 by pwolanin, Wed Nov 18 03:51:00 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: apachesolr_attachments.module,v 1.14 2009/10/27 21:57:13 pwolanin Exp $  // $Id: apachesolr_attachments.module,v 1.15 2009/10/27 23:56:58 pwolanin Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 249  function apachesolr_attachments_add_docu Line 249  function apachesolr_attachments_add_docu
249          $document->sticky = $node->sticky;          $document->sticky = $node->sticky;
250          $document->promote = $node->promote;          $document->promote = $node->promote;
251          $document->uid = $node->uid;          $document->uid = $node->uid;
252          $document->name = apachesolr_strip_ctl_chars($node->name);          $document->name = $node->name;
253          $document->body = apachesolr_clean_text($file->description) .' '. $text;          $document->body = apachesolr_clean_text($file->description) .' '. $text;
254    
255          $document->bs_file = TRUE;          $document->bs_file = TRUE;
# Line 456  function apachesolr_attachments_extract_ Line 456  function apachesolr_attachments_extract_
456    $tika = $tika_path .'/'. variable_get('apachesolr_attachments_tika_jar', 'tika-0.3.jar');    $tika = $tika_path .'/'. variable_get('apachesolr_attachments_tika_jar', 'tika-0.3.jar');
457    
458    $java = variable_get('apachesolr_attachments_java', 'java');    $java = variable_get('apachesolr_attachments_java', 'java');
459    $cmd = escapeshellcmd($java .' -cp '. $tika_path .' -jar '. $tika .' -t "'. $filepath .'"');    // By default force UTF-8 output.
460      $java_opts = ' ' . variable_get('apachesolr_attachments_java_opts', '-Dfile.encoding=UTF8');
461      $cmd = escapeshellcmd($java . $java_opts .' -cp '. $tika_path .' -jar '. $tika .' -t "'. $filepath .'"');
462    
463    // Add a work-around for a MAMP bug.    // Add a work-around for a MAMP bug.
464    if (strpos(ini_get('extension_dir'), 'MAMP/')) {    if (strpos(ini_get('extension_dir'), 'MAMP/')) {
Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16
  ViewVC Help
Powered by ViewVC 1.1.3