Changeset 3957

Timestamp:

05/08/07 13:11:54 (6 years ago)

Author:

promag

Message:

adding support for debug. task improvement (detected strange bug on macro install)

Files:

• plugins/sfOpenOfficePlugin/config/app.yml (modified) (2 diffs)
• plugins/sfOpenOfficePlugin/config/ooffice-unix.sh (modified) (3 diffs)
• plugins/sfOpenOfficePlugin/data/tasks/sfPakeOpenOffice.php (modified) (5 diffs)
• plugins/sfOpenOfficePlugin/lib/sfOpenOfficeDocumentView.class.php (modified) (1 diff)
• plugins/sfOpenOfficePlugin/modules/sfOpenOfficeSetup/templates/secondSuccess.php (modified) (1 diff)

plugins/sfOpenOfficePlugin/config/app.yml

@@ -10 +10 @@
-      odt: 
-        pdf:    { name: writer_pdf_Export }
-s
+S
-
-    
@@ -23 +23 @@
-      xls:      { content-type: application/vnd.ms-excel }
-      doc:      { content-type: application/vnd.ms-word }
-
-

plugins/sfOpenOfficePlugin/config/ooffice-unix.sh

@@ -1 +1 @@
-#!/bin/bash
-
-
+
+
-
+### SETUP ###
+# $3 = document with convertion macros
+
+### DEBUG and RELEASE ###
+# $3 = input document
+# $4 = output document
+# $5 = filter for convertion
+
+
+# load plugin environment 
-source $1/ooffice-unix-env.sh
-
+# load plugin environment 
-if [ -x $1/../../../config/ooffice-unix-env.sh ]
-then
@@ -10 +22 @@
-fi
-
-
+
+
-then
-
@@ -17 +30 @@
-else
-
+if [ $2 = "debug" ]
+then
+
+  ${SOFFICE} -display :0.0 -norestore -invisible -headless -nologo "macro:///Standard.Convert.ConvertTo(\"$3\",\"$4\",\"$5\")"
-  
-
-
-
+
+
+
+
-
-fi

plugins/sfOpenOfficePlugin/data/tasks/sfPakeOpenOffice.php

@@ -32 +32 @@
-  }
-
-if (is_dir(sfConfig::get('sf_apps_dir') . DIRECTORY_SEPARATOR . $app))
-{
-
-}
-elseif (is_dir(sfConfig::get('sf_plugins_dir') . DIRECTORY_SEPARATOR . $app))
-{
+// Assume the document is in an application
+$app_dir = sfConfig::get('sf_root_dir') . DIRECTORY_SEPARATOR . sfConfig::get('sf_apps_dir_name') . DIRECTORY_SEPARATOR . $app;
+
+if (!is_dir($app_dir))
+{
+  // Maybe its in a plugin
-    $app_dir = sfConfig::get('sf_plugins_dir') . DIRECTORY_SEPARATOR . $app;
-
-else
-
-throw new Exception("The application or plugin $app doesn't exists");
-}
-
-if (is_dir($app_dir . DIRECTORY_SEPARATOR . sfConfig::get('sf_app_module_dir_name') . DIRECTORY_SEPARATOR . $module))
-
-  
-
-else
+
+  if(!is_dir($app_dir))
+  
+  // something failed
+    throw new Exception("The application or plugin $app doesn't exists");
+
+}
+
+
+
+if (!is_dir($moduleDir))
-  {
-    throw new Exception("The module $module doesn't exists");
-  }
+
+  // load plugin config (sfLoad::loadPluginConfig fails for some reason. maybe because there is no environment or application defined)
+  include(sfConfig::get('sf_plugins_dir') . DIRECTORY_SEPARATOR . 'sfOpenOfficePlugin' . DIRECTORY_SEPARATOR . sfConfig::get('sf_config_dir_name') . DIRECTORY_SEPARATOR . 'config.php');
-
-  $name      = $matches[1];
@@ -60 +63 @@
-  $viewsPath     = $modulePath    . sfConfig::get('sf_app_module_view_dir_name') . DIRECTORY_SEPARATOR;
-  $documentsPath = $modulePath    . sfConfig::get('sf_app_module_document_dir_name') . DIRECTORY_SEPARATOR;
+  $documentDir  = $documentsPath . $matches[1];
-  $documentPath  = $documentsPath . $matches[0];
-
@@ -72 +76 @@
-
-  // lets clear things up like unupdated files
-$documentPath
+pakeFinder::type('any')->in($documentDir), ''
-
-  // OpenOffice documents are zip files
@@ -90 +94 @@
-  // as such if the replacement is removed then we are "forcing" a render of the object
-  //pake_remove($documentPath, '');
+  if(file_exists($documentDir . DIRECTORY_SEPARATOR . 'ObjectReplacements'))
+  {
+    pake_echo('Removing Object Replacements');
+    pake_remove(pakeFinder::type('any')->in($documentDir . DIRECTORY_SEPARATOR . 'ObjectReplacements'), '');
+    unlink($documentDir . DIRECTORY_SEPARATOR . 'ObjectReplacements');
+  }
-
-  // This is to avoid anoying warnings of DomDocument::load
@@ -146 +156 @@
-  $documentClass = $name. 'SuccessView';
-
-
+
+
+
-
-  pake_echo_action('chmod 0777', $documentsPath);

plugins/sfOpenOfficePlugin/lib/sfOpenOfficeDocumentView.class.php

@@ -147 +147 @@
-    
-    $ret = shell_exec(sfConfig::get('sf_plugin_ooffice_script')     . ' ' .
-fal
+relea
-
-    if ( file_exists($outputPath) )

plugins/sfOpenOfficePlugin/modules/sfOpenOfficeSetup/templates/secondSuccess.php

@@ -13 +13 @@
-  <dd>
-    <code>
-true
+setup
-    </code>
-  </dd>