correct import 0.0.10
authorymh <ymh.work@gmail.com>
Thu, 10 Nov 2016 15:35:18 +0100
changeset 412 c88746153ee0
parent 411 49f4705d7b65
child 413 8f29358e46da
correct import
build/post_install.sh
build/pre_install.sh
cms/app-client/package.json
cms/package.json
common/corpus-common-addon/package.json
server/bo_client/package.json
server/src/app/Console/Commands/ImportCocoonRDF.php
server/src/config/version.php
--- a/build/post_install.sh	Thu Nov 10 14:07:38 2016 +0100
+++ b/build/post_install.sh	Thu Nov 10 15:35:18 2016 +0100
@@ -1,4 +1,5 @@
 #!/usr/bin/env sh
+PATH=/opt/remi/php56/root/usr/bin/:$PATH
 
 if [ -x /usr/local/bin/drush ]; then
     echo "Reactivate corpus module"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build/pre_install.sh	Thu Nov 10 15:35:18 2016 +0100
@@ -0,0 +1,17 @@
+#!/usr/bin/env sh
+PATH=/opt/remi/php56/root/usr/bin/:$PATH
+
+if [ -f /var/www/corpusdelaparole/corpus-back/artisan ]; then
+    pushd /var/www/corpusdelaparole/corpus-back/ > /dev/null
+
+    echo "Put back application in maintenance"
+    php artisan down
+
+    popd > /dev/null
+fi
+
+
+if [ -x /usr/local/bin/drush -a -d /var/www/corpusdelaparole/drupal/sites/all/modules/corpus_module ]; then
+    echo "Deactivate corpus module"
+    /usr/local/bin/drush -r /var/www/corpusdelaparole/drupal pm-disable -y corpus
+fi
--- a/cms/app-client/package.json	Thu Nov 10 14:07:38 2016 +0100
+++ b/cms/app-client/package.json	Thu Nov 10 15:35:18 2016 +0100
@@ -1,6 +1,6 @@
 {
   "name": "app-client",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Small description for app-client goes here",
   "private": true,
   "directories": {
--- a/cms/package.json	Thu Nov 10 14:07:38 2016 +0100
+++ b/cms/package.json	Thu Nov 10 15:35:18 2016 +0100
@@ -1,6 +1,6 @@
 {
   "name": "corpus-cms",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "drupal module to embed the Ember app \"app-client\"",
   "scripts": {
     "build": "npm run build --prefix app-client/ && gulp copy-module",
--- a/common/corpus-common-addon/package.json	Thu Nov 10 14:07:38 2016 +0100
+++ b/common/corpus-common-addon/package.json	Thu Nov 10 15:35:18 2016 +0100
@@ -1,6 +1,6 @@
 {
   "name": "corpus-common-addon",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Common features between cms and bo.",
   "private": true,
   "directories": {
--- a/server/bo_client/package.json	Thu Nov 10 14:07:38 2016 +0100
+++ b/server/bo_client/package.json	Thu Nov 10 15:35:18 2016 +0100
@@ -1,6 +1,6 @@
 {
   "name": "bo-client",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Bo client for Corpus Parole",
   "private": true,
   "directories": {
--- a/server/src/app/Console/Commands/ImportCocoonRDF.php	Thu Nov 10 14:07:38 2016 +0100
+++ b/server/src/app/Console/Commands/ImportCocoonRDF.php	Thu Nov 10 15:35:18 2016 +0100
@@ -169,13 +169,19 @@
                 $documentCounts['unknown'] += 1;
                 continue;
             }
-            $documentCounts['all'] += 1;
-            $documentCounts[$docType] = isset($documentCounts[$docType])?$documentCounts[$docType]+1:1;
 
             $mapperClass = ImportCocoonRDF::MAPPER_CLASS_MAP[$docType];
             $mapper = new $mapperClass($doc, $docUri);
 
-            $mapper->mapGraph();
+            try {
+                $mapper->mapGraph();
+            } catch (\Exception $e) {
+                Log::error("Error processing $identifier ($docRdfUrl) : error mapping graph : $e");
+                $documentCounts['error'] += 1;
+            }
+            $documentCounts['all'] += 1;
+            $documentCounts[$docType] = isset($documentCounts[$docType])?$documentCounts[$docType]+1:1;
+
             $mappedGraphes = $mapper->getOutputGraphes();
 
             foreach ($mapper->getOutputGraphes() as $mappedGraphKey => $mappedGraph) {
--- a/server/src/config/version.php	Thu Nov 10 14:07:38 2016 +0100
+++ b/server/src/config/version.php	Thu Nov 10 15:35:18 2016 +0100
@@ -8,5 +8,5 @@
         | Must be incremented as needed.
         |
         */
-        'version' => '0.0.9'
+        'version' => '0.0.10'
     ];