Changeset 3

Timestamp:

Apr 1, 2011, 12:01:42 PM (14 years ago)

Author:

g7moreau

Message:

• Add dep on /etc/biblehal/biblehal.conf
• Detele dep on LEGI laboratory name

Location:

trunk

Files:

• biblehal-pop (modified) (4 diffs)
• biblehal-popall (modified) (1 diff)
• biblehal-poplast (modified) (1 diff)

trunk/biblehal-pop

@@ -2 +2 @@
 #
 # gabriel 2010/06/03
+# gabriel 2011/04/01 update to biblehal
 #
 # apt-get install libwww-mechanize-perl libwww-perl
@@ -11 +12 @@
 use HTML::Form;
 
-my $year = shift @ARGV;
-
-die "Usage /usr/lib/biblehal/biblehal-pop year\n" if $year < 1990 or $year > 2020; 
+my $laboratory = shift @ARGV;
+my $year       = shift @ARGV;
+
+die "Usage /usr/lib/biblehal/biblehal-pop laboratory year\n" if $year < 1990 or $year > 2020; 
 
 mkdir '/var/cache/biblehal/download', 0750;
@@ -88 +90 @@
 
 # On intègre le second formulaire qui se remplit normalement via un javascript
-my $parser = HTML::Form->parse("$F", 'http://hal.archives-ouvertes.fr/LEGI');
+my $parser = HTML::Form->parse("$F", "http://hal.archives-ouvertes.fr/$laboratory");
     print($@) if $@;
 #print Dumper $parser;
@@ -94 +96 @@
 
 # Création du bot
-my $url = 'http://hal.archives-ouvertes.fr/LEGI';
+my $url = "http://hal.archives-ouvertes.fr/$laboratory";
 my $bot = WWW::Mechanize->new;
    $bot->proxy(['http', 'ftp'], 'http://194.254.66.70:3128');

trunk/biblehal-popall

@@ -2 +2 @@
 #
 # gabriel 2010/06/03
+# gabriel 2011/04/01 update to biblehal
 
 export PATH="/bin:/usr/bin:/usr/lib/biblehal"
 
 
+if [ -f /etc/biblehal/biblehal.conf ]
+then
+   . /etc/biblehal/biblehal.conf
+fi
+
+if "z${LABORATORY}" = "z" ]
+then
+   echo "LABORATORY must be configure in /etc/biblehal/biblehal.conf"
+   exit 1
+fi
+
+
 for year in 1990 1994 1995 1996 1997 $(seq 1999 $(date +%Y))
 do
-   biblehal-pop $year
+   biblehal-pop ${LABORATORY} ${year}
    
-   biblehal-explode $year
+   biblehal-explode ${year}
 done
-

trunk/biblehal-poplast

@@ -2 +2 @@
 #
 # gabriel 2010/06/15
+# gabriel 2011/04/01 update to biblehal
 
 export PATH="/bin:/usr/bin:/usr/lib/biblehal"
 
 
+if [ -f /etc/biblehal/biblehal.conf ]
+then
+   . /etc/biblehal/biblehal.conf
+fi
+
+if "z${LABORATORY}" = "z" ]
+then
+   echo "LABORATORY must be configure in /etc/biblehal/biblehal.conf"
+   exit 1
+fi
+
+
 for year in  $(( $(date +%Y) -1 )) $(date +%Y)
 do
-   biblehal-pop $year
+   biblehal-pop ${LABORATORY} ${year}
    
-   biblehal-explode $year
+   biblehal-explode ${year}
 done
-