Merge branch 'test' into master

swissbib · Sep 20, 2018 · 59abb0a · 59abb0a
2 parents c899216 + d586669
commit 59abb0a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/bin/devel/create-delta-files_initialserials.pl b/bin/devel/create-delta-files_initialserials.pl
@@ -103,8 +103,8 @@ =head1 HISTORY
 # ---------------------------
 my $FULL_XML    = 'basel-bern-emedia.xml';
 my $DELTA_XML   = 'sersol-idsbb-emedia-initialserials.xml';
-my $DATA_DIR    = '/opt/data/e-books/data';
-my $DOWNLOAD_DIR= '/opt/data/e-books/download';
+my $DATA_DIR    = '/opt/data/e-books_test/data';
+my $DOWNLOAD_DIR= '/opt/data/e-books_test/download';
 #my $DATA_DIR    = '/opt/data/e-books/data';
 #my $DOWNLOAD_DIR= '/opt/data/e-books/download';
 

diff --git a/bin/devel/initial-load-e_swissbib-db.pl b/bin/devel/initial-load-e_swissbib-db.pl
@@ -48,9 +48,10 @@
 source: basel-bern-emedia.xml
 
 EOD
-#@print "komplett neu aufbauen [j/N] ? ";
-#my $ans = <STDIN>;
-#exit unless $ans =~ /j/i;
+
+@print "komplett neu aufbauen [j/N] ? ";
+my $ans = <STDIN>;
+exit unless $ans =~ /j/i;
 
 my $PACIF = 500;
 my $pacif = $PACIF;
@@ -60,7 +61,7 @@
 
 my $XML;
 if ( hostname eq 'ub-catmandu' ) {
-    $XML='/opt/data/e-books/data/basel-bern-emedia.xml';
+    $XML='/opt/data/e-books_test/data/basel-bern-emedia.xml';
 } else {
     $XML = '../../data/basel-bern-emedia.xml';
 }

diff --git a/bin/devel/initial-load-serials_swissbib-db.pl b/bin/devel/initial-load-serials_swissbib-db.pl
@@ -60,7 +60,7 @@
 
 my $XML;
 if ( hostname eq 'ub-catmandu' ) {
-    $XML='/opt/data/e-books/data/basel-bern-emedia.xml';
+    $XML='/opt/data/e-books_test/data/basel-bern-emedia.xml';
 } else {
     $XML = '../../data/basel-bern-emedia.xml';
 }

diff --git a/bin/e_swissbib_db.pm b/bin/e_swissbib_db.pm
@@ -7,8 +7,8 @@ my $cfg = new Config::Simple('/opt/scripts/e-books/bin/idsbb_emedia.conf');
 my $cfg_hidden = new Config::Simple($cfg->param('HIDDENCONF'));
 use strict;
 
-my $DBHOST     = 'ub-filesvm';
-my $DB_NAME    = 'e_swissbib';
+my $DBHOST     = 'localhost';
+my $DB_NAME    = 'e_swissbib_test';
 my $DBUSER     = 'e_swissbib_staff';
 my $DBPASSWORD = $cfg_hidden->param('DBPASSWORD');
 

diff --git a/bin/ftp-download-data.pl b/bin/ftp-download-data.pl
@@ -233,6 +233,7 @@ sub extract_mono_full {
     unlink $MONO_RUN_SUMMARY;
     unlink 'RunSummary.txt';
 
+
     my @lib = keys %{$downloads->{mono_full}};
 
     foreach my $lib ( @lib ) {
@@ -270,7 +271,7 @@ sub extract_ser_full {
     unlink 'RunSummary.txt';
 
     my @lib = keys %{$downloads->{ser_full}};
- 
+
     foreach my $lib ( @lib ) {
         my @zip = glob( $downloads->{ser_full}->{$lib} );
         my $zip = $zip[0];
@@ -307,7 +308,7 @@ sub extract_mono_delta {
     say "ftp: extracting monographs delta\n";
 
     my @key = keys %{$downloads->{mono_delta}};
-    
+
     foreach my $key ( @key ) {
         my $dir = $key .'_delta';
         mkdir $dir

diff --git a/bin/idsbb_emedia.conf b/bin/idsbb_emedia.conf
@@ -1,4 +1,4 @@
-DATADIR='/opt/data/e-books/data'
-DOWNLOADDIR='/opt/data/e-books/download'
-LOGDIR='/opt/data/e-books/log'
-HIDDENCONF='/opt/scripts/e-books/bin/idsbb_emedia_hidden.conf'
+DATADIR='/opt/data/e-books_test/data'
+DOWNLOADDIR='/opt/data/e-books_test/download'
+LOGDIR='/opt/data/e-books_test/log'
+HIDDENCONF='/opt/scripts/e-books/bin/idsbb_emedia_hidden_test.conf'