diff --git a/modules/convert/batch/config/config.xml.default b/modules/convert/batch/config/config.xml.default
index fd5098bec5f8b7b968d3efaba22db21ca6326aa2..7094b227dffadc524911ca8cc852b3b20d468495 100644
--- a/modules/convert/batch/config/config.xml.default
+++ b/modules/convert/batch/config/config.xml.default
@@ -2,14 +2,14 @@
<ROOT>
<CONFIG>
<Lang>fr</Lang> <!-- fr, en-->
- <MaarchDirectory>/var/www/html/maarch_oem/</MaarchDirectory>
- <TmpDirectory>/var/www/html/maarch_oem/modules/convert/batch/tmp/</TmpDirectory>
+ <MaarchDirectory>/var/www/html/MaarchCourrier/</MaarchDirectory>
+ <TmpDirectory>/var/www/html/MaarchCourrier/modules/convert/batch/tmp/</TmpDirectory>
<LogLevel>INFO</LogLevel> <!-- DEBUG, INFO, NOTICE, WARNING, ERROR-->
<DisplayedLogLevel>INFO</DisplayedLogLevel> <!-- DEBUG, INFO, NOTICE, WARNING, ERROR-->
- <StackSizeLimit>100</StackSizeLimit>
- <ApacheUserAndGroup>www-data:www-data</ApacheUserAndGroup>
- <UnoconvPath>C:\xampp\htdocs\unoconv\</UnoconvPath> <!-- only for Windows -->
- <OpenOfficePath>C:\Program Files\OpenOffice.org 4\program\</OpenOfficePath> <!-- only for Windows -->
+ <StackSizeLimit>50</StackSizeLimit>
+ <ApacheUserAndGroup>lgi:lgi</ApacheUserAndGroup>
+ <UnoconvPath>unoconv</UnoconvPath> <!-- only for Windows -->
+ <OpenOfficePath>soffice</OpenOfficePath> <!-- only for Windows -->
<UnoconvOptions>--port 8100</UnoconvOptions>
<RegExResId>false</RegExResId>
<StartDateRecovery>false</StartDateRecovery> <!-- false or date dd/mm/yyyy -->
@@ -31,7 +31,7 @@
<databaseserver>127.0.0.1</databaseserver>
<databaseserverport>5432</databaseserverport>
<databasetype>POSTGRESQL</databasetype>
- <databasename>maarch_oem</databasename>
+ <databasename>MaarchCourrier</databasename>
<databaseuser>maarch</databaseuser>
<databasepassword>maarch</databasepassword>
</CONFIG_BASE>
@@ -40,17 +40,26 @@
<Table>res_letterbox</Table>
<View>res_view_letterbox</View>
<Adr>adr_letterbox</Adr>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/letterbox_coll/</path_to_lucene_index>
</COLLECTION>
<COLLECTION>
<Id>attachments_coll</Id>
<Table>res_attachments</Table>
<View>res_view_attachments</View>
<Adr>adr_attachments</Adr>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/attachments_coll/</path_to_lucene_index>
+ </COLLECTION>
+ <COLLECTION>
+ <Id>version_attachments_coll</Id>
+ <Table>res_version_attachments</Table>
+ <View>res_version_attachments</View>
+ <Adr>adr_attachments_version</Adr>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/version_attachments_coll/</path_to_lucene_index>
</COLLECTION>
<LOG4PHP>
<enabled>true</enabled>
<Log4PhpLogger>loggerTechnique</Log4PhpLogger>
<Log4PhpBusinessCode>Convert</Log4PhpBusinessCode>
- <Log4PhpConfigPath>/var/www/html/maarch_oem/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
+ <Log4PhpConfigPath>/var/www/html/MaarchCourrier/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
</LOG4PHP>
-</ROOT>
+</ROOT>
\ No newline at end of file
diff --git a/modules/convert/batch/config/config_only_convert.xml b/modules/convert/batch/config/config_only_convert.xml.default
similarity index 61%
rename from modules/convert/batch/config/config_only_convert.xml
rename to modules/convert/batch/config/config_only_convert.xml.default
index 0025d92aa56006c24aa02876b1ce9b36fc7fa5f2..55549d7aa49458c8e7b7092734cf17665c77fb97 100644
--- a/modules/convert/batch/config/config_only_convert.xml
+++ b/modules/convert/batch/config/config_only_convert.xml.default
@@ -2,8 +2,8 @@
<ROOT>
<CONFIG>
<Lang>fr</Lang> <!-- fr, en-->
- <MaarchDirectory>/var/www/html/oem_V2/</MaarchDirectory>
- <TmpDirectory>/var/www/html/oem_V2/modules/convert/batch/tmp/</TmpDirectory>
+ <MaarchDirectory>/var/www/html/MaarchCourrier/</MaarchDirectory>
+ <TmpDirectory>/var/www/html/MaarchCourrier/modules/convert/batch/tmp/</TmpDirectory>
<LogLevel>INFO</LogLevel> <!-- DEBUG, INFO, NOTICE, WARNING, ERROR-->
<DisplayedLogLevel>INFO</DisplayedLogLevel> <!-- DEBUG, INFO, NOTICE, WARNING, ERROR-->
<StackSizeLimit>1000</StackSizeLimit>
@@ -33,7 +33,7 @@
<databaseserver>127.0.0.1</databaseserver>
<databaseserverport>5432</databaseserverport>
<databasetype>POSTGRESQL</databasetype>
- <databasename>sipol_v2</databasename>
+ <databasename>MaarchCourrier</databasename>
<databaseuser>maarch</databaseuser>
<databasepassword>maarch</databasepassword>
</CONFIG_BASE>
@@ -47,49 +47,21 @@
<COLLECTION>
<Id>attachments_coll</Id>
<Table>res_attachments</Table>
- <View>res_attachments</View>
+ <View>res_view_attachments</View>
<Adr>adr_attachments</Adr>
<path_to_lucene_index>/opt/maarch/docservers/indexes/attachments_coll/</path_to_lucene_index>
</COLLECTION>
<COLLECTION>
- <Id>attachments_version_coll</Id>
+ <Id>version_attachments_coll</Id>
<Table>res_version_attachments</Table>
<View>res_version_attachments</View>
<Adr>adr_attachments_version</Adr>
- <path_to_lucene_index>/opt/maarch/docservers/indexes/attachments_version_coll/</path_to_lucene_index>
- </COLLECTION>
- <COLLECTION>
- <Id>calendar_coll</Id>
- <Table>calendar_event_attachments</Table>
- <View>calendar_event_attachments</View>
- <Adr>calendar_event_adr_attachments</Adr>
- <path_to_lucene_index>/opt/maarch/docservers/indexes/calendar_coll/</path_to_lucene_index>
- </COLLECTION>
- <COLLECTION>
- <Id>folder_coll</Id>
- <Table>res_folder</Table>
- <View>res_folder</View>
- <Adr>adr_folder</Adr>
- <path_to_lucene_index>/opt/maarch/docservers/indexes/folder_coll/</path_to_lucene_index>
- </COLLECTION>
- <COLLECTION>
- <Id>chrono_coll</Id>
- <Table>res_chrono</Table>
- <View>res_chrono</View>
- <Adr>adr_chrono</Adr>
- <path_to_lucene_index>/opt/maarch/docservers/indexes/chrono_coll/</path_to_lucene_index>
- </COLLECTION>
- <COLLECTION>
- <Id>reprise_coll</Id>
- <Table>res_reprise</Table>
- <View>res_reprise</View>
- <Adr>adr_reprise</Adr>
- <path_to_lucene_index>/opt/maarch/docservers/indexes/reprise_coll/</path_to_lucene_index>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/version_attachments_coll/</path_to_lucene_index>
</COLLECTION>
<LOG4PHP>
<enabled>true</enabled>
<Log4PhpLogger>loggerTechnique</Log4PhpLogger>
<Log4PhpBusinessCode>Convert</Log4PhpBusinessCode>
- <Log4PhpConfigPath>/var/www/html/oem_V2/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
+ <Log4PhpConfigPath>/var/www/html/MaarchCourrier/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
</LOG4PHP>
-</ROOT>
+</ROOT>
\ No newline at end of file
diff --git a/modules/convert/batch/config/config_only_indexes.xml b/modules/convert/batch/config/config_only_indexes.xml.default
similarity index 61%
rename from modules/convert/batch/config/config_only_indexes.xml
rename to modules/convert/batch/config/config_only_indexes.xml.default
index edf18cd3b20eac3ad27e50ef579c7bfad3180f4c..71c692441f10fa5996ae2b4751cad7c0de216da7 100644
--- a/modules/convert/batch/config/config_only_indexes.xml
+++ b/modules/convert/batch/config/config_only_indexes.xml.default
@@ -2,8 +2,8 @@
<ROOT>
<CONFIG>
<Lang>fr</Lang> <!-- fr, en-->
- <MaarchDirectory>/var/www/html/oem_V2/</MaarchDirectory>
- <TmpDirectory>/var/www/html/oem_V2/modules/convert/batch/tmp/</TmpDirectory>
+ <MaarchDirectory>/var/www/html/MaarchCourrier/</MaarchDirectory>
+ <TmpDirectory>/var/www/html/MaarchCourrier/modules/convert/batch/tmp/</TmpDirectory>
<LogLevel>INFO</LogLevel> <!-- DEBUG, INFO, NOTICE, WARNING, ERROR-->
<DisplayedLogLevel>INFO</DisplayedLogLevel> <!-- DEBUG, INFO, NOTICE, WARNING, ERROR-->
<StackSizeLimit>1000</StackSizeLimit>
@@ -33,7 +33,7 @@
<databaseserver>127.0.0.1</databaseserver>
<databaseserverport>5432</databaseserverport>
<databasetype>POSTGRESQL</databasetype>
- <databasename>sipol_v2</databasename>
+ <databasename>MaarchCourrier</databasename>
<databaseuser>maarch</databaseuser>
<databasepassword>maarch</databasepassword>
</CONFIG_BASE>
@@ -47,49 +47,21 @@
<COLLECTION>
<Id>attachments_coll</Id>
<Table>res_attachments</Table>
- <View>res_attachments</View>
+ <View>res_view_attachments</View>
<Adr>adr_attachments</Adr>
<path_to_lucene_index>/opt/maarch/docservers/indexes/attachments_coll/</path_to_lucene_index>
</COLLECTION>
<COLLECTION>
- <Id>attachments_version_coll</Id>
+ <Id>version_attachments_coll</Id>
<Table>res_version_attachments</Table>
<View>res_version_attachments</View>
<Adr>adr_attachments_version</Adr>
- <path_to_lucene_index>/opt/maarch/docservers/indexes/attachments_version_coll/</path_to_lucene_index>
- </COLLECTION>
- <COLLECTION>
- <Id>calendar_coll</Id>
- <Table>calendar_event_attachments</Table>
- <View>calendar_event_attachments</View>
- <Adr>calendar_event_adr_attachments</Adr>
- <path_to_lucene_index>/opt/maarch/docservers/indexes/calendar_coll/</path_to_lucene_index>
- </COLLECTION>
- <COLLECTION>
- <Id>folder_coll</Id>
- <Table>res_folder</Table>
- <View>res_folder</View>
- <Adr>adr_folder</Adr>
- <path_to_lucene_index>/opt/maarch/docservers/indexes/folder_coll/</path_to_lucene_index>
- </COLLECTION>
- <COLLECTION>
- <Id>chrono_coll</Id>
- <Table>res_chrono</Table>
- <View>res_chrono</View>
- <Adr>adr_chrono</Adr>
- <path_to_lucene_index>/opt/maarch/docservers/indexes/chrono_coll/</path_to_lucene_index>
- </COLLECTION>
- <COLLECTION>
- <Id>reprise_coll</Id>
- <Table>res_reprise</Table>
- <View>res_reprise</View>
- <Adr>adr_reprise</Adr>
- <path_to_lucene_index>/opt/maarch/docservers/indexes/reprise_coll/</path_to_lucene_index>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/version_attachments_coll/</path_to_lucene_index>
</COLLECTION>
<LOG4PHP>
<enabled>true</enabled>
<Log4PhpLogger>loggerTechnique</Log4PhpLogger>
<Log4PhpBusinessCode>Convert</Log4PhpBusinessCode>
- <Log4PhpConfigPath>/var/www/html/oem_V2/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
+ <Log4PhpConfigPath>/var/www/html/MaarchCourrier/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
</LOG4PHP>
</ROOT>
diff --git a/modules/convert/batch/config/config_reprise_oem.xml.default b/modules/convert/batch/config/config_reprise_oem.xml.default
deleted file mode 100644
index afc01e3555a31ff866c91149dbdcc9b638f35bc3..0000000000000000000000000000000000000000
--- a/modules/convert/batch/config/config_reprise_oem.xml.default
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ROOT>
- <CONFIG>
- <Lang>fr</Lang> <!-- fr, en-->
- <MaarchDirectory>/var/www/html/maarch_oem/</MaarchDirectory>
- <TmpDirectory>/var/www/html/maarch_oem/modules/convert/batch/tmp/</TmpDirectory>
- <LogLevel>INFO</LogLevel> <!-- DEBUG, INFO, NOTICE, WARNING, ERROR-->
- <DisplayedLogLevel>INFO</DisplayedLogLevel> <!-- DEBUG, INFO, NOTICE, WARNING, ERROR-->
- <StackSizeLimit>50</StackSizeLimit>
- <ApacheUserAndGroup>maarch:maarch</ApacheUserAndGroup>
- <UnoconvPath>unoconv</UnoconvPath> <!-- only for Windows -->
- <OpenOfficePath>soffice</OpenOfficePath> <!-- only for Windows -->
- <UnoconvOptions>--port 8100</UnoconvOptions>
- <RegExResId>false</RegExResId>
- <StartDateRecovery>false</StartDateRecovery> <!-- false or date dd/mm/yyyy -->
- <CurrentMonthOnly>false</CurrentMonthOnly> <!-- true or false -->
- </CONFIG>
- <CONVERT>
- <OutputFormat>pdf</OutputFormat>
- <InputFormat>odt,ott,odm,html,oth,ods,ots,odg,otg,odp,otp,odf,doc,docx,xls,xlsx,ppt,pptx,tiff,tif,png,jpeg,jpg,gif</InputFormat>
- </CONVERT>
- <CONVERT>
- <OutputFormat>html</OutputFormat>
- <InputFormat>odt,ods,doc,docx,xls,xlsx,ppt,pptx</InputFormat>
- </CONVERT>
- <CONVERT>
- <OutputFormat>png</OutputFormat>
- <InputFormat>odt,ods,doc,docx,xls,xlsx,ppt,pptx</InputFormat>
- </CONVERT>
- <CONFIG_BASE>
- <databaseserver>127.0.0.1</databaseserver>
- <databaseserverport>5432</databaseserverport>
- <databasetype>POSTGRESQL</databasetype>
- <databasename>maarch_dev</databasename>
- <databaseuser>maarch</databaseuser>
- <databasepassword>maarch</databasepassword>
- </CONFIG_BASE>
- <COLLECTION>
- <Id>reprise_coll</Id>
- <Table>res_reprise</Table>
- <View>res_reprise</View>
- <Adr>adr_reprise</Adr>
- <path_to_lucene_index>/opt/maarch/docservers/indexes/reprise_coll/</path_to_lucene_index>
- </COLLECTION>
- <LOG4PHP>
- <enabled>false</enabled>
- <Log4PhpLogger>loggerTechnique</Log4PhpLogger>
- <Log4PhpBusinessCode>Convert</Log4PhpBusinessCode>
- <Log4PhpConfigPath>/var/www/html/maarch_oem/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
- </LOG4PHP>
-</ROOT>
diff --git a/modules/convert/batch/config/parallel/config_0.xml.default b/modules/convert/batch/config/parallel/config_0.xml.default
index ee8a91e98a81a21eb176c685008772fce77422a0..28a7ec2312c24ae8c714d075cd0a6673d4197256 100644
--- a/modules/convert/batch/config/parallel/config_0.xml.default
+++ b/modules/convert/batch/config/parallel/config_0.xml.default
@@ -2,14 +2,14 @@
<ROOT>
<CONFIG>
<Lang>fr</Lang> <!-- fr, en-->
- <MaarchDirectory>/var/www/html/maarch_oem/</MaarchDirectory>
- <TmpDirectory>/var/www/html/maarch_oem/modules/convert/batch/tmp/</TmpDirectory>
+ <MaarchDirectory>/var/www/html/MaarchCourrier/</MaarchDirectory>
+ <TmpDirectory>/var/www/html/MaarchCourrier/modules/convert/batch/tmp/</TmpDirectory>
<LogLevel>INFO</LogLevel> <!-- DEBUG, INFO, NOTICE, WARNING, ERROR-->
<DisplayedLogLevel>INFO</DisplayedLogLevel> <!-- DEBUG, INFO, NOTICE, WARNING, ERROR-->
- <StackSizeLimit>100</StackSizeLimit>
- <ApacheUserAndGroup>www-data:www-data</ApacheUserAndGroup>
- <UnoconvPath>C:\xampp\htdocs\unoconv\</UnoconvPath> <!-- only for Windows -->
- <OpenOfficePath>C:\Program Files\OpenOffice.org 4\program\</OpenOfficePath> <!-- only for Windows -->
+ <StackSizeLimit>50</StackSizeLimit>
+ <ApacheUserAndGroup>lgi:lgi</ApacheUserAndGroup>
+ <UnoconvPath>unoconv</UnoconvPath> <!-- only for Windows -->
+ <OpenOfficePath>soffice</OpenOfficePath> <!-- only for Windows -->
<UnoconvOptions>--port 8100</UnoconvOptions>
<RegExResId>(0|1)$</RegExResId>
<StartDateRecovery>false</StartDateRecovery> <!-- false or date dd/mm/yyyy -->
@@ -31,7 +31,7 @@
<databaseserver>127.0.0.1</databaseserver>
<databaseserverport>5432</databaseserverport>
<databasetype>POSTGRESQL</databasetype>
- <databasename>maarch_oem</databasename>
+ <databasename>MaarchCourrier</databasename>
<databaseuser>maarch</databaseuser>
<databasepassword>maarch</databasepassword>
</CONFIG_BASE>
@@ -40,17 +40,26 @@
<Table>res_letterbox</Table>
<View>res_view_letterbox</View>
<Adr>adr_letterbox</Adr>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/letterbox_coll/</path_to_lucene_index>
</COLLECTION>
<COLLECTION>
<Id>attachments_coll</Id>
<Table>res_attachments</Table>
<View>res_view_attachments</View>
<Adr>adr_attachments</Adr>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/attachments_coll/</path_to_lucene_index>
+ </COLLECTION>
+ <COLLECTION>
+ <Id>version_attachments_coll</Id>
+ <Table>res_version_attachments</Table>
+ <View>res_version_attachments</View>
+ <Adr>adr_attachments_version</Adr>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/version_attachments_coll/</path_to_lucene_index>
</COLLECTION>
<LOG4PHP>
<enabled>true</enabled>
<Log4PhpLogger>loggerTechnique</Log4PhpLogger>
<Log4PhpBusinessCode>Convert</Log4PhpBusinessCode>
- <Log4PhpConfigPath>/var/www/html/maarch_oem/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
+ <Log4PhpConfigPath>/var/www/html/MaarchCourrier/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
</LOG4PHP>
-</ROOT>
+</ROOT>
\ No newline at end of file
diff --git a/modules/convert/batch/config/parallel/config_1.xml.default b/modules/convert/batch/config/parallel/config_1.xml.default
index 6c554dced9053e5eb3781034c2f1bbd88719d99e..123ed3ac145ac19714a13e3441d7ec72c68339e2 100644
--- a/modules/convert/batch/config/parallel/config_1.xml.default
+++ b/modules/convert/batch/config/parallel/config_1.xml.default
@@ -2,14 +2,14 @@
<ROOT>
<CONFIG>
<Lang>fr</Lang> <!-- fr, en-->
- <MaarchDirectory>/var/www/html/maarch_oem/</MaarchDirectory>
- <TmpDirectory>/var/www/html/maarch_oem/modules/convert/batch/tmp/</TmpDirectory>
+ <MaarchDirectory>/var/www/html/MaarchCourrier/</MaarchDirectory>
+ <TmpDirectory>/var/www/html/MaarchCourrier/modules/convert/batch/tmp/</TmpDirectory>
<LogLevel>INFO</LogLevel> <!-- DEBUG, INFO, NOTICE, WARNING, ERROR-->
<DisplayedLogLevel>INFO</DisplayedLogLevel> <!-- DEBUG, INFO, NOTICE, WARNING, ERROR-->
- <StackSizeLimit>100</StackSizeLimit>
- <ApacheUserAndGroup>www-data:www-data</ApacheUserAndGroup>
- <UnoconvPath>C:\xampp\htdocs\unoconv\</UnoconvPath> <!-- only for Windows -->
- <OpenOfficePath>C:\Program Files\OpenOffice.org 4\program\</OpenOfficePath> <!-- only for Windows -->
+ <StackSizeLimit>50</StackSizeLimit>
+ <ApacheUserAndGroup>lgi:lgi</ApacheUserAndGroup>
+ <UnoconvPath>unoconv</UnoconvPath> <!-- only for Windows -->
+ <OpenOfficePath>soffice</OpenOfficePath> <!-- only for Windows -->
<UnoconvOptions>--port 8100</UnoconvOptions>
<RegExResId>(2|3)$</RegExResId>
<StartDateRecovery>false</StartDateRecovery> <!-- false or date dd/mm/yyyy -->
@@ -31,7 +31,7 @@
<databaseserver>127.0.0.1</databaseserver>
<databaseserverport>5432</databaseserverport>
<databasetype>POSTGRESQL</databasetype>
- <databasename>maarch_oem</databasename>
+ <databasename>MaarchCourrier</databasename>
<databaseuser>maarch</databaseuser>
<databasepassword>maarch</databasepassword>
</CONFIG_BASE>
@@ -40,17 +40,26 @@
<Table>res_letterbox</Table>
<View>res_view_letterbox</View>
<Adr>adr_letterbox</Adr>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/letterbox_coll/</path_to_lucene_index>
</COLLECTION>
<COLLECTION>
<Id>attachments_coll</Id>
<Table>res_attachments</Table>
<View>res_view_attachments</View>
<Adr>adr_attachments</Adr>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/attachments_coll/</path_to_lucene_index>
+ </COLLECTION>
+ <COLLECTION>
+ <Id>version_attachments_coll</Id>
+ <Table>res_version_attachments</Table>
+ <View>res_version_attachments</View>
+ <Adr>adr_attachments_version</Adr>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/version_attachments_coll/</path_to_lucene_index>
</COLLECTION>
<LOG4PHP>
<enabled>true</enabled>
<Log4PhpLogger>loggerTechnique</Log4PhpLogger>
<Log4PhpBusinessCode>Convert</Log4PhpBusinessCode>
- <Log4PhpConfigPath>/var/www/html/maarch_oem/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
+ <Log4PhpConfigPath>/var/www/html/MaarchCourrier/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
</LOG4PHP>
-</ROOT>
+</ROOT>
\ No newline at end of file
diff --git a/modules/convert/batch/config/parallel/config_2.xml.default b/modules/convert/batch/config/parallel/config_2.xml.default
index 6f13ac4dd5d2a30cc5a734d5df07bfc5ea08b9e9..b30e3ba84c85ec2d34cde9f6d46315de6155f151 100644
--- a/modules/convert/batch/config/parallel/config_2.xml.default
+++ b/modules/convert/batch/config/parallel/config_2.xml.default
@@ -2,14 +2,14 @@
<ROOT>
<CONFIG>
<Lang>fr</Lang> <!-- fr, en-->
- <MaarchDirectory>/var/www/html/maarch_oem/</MaarchDirectory>
- <TmpDirectory>/var/www/html/maarch_oem/modules/convert/batch/tmp/</TmpDirectory>
+ <MaarchDirectory>/var/www/html/MaarchCourrier/</MaarchDirectory>
+ <TmpDirectory>/var/www/html/MaarchCourrier/modules/convert/batch/tmp/</TmpDirectory>
<LogLevel>INFO</LogLevel> <!-- DEBUG, INFO, NOTICE, WARNING, ERROR-->
<DisplayedLogLevel>INFO</DisplayedLogLevel> <!-- DEBUG, INFO, NOTICE, WARNING, ERROR-->
- <StackSizeLimit>100</StackSizeLimit>
- <ApacheUserAndGroup>www-data:www-data</ApacheUserAndGroup>
- <UnoconvPath>C:\xampp\htdocs\unoconv\</UnoconvPath> <!-- only for Windows -->
- <OpenOfficePath>C:\Program Files\OpenOffice.org 4\program\</OpenOfficePath> <!-- only for Windows -->
+ <StackSizeLimit>50</StackSizeLimit>
+ <ApacheUserAndGroup>lgi:lgi</ApacheUserAndGroup>
+ <UnoconvPath>unoconv</UnoconvPath> <!-- only for Windows -->
+ <OpenOfficePath>soffice</OpenOfficePath> <!-- only for Windows -->
<UnoconvOptions>--port 8100</UnoconvOptions>
<RegExResId>(4|5)$</RegExResId>
<StartDateRecovery>false</StartDateRecovery> <!-- false or date dd/mm/yyyy -->
@@ -31,7 +31,7 @@
<databaseserver>127.0.0.1</databaseserver>
<databaseserverport>5432</databaseserverport>
<databasetype>POSTGRESQL</databasetype>
- <databasename>maarch_oem</databasename>
+ <databasename>MaarchCourrier</databasename>
<databaseuser>maarch</databaseuser>
<databasepassword>maarch</databasepassword>
</CONFIG_BASE>
@@ -40,17 +40,26 @@
<Table>res_letterbox</Table>
<View>res_view_letterbox</View>
<Adr>adr_letterbox</Adr>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/letterbox_coll/</path_to_lucene_index>
</COLLECTION>
<COLLECTION>
<Id>attachments_coll</Id>
<Table>res_attachments</Table>
<View>res_view_attachments</View>
<Adr>adr_attachments</Adr>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/attachments_coll/</path_to_lucene_index>
+ </COLLECTION>
+ <COLLECTION>
+ <Id>version_attachments_coll</Id>
+ <Table>res_version_attachments</Table>
+ <View>res_version_attachments</View>
+ <Adr>adr_attachments_version</Adr>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/version_attachments_coll/</path_to_lucene_index>
</COLLECTION>
<LOG4PHP>
<enabled>true</enabled>
<Log4PhpLogger>loggerTechnique</Log4PhpLogger>
<Log4PhpBusinessCode>Convert</Log4PhpBusinessCode>
- <Log4PhpConfigPath>/var/www/html/maarch_oem/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
+ <Log4PhpConfigPath>/var/www/html/MaarchCourrier/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
</LOG4PHP>
-</ROOT>
+</ROOT>
\ No newline at end of file
diff --git a/modules/convert/batch/config/parallel/config_3.xml.default b/modules/convert/batch/config/parallel/config_3.xml.default
index ae050eb47b267c3207e2017ca58c198239bd503d..aa851ceddb41a39e9c7c3acbea514e096e1e96c7 100644
--- a/modules/convert/batch/config/parallel/config_3.xml.default
+++ b/modules/convert/batch/config/parallel/config_3.xml.default
@@ -2,14 +2,14 @@
<ROOT>
<CONFIG>
<Lang>fr</Lang> <!-- fr, en-->
- <MaarchDirectory>/var/www/html/maarch_oem/</MaarchDirectory>
- <TmpDirectory>/var/www/html/maarch_oem/modules/convert/batch/tmp/</TmpDirectory>
+ <MaarchDirectory>/var/www/html/MaarchCourrier/</MaarchDirectory>
+ <TmpDirectory>/var/www/html/MaarchCourrier/modules/convert/batch/tmp/</TmpDirectory>
<LogLevel>INFO</LogLevel> <!-- DEBUG, INFO, NOTICE, WARNING, ERROR-->
<DisplayedLogLevel>INFO</DisplayedLogLevel> <!-- DEBUG, INFO, NOTICE, WARNING, ERROR-->
- <StackSizeLimit>100</StackSizeLimit>
- <ApacheUserAndGroup>www-data:www-data</ApacheUserAndGroup>
- <UnoconvPath>C:\xampp\htdocs\unoconv\</UnoconvPath> <!-- only for Windows -->
- <OpenOfficePath>C:\Program Files\OpenOffice.org 4\program\</OpenOfficePath> <!-- only for Windows -->
+ <StackSizeLimit>50</StackSizeLimit>
+ <ApacheUserAndGroup>lgi:lgi</ApacheUserAndGroup>
+ <UnoconvPath>unoconv</UnoconvPath> <!-- only for Windows -->
+ <OpenOfficePath>soffice</OpenOfficePath> <!-- only for Windows -->
<UnoconvOptions>--port 8100</UnoconvOptions>
<RegExResId>(6|7)$</RegExResId>
<StartDateRecovery>false</StartDateRecovery> <!-- false or date dd/mm/yyyy -->
@@ -31,7 +31,7 @@
<databaseserver>127.0.0.1</databaseserver>
<databaseserverport>5432</databaseserverport>
<databasetype>POSTGRESQL</databasetype>
- <databasename>maarch_oem</databasename>
+ <databasename>MaarchCourrier</databasename>
<databaseuser>maarch</databaseuser>
<databasepassword>maarch</databasepassword>
</CONFIG_BASE>
@@ -40,17 +40,26 @@
<Table>res_letterbox</Table>
<View>res_view_letterbox</View>
<Adr>adr_letterbox</Adr>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/letterbox_coll/</path_to_lucene_index>
</COLLECTION>
<COLLECTION>
<Id>attachments_coll</Id>
<Table>res_attachments</Table>
<View>res_view_attachments</View>
<Adr>adr_attachments</Adr>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/attachments_coll/</path_to_lucene_index>
+ </COLLECTION>
+ <COLLECTION>
+ <Id>version_attachments_coll</Id>
+ <Table>res_version_attachments</Table>
+ <View>res_version_attachments</View>
+ <Adr>adr_attachments_version</Adr>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/version_attachments_coll/</path_to_lucene_index>
</COLLECTION>
<LOG4PHP>
<enabled>true</enabled>
<Log4PhpLogger>loggerTechnique</Log4PhpLogger>
<Log4PhpBusinessCode>Convert</Log4PhpBusinessCode>
- <Log4PhpConfigPath>/var/www/html/maarch_oem/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
+ <Log4PhpConfigPath>/var/www/html/MaarchCourrier/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
</LOG4PHP>
-</ROOT>
+</ROOT>
\ No newline at end of file
diff --git a/modules/convert/batch/config/parallel/config_4.xml.default b/modules/convert/batch/config/parallel/config_4.xml.default
index 7dc4b7d8ab61851d74ca23727ad5fe8e97993c20..46d9f6993e0127c3469cee84849ec9ef8f672228 100644
--- a/modules/convert/batch/config/parallel/config_4.xml.default
+++ b/modules/convert/batch/config/parallel/config_4.xml.default
@@ -2,14 +2,14 @@
<ROOT>
<CONFIG>
<Lang>fr</Lang> <!-- fr, en-->
- <MaarchDirectory>/var/www/html/maarch_oem/</MaarchDirectory>
- <TmpDirectory>/var/www/html/maarch_oem/modules/convert/batch/tmp/</TmpDirectory>
+ <MaarchDirectory>/var/www/html/MaarchCourrier/</MaarchDirectory>
+ <TmpDirectory>/var/www/html/MaarchCourrier/modules/convert/batch/tmp/</TmpDirectory>
<LogLevel>INFO</LogLevel> <!-- DEBUG, INFO, NOTICE, WARNING, ERROR-->
<DisplayedLogLevel>INFO</DisplayedLogLevel> <!-- DEBUG, INFO, NOTICE, WARNING, ERROR-->
- <StackSizeLimit>100</StackSizeLimit>
- <ApacheUserAndGroup>www-data:www-data</ApacheUserAndGroup>
- <UnoconvPath>C:\xampp\htdocs\unoconv\</UnoconvPath> <!-- only for Windows -->
- <OpenOfficePath>C:\Program Files\OpenOffice.org 4\program\</OpenOfficePath> <!-- only for Windows -->
+ <StackSizeLimit>50</StackSizeLimit>
+ <ApacheUserAndGroup>lgi:lgi</ApacheUserAndGroup>
+ <UnoconvPath>unoconv</UnoconvPath> <!-- only for Windows -->
+ <OpenOfficePath>soffice</OpenOfficePath> <!-- only for Windows -->
<UnoconvOptions>--port 8100</UnoconvOptions>
<RegExResId>(8|9)$</RegExResId>
<StartDateRecovery>false</StartDateRecovery> <!-- false or date dd/mm/yyyy -->
@@ -31,7 +31,7 @@
<databaseserver>127.0.0.1</databaseserver>
<databaseserverport>5432</databaseserverport>
<databasetype>POSTGRESQL</databasetype>
- <databasename>maarch_oem</databasename>
+ <databasename>MaarchCourrier</databasename>
<databaseuser>maarch</databaseuser>
<databasepassword>maarch</databasepassword>
</CONFIG_BASE>
@@ -40,17 +40,26 @@
<Table>res_letterbox</Table>
<View>res_view_letterbox</View>
<Adr>adr_letterbox</Adr>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/letterbox_coll/</path_to_lucene_index>
</COLLECTION>
<COLLECTION>
<Id>attachments_coll</Id>
<Table>res_attachments</Table>
<View>res_view_attachments</View>
<Adr>adr_attachments</Adr>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/attachments_coll/</path_to_lucene_index>
+ </COLLECTION>
+ <COLLECTION>
+ <Id>version_attachments_coll</Id>
+ <Table>res_version_attachments</Table>
+ <View>res_version_attachments</View>
+ <Adr>adr_attachments_version</Adr>
+ <path_to_lucene_index>/opt/maarch/docservers/indexes/version_attachments_coll/</path_to_lucene_index>
</COLLECTION>
<LOG4PHP>
<enabled>true</enabled>
<Log4PhpLogger>loggerTechnique</Log4PhpLogger>
<Log4PhpBusinessCode>Convert</Log4PhpBusinessCode>
- <Log4PhpConfigPath>/var/www/html/maarch_oem/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
+ <Log4PhpConfigPath>/var/www/html/MaarchCourrier/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
</LOG4PHP>
-</ROOT>
+</ROOT>
\ No newline at end of file
diff --git a/modules/convert/batch/scripts/launch_convert_all_coll.sh b/modules/convert/batch/scripts/launch_convert_all_coll.sh.default
similarity index 82%
rename from modules/convert/batch/scripts/launch_convert_all_coll.sh
rename to modules/convert/batch/scripts/launch_convert_all_coll.sh.default
index 1f55da8f17626a4c0aa8fd7430bf866945c6448a..b729fa249c89b459cd31e2622551c541ebb48359 100644
--- a/modules/convert/batch/scripts/launch_convert_all_coll.sh
+++ b/modules/convert/batch/scripts/launch_convert_all_coll.sh.default
@@ -1,7 +1,7 @@
#!/bin/bash
-Mypath='/var/www/html/oem_V2/modules/convert/batch'
+Mypath='/var/www/html/MaarchCourrier/modules/convert/batch'
cd $Mypath
-ConfigPath='/var/www/html/oem_V2/modules/convert/batch/config'
+ConfigPath='/var/www/html/MaarchCourrier/modules/convert/batch/config'
#rm convert_letterbox_coll_config.lck
#rm convert_letterbox_coll_config_error.lck
diff --git a/modules/convert/batch/scripts/launch_convert_attachments.sh b/modules/convert/batch/scripts/launch_convert_attachments.sh
deleted file mode 100644
index 82c23ff2cf19054342a45a1acf415c9305541bce..0000000000000000000000000000000000000000
--- a/modules/convert/batch/scripts/launch_convert_attachments.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-Mypath='/var/www/html/maarch_oem/modules/convert/batch'
-cd $Mypath
-ConfigPath='/var/www/html/maarch_oem/modules/convert/batch/config'
-
-php $Mypath/fill_stack.php -c $ConfigPath/config.xml -coll attachments_coll
\ No newline at end of file
diff --git a/modules/convert/batch/scripts/launch_convert_attachments.sh.default b/modules/convert/batch/scripts/launch_convert_attachments.sh.default
index 82c23ff2cf19054342a45a1acf415c9305541bce..0969b997b169a1f0d0e4b1b30a47b9fdc51d47bc 100644
--- a/modules/convert/batch/scripts/launch_convert_attachments.sh.default
+++ b/modules/convert/batch/scripts/launch_convert_attachments.sh.default
@@ -1,6 +1,6 @@
#!/bin/bash
-Mypath='/var/www/html/maarch_oem/modules/convert/batch'
+Mypath='/var/www/html/MaarchCourrier/modules/convert/batch'
cd $Mypath
-ConfigPath='/var/www/html/maarch_oem/modules/convert/batch/config'
+ConfigPath='/var/www/html/MaarchCourrier/modules/convert/batch/config'
php $Mypath/fill_stack.php -c $ConfigPath/config.xml -coll attachments_coll
\ No newline at end of file
diff --git a/modules/convert/batch/scripts/launch_convert_letterbox.sh b/modules/convert/batch/scripts/launch_convert_letterbox.sh
deleted file mode 100644
index 1e01fa3d4668da961d27d7dcdc1c45ba24346df9..0000000000000000000000000000000000000000
--- a/modules/convert/batch/scripts/launch_convert_letterbox.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-Mypath='/var/www/html/maarch_oem/modules/convert/batch'
-cd $Mypath
-ConfigPath='/var/www/html/maarch_oem/modules/convert/batch/config'
-
-rm convert_letterbox_coll_config.lck
-rm convert_letterbox_coll_config_error.lck
-
-php $Mypath/fill_stack.php -c $ConfigPath/config.xml -coll letterbox_coll
diff --git a/modules/convert/batch/scripts/launch_convert_letterbox.sh.default b/modules/convert/batch/scripts/launch_convert_letterbox.sh.default
index e218e5a72836398cc7032a35fd6fe723b428f337..e94302372579c84d0329d073dc7b87e289436b95 100644
--- a/modules/convert/batch/scripts/launch_convert_letterbox.sh.default
+++ b/modules/convert/batch/scripts/launch_convert_letterbox.sh.default
@@ -1,6 +1,6 @@
#!/bin/bash
-Mypath='/var/www/html/maarch_oem/modules/convert/batch'
+Mypath='/var/www/html/MaarchCourrier/modules/convert/batch'
cd $Mypath
-ConfigPath='/var/www/html/maarch_oem/modules/convert/batch/config'
+ConfigPath='/var/www/html/MaarchCourrier/modules/convert/batch/config'
php $Mypath/fill_stack.php -c $ConfigPath/config.xml -coll letterbox_coll
\ No newline at end of file
diff --git a/modules/convert/batch/scripts/launch_convert_reprise.sh.default b/modules/convert/batch/scripts/launch_convert_reprise.sh.default
deleted file mode 100644
index 44f8126f75d4fa83fea08dc80987089a6dbd16a5..0000000000000000000000000000000000000000
--- a/modules/convert/batch/scripts/launch_convert_reprise.sh.default
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-Mypath='/var/www/html/maarch_oem/modules/convert/batch'
-cd $Mypath
-ConfigPath='/var/www/html/maarch_oem/modules/convert/batch/config'
-
-rm convert_reprise_coll_config.lck
-rm convert_reprise_coll_config_error.lck
-
-php $Mypath/fill_stack.php -c $ConfigPath/config_reprise_oem.xml -coll reprise_coll
diff --git a/modules/convert/batch/scripts/launch_fulltext_all_coll.sh b/modules/convert/batch/scripts/launch_fulltext_all_coll.sh.default
similarity index 85%
rename from modules/convert/batch/scripts/launch_fulltext_all_coll.sh
rename to modules/convert/batch/scripts/launch_fulltext_all_coll.sh.default
index 2883f9dca685af4c87b38a0e4e9124ad1143ec02..4055fb238f98332acad447dd481c6c2272c86072 100644
--- a/modules/convert/batch/scripts/launch_fulltext_all_coll.sh
+++ b/modules/convert/batch/scripts/launch_fulltext_all_coll.sh.default
@@ -1,7 +1,7 @@
#!/bin/bash
-Mypath='/var/www/html/oem_V2/modules/convert/batch'
+Mypath='/var/www/html/MaarchCourrier/modules/convert/batch'
cd $Mypath
-ConfigPath='/var/www/html/oem_V2/modules/convert/batch/config'
+ConfigPath='/var/www/html/MaarchCourrier/modules/convert/batch/config'
#rm convert_letterbox_coll_config_only_indexes.lck
#rm convert_letterbox_coll_config_only_indexes_error.lck
diff --git a/modules/convert/batch/scripts/launch_fulltext_attachments.sh b/modules/convert/batch/scripts/launch_fulltext_attachments.sh.default
similarity index 63%
rename from modules/convert/batch/scripts/launch_fulltext_attachments.sh
rename to modules/convert/batch/scripts/launch_fulltext_attachments.sh.default
index c4fecdce5d966eb9a10308e849148c3f2765eee5..897e3b5c720d396655b14ed816e616cf55d93272 100644
--- a/modules/convert/batch/scripts/launch_fulltext_attachments.sh
+++ b/modules/convert/batch/scripts/launch_fulltext_attachments.sh.default
@@ -1,7 +1,7 @@
#!/bin/bash
-Mypath='/var/www/html/oem/modules/convert/batch'
+Mypath='/var/www/html/MaarchCourrier/modules/convert/batch'
cd $Mypath
-ConfigPath='/var/www/html/oem/modules/convert/batch/config'
+ConfigPath='/var/www/html/MaarchCourrier/modules/convert/batch/config'
rm convert_attachments_coll_config_only_indexes.lck
rm convert_attachments_coll_config_only_indexes_error.lck
diff --git a/modules/convert/batch/scripts/launch_fulltext_letterbox.sh b/modules/convert/batch/scripts/launch_fulltext_letterbox.sh.default
similarity index 62%
rename from modules/convert/batch/scripts/launch_fulltext_letterbox.sh
rename to modules/convert/batch/scripts/launch_fulltext_letterbox.sh.default
index 084d583388506987e0f997c9da665bda409e4134..11906732bbf9ad748b7828160f3297d5f0333aca 100644
--- a/modules/convert/batch/scripts/launch_fulltext_letterbox.sh
+++ b/modules/convert/batch/scripts/launch_fulltext_letterbox.sh.default
@@ -1,7 +1,7 @@
#!/bin/bash
-Mypath='/var/www/html/oem/modules/convert/batch'
+Mypath='/var/www/html/MaarchCourrier/modules/convert/batch'
cd $Mypath
-ConfigPath='/var/www/html/oem/modules/convert/batch/config'
+ConfigPath='/var/www/html/MaarchCourrier/modules/convert/batch/config'
rm convert_letterbox_coll_config_only_indexes.lck
rm convert_letterbox_coll_config_only_indexes_error.lck
diff --git a/modules/convert/batch/scripts/lgi.sh b/modules/convert/batch/scripts/lgi.sh
deleted file mode 100644
index e724de2f88e1be40475053f6b834dfb2f5924639..0000000000000000000000000000000000000000
--- a/modules/convert/batch/scripts/lgi.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-Mypath='/var/www/html/oem_V2/modules/convert/batch'
-cd $Mypath
-ConfigPath='/var/www/html/oem_V2/modules/convert/batch/config'
-
-rm convert_letterbox_coll_config_only_indexes.lck
-rm convert_letterbox_coll_config_only_indexes_error.lck
-
-rm convert_attachments_coll_config_only_indexes.lck
-rm convert_attachments_coll_config_only_indexes_error.lck
-
-php $Mypath/fill_stack.php -c $ConfigPath/config_only_indexes.xml -coll letterbox_coll
-php $Mypath/fill_stack.php -c $ConfigPath/config_only_indexes.xml -coll attachments_coll
\ No newline at end of file
diff --git a/modules/convert/batch/scripts/parallel/launch_convert_letterbox_0.sh.default b/modules/convert/batch/scripts/parallel/launch_convert_letterbox_0.sh.default
index 5ea397e8bfc522dfd3f227df398e60e296df6280..3ffef248dfc2869c38490b71b40350a645ce4ef2 100644
--- a/modules/convert/batch/scripts/parallel/launch_convert_letterbox_0.sh.default
+++ b/modules/convert/batch/scripts/parallel/launch_convert_letterbox_0.sh.default
@@ -1,7 +1,7 @@
#!/bin/bash
-Mypath='/var/www/html/maarch_oem/modules/convert/batch'
+Mypath='/var/www/html/MaarchCourrier/modules/convert/batch'
cd $Mypath
-ConfigPath='/var/www/html/maarch_oem/modules/convert/batch/parallel/config'
+ConfigPath='/var/www/html/MaarchCourrier/modules/convert/batch/config/parallel'
for (( i=0; i < 3; i++ ));
do php $Mypath/fill_stack.php -c $ConfigPath/config_0.xml -coll letterbox_coll
diff --git a/modules/convert/batch/scripts/parallel/launch_convert_letterbox_1.sh.default b/modules/convert/batch/scripts/parallel/launch_convert_letterbox_1.sh.default
index 686b8dd0909cc01c198492ddf4b5ca6de8bd0313..ccd8fb0406df97eb1a1385b8e054a364c3b75d27 100644
--- a/modules/convert/batch/scripts/parallel/launch_convert_letterbox_1.sh.default
+++ b/modules/convert/batch/scripts/parallel/launch_convert_letterbox_1.sh.default
@@ -1,7 +1,7 @@
#!/bin/bash
-Mypath='/var/www/html/maarch_oem/modules/convert/batch'
+Mypath='/var/www/html/MaarchCourrier/modules/convert/batch'
cd $Mypath
-ConfigPath='/var/www/html/maarch_oem/modules/convert/batch/parallel/config'
+ConfigPath='/var/www/html/MaarchCourrier/modules/convert/batch/config/parallel'
for (( i=0; i < 3; i++ ));
do php $Mypath/fill_stack.php -c $ConfigPath/config_1.xml -coll letterbox_coll
diff --git a/modules/convert/batch/scripts/parallel/launch_convert_letterbox_2.sh.default b/modules/convert/batch/scripts/parallel/launch_convert_letterbox_2.sh.default
index 2413c94236b6e58009a34fbc61777631b09e9e0f..4405d6e3a3adf489456af10d1a6f8b24c360cefc 100644
--- a/modules/convert/batch/scripts/parallel/launch_convert_letterbox_2.sh.default
+++ b/modules/convert/batch/scripts/parallel/launch_convert_letterbox_2.sh.default
@@ -1,7 +1,7 @@
#!/bin/bash
-Mypath='/var/www/html/maarch_oem/modules/convert/batch'
+Mypath='/var/www/html/MaarchCourrier/modules/convert/batch'
cd $Mypath
-ConfigPath='/var/www/html/maarch_oem/modules/convert/batch/parallel/config'
+ConfigPath='/var/www/html/MaarchCourrier/modules/convert/batch/config/parallel/'
for (( i=0; i < 3; i++ ));
do php $Mypath/fill_stack.php -c $ConfigPath/config_2.xml -coll letterbox_coll
diff --git a/modules/convert/batch/scripts/parallel/launch_convert_letterbox_3.sh.default b/modules/convert/batch/scripts/parallel/launch_convert_letterbox_3.sh.default
index 4f1e58d4afa8dff876295a1cbc7fdf887515d1af..45e28e9bdb467e25c24e67435dbdc03b76141dc7 100644
--- a/modules/convert/batch/scripts/parallel/launch_convert_letterbox_3.sh.default
+++ b/modules/convert/batch/scripts/parallel/launch_convert_letterbox_3.sh.default
@@ -1,7 +1,7 @@
#!/bin/bash
-Mypath='/var/www/html/maarch_oem/modules/convert/batch'
+Mypath='/var/www/html/MaarchCourrier/modules/convert/batch'
cd $Mypath
-ConfigPath='/var/www/html/maarch_oem/modules/convert/batch/parallel/config'
+ConfigPath='/var/www/html/MaarchCourrier/modules/convert/batch/config/parallel/'
for (( i=0; i < 3; i++ ));
do php $Mypath/fill_stack.php -c $ConfigPath/config_3.xml -coll letterbox_coll
diff --git a/modules/convert/batch/scripts/parallel/launch_convert_letterbox_4.sh.default b/modules/convert/batch/scripts/parallel/launch_convert_letterbox_4.sh.default
index 38999f620871d079e2cf8f5eedddd1bf0876e685..5e2d68f800d13f9684735f8bcc66b03e05248d97 100644
--- a/modules/convert/batch/scripts/parallel/launch_convert_letterbox_4.sh.default
+++ b/modules/convert/batch/scripts/parallel/launch_convert_letterbox_4.sh.default
@@ -1,7 +1,7 @@
#!/bin/bash
-Mypath='/var/www/html/maarch_oem/modules/convert/batch'
+Mypath='/var/www/html/MaarchCourrier/modules/convert/batch'
cd $Mypath
-ConfigPath='/var/www/html/maarch_oem/modules/convert/batch/parallel/config'
+ConfigPath='/var/www/html/MaarchCourrier/modules/convert/batch/config/parallel/'
for (( i=0; i < 3; i++ ));
do php $Mypath/fill_stack.php -c $ConfigPath/config_4.xml -coll letterbox_coll
diff --git a/modules/convert/batch/scripts/parallel/param_cron.txt b/modules/convert/batch/scripts/parallel/param_cron.txt
index 4a260f65532630bb95396bf58df277e8c4c45c6f..de6869a344b0632ffd57c5832acdc4bee71b2d36 100644
--- a/modules/convert/batch/scripts/parallel/param_cron.txt
+++ b/modules/convert/batch/scripts/parallel/param_cron.txt
@@ -1,6 +1,6 @@
# tous les jours toutes les 2 heures de 0h a 20h du lundi au samedi lancement des batchs de conversion
-0 0-20/2 * * 1-6 maarch /var/www/maarch/modules/maarch_oem/batch/scripts/parallel/launch_convert_letterbox_0.sh
-1 0-20/2 * * 1-6 maarch /var/www/maarch/modules/maarch_oem/batch/scripts/parallel/launch_convert_letterbox_1.sh
-2 0-20/2 * * 1-6 maarch /var/www/maarch/modules/maarch_oem/batch/scripts/parallel/launch_convert_letterbox_2.sh
-3 0-20/2 * * 1-6 maarch /var/www/maarch/modules/maarch_oem/batch/scripts/parallel/launch_convert_letterbox_3.sh
-4 0-20/2 * * 1-6 maarch /var/www/maarch/modules/maarch_oem/batch/scripts/parallel/launch_convert_letterbox_4.sh
+0 0-20/2 * * 1-6 maarch /var/www/html/MaarchCourrier/modules/convert/batch/scripts/parallel/launch_convert_letterbox_0.sh
+1 0-20/2 * * 1-6 maarch /var/www/html/MaarchCourrier/modules/convert/batch/scripts/parallel/launch_convert_letterbox_1.sh
+2 0-20/2 * * 1-6 maarch /var/www/html/MaarchCourrier/modules/convert/batch/scripts/parallel/launch_convert_letterbox_2.sh
+3 0-20/2 * * 1-6 maarch /var/www/html/MaarchCourrier/modules/convert/batch/scripts/parallel/launch_convert_letterbox_3.sh
+4 0-20/2 * * 1-6 maarch /var/www/html/MaarchCourrier/modules/convert/batch/scripts/parallel/launch_convert_letterbox_4.sh