--- a/build/build.sh Fri Sep 08 15:03:29 2017 +0200
+++ b/build/build.sh Wed Sep 13 22:19:48 2017 +0200
@@ -172,8 +172,8 @@
pushd "$DIR/dist" > /dev/null
if [ -f bootstrap-puppet.sh -a -f corpusdelaparole-$version-*.noarch.rpm -a -f installDrupal.sh -a -f puppet-corpusdelaparole-$version-*.noarch.rpm ]; then
- rm -f corpusdelaparole-back_*_*.tar.gz
- ARCHIVE_NAME="corpusdelaparole-back_$(date +%Y-%m-%d)_${version}"
+ rm -f corpusdelaparole_*_*.tar.gz
+ ARCHIVE_NAME="corpusdelaparole_$(date +%Y-%m-%d)_${version}"
mkdir "$ARCHIVE_NAME"
--- a/build/build_puppet.sh Fri Sep 08 15:03:29 2017 +0200
+++ b/build/build_puppet.sh Wed Sep 13 22:19:48 2017 +0200
@@ -108,8 +108,8 @@
pushd "$DIR/dist" > /dev/null
if [ -f bootstrap-puppet.sh -a -f corpusdelaparole-$version-*.noarch.rpm -a -f installDrupal.sh -a -f exportDrupal.sh -a -f puppet-corpusdelaparole-$version-*.noarch.rpm ]; then
- rm -f corpusdelaparole-back_*_*.tar.gz
- ARCHIVE_NAME="corpusdelaparole-back_$(date +%Y-%m-%d)_${version}"
+ rm -f corpusdelaparole_*_*.tar.gz
+ ARCHIVE_NAME="corpusdelaparole_$(date +%Y-%m-%d)_${version}"
mkdir "$ARCHIVE_NAME"
--- a/cms/app-client/package.json Fri Sep 08 15:03:29 2017 +0200
+++ b/cms/app-client/package.json Wed Sep 13 22:19:48 2017 +0200
@@ -1,6 +1,6 @@
{
"name": "app-client",
- "version": "0.0.21",
+ "version": "0.0.22",
"private": true,
"description": "Small description for app-client goes here",
"license": "MIT",
--- a/cms/package-lock.json Fri Sep 08 15:03:29 2017 +0200
+++ b/cms/package-lock.json Wed Sep 13 22:19:48 2017 +0200
@@ -1,6 +1,6 @@
{
"name": "corpus-cms",
- "version": "0.0.21",
+ "version": "0.0.22",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
--- a/cms/package.json Fri Sep 08 15:03:29 2017 +0200
+++ b/cms/package.json Wed Sep 13 22:19:48 2017 +0200
@@ -1,6 +1,6 @@
{
"name": "corpus-cms",
- "version": "0.0.21",
+ "version": "0.0.22",
"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 Fri Sep 08 15:03:29 2017 +0200
+++ b/common/corpus-common-addon/package.json Wed Sep 13 22:19:48 2017 +0200
@@ -1,6 +1,6 @@
{
"name": "corpus-common-addon",
- "version": "0.0.21",
+ "version": "0.0.22",
"description": "Common features between cms and bo.",
"private": true,
"keywords": [
--- a/server/bo_client/package.json Fri Sep 08 15:03:29 2017 +0200
+++ b/server/bo_client/package.json Wed Sep 13 22:19:48 2017 +0200
@@ -1,6 +1,6 @@
{
"name": "bo-client",
- "version": "0.0.21",
+ "version": "0.0.22",
"description": "Bo client for Corpus Parole",
"license": "Ceccil-C",
"private": true,
--- a/server/src/app/Console/Commands/ImportCocoonRDF.php Fri Sep 08 15:03:29 2017 +0200
+++ b/server/src/app/Console/Commands/ImportCocoonRDF.php Wed Sep 13 22:19:48 2017 +0200
@@ -9,6 +9,7 @@
use Symfony\Component\Console\Input\InputArgument;
use Phpoaipmh\Client;
use Phpoaipmh\Endpoint;
+use Phpoaipmh\HttpAdapter\GuzzleAdapter;
use CorpusParole\Libraries\Sparql\GuzzleSparqlClient;
class ImportCocoonRDF extends Command {
@@ -233,7 +234,7 @@
];
if($raw) {
- $client = new Client(Config::get('corpusparole.cocoon_oaipmh_url'));
+ $client = new Client(Config::get('corpusparole.cocoon_oaipmh_url'), new GuzzleAdapter($this->httpClient));
$endpoint = new Endpoint($client);
$recs = $endpoint->listRecords('olac', null, null, 'LanguesDeFrance');
--- a/server/src/config/version.php Fri Sep 08 15:03:29 2017 +0200
+++ b/server/src/config/version.php Wed Sep 13 22:19:48 2017 +0200
@@ -8,5 +8,5 @@
| Must be incremented as needed.
|
*/
- 'version' => '0.0.21'
+ 'version' => '0.0.22'
];