Changeset 18207 for other-projects

Timestamp:

2008-12-16T14:21:50+13:00 (15 years ago)

Author:

cc108

Message:

add new proxy settings

File:

• other-projects/trunk/greenstone3-extension/mat/bin/script/mat-colbuild-download.bash (modified) (4 diffs)

other-projects/trunk/greenstone3-extension/mat/bin/script/mat-colbuild-download.bash

@@ -1 +1 @@
 # if this file is executed, /bin/sh is used, as we don't start with #!
 # this should work under ash, bash, zsh, ksh, sh style shells.
-
-
-
 # $1 should be the collection name
 # $2 should be the oai URL
@@ -12 +9 @@
 # $7 should be the collection directory
 # $8 should the log file
-
+# $9 should be the creator
+# $10 should be the proxy settings
 GS3_ROOT=$6
 COLLECT_DIR=$7
@@ -34 +32 @@
 perl -S mkcol.pl -gs3mode -collectdir $COLLECT_DIR -creator $9 $1
 
-# need to ensure that OAIPLUG is included
-# hack the model collection to include it
-
 echo $1 $2 $3 $4 $5 $6 $7 $8 >> $LOG_FILE
 
@@ -54 +49 @@
 echo open files: $NUM_OPEN_FILES
 
-# use this line when metadata prefix has been added to OAI downloader
-# downloadfrom.pl -download_mode OAI -cache_dir $3 -url $2 -max_records $4 -prefix $5 -proxy_on -proxy_host wwwcache.cs.waikato.ac.nz -proxy_port 80 
-
-downloadfrom.pl -download_mode OAI -cache_dir $3 -url $2 -max_records $4 -metadata_prefix $5 -proxy_on -proxy_host wwwcache.cs.waikato.ac.nz -proxy_port 80  2>&1 >> $LOG_FILE
-
-#downloadfrom.pl -download_mode OAI -cache_dir $3 -url $2 -max_records $4 -metadata_prefix $5 >> $LOG_FILE
+downloadfrom.pl -download_mode OAI -cache_dir $3 -url $2 -max_records $4 -metadata_prefix $5 $10  2>&1 >> $LOG_FILE
 
 NUM_OPEN_FILES=`/usr/sbin/lsof -p $TOMCAT_ID | wc -l `
 echo open files: $NUM_OPEN_FILES
-# 2>&1 >> /tmp/mat.txt
 
-#source $GS3_ROOT/gs2build/bin/script/mat-colbuild.bash $1 $2 $3 $4 $5 $GS3_ROOT $COLLECT_DIR $LOG_FILE