Changeset 16675

Timestamp:

Feb 26, 2008, 2:49:12 PM (18 years ago)

Author:

bills

Message:

get configuration information from IPP config system.
Install the scripts.

Location:

trunk/pstamp

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• scripts (modified) (1 prop)
• scripts/.cvsignore (added)
• scripts/Makefile.am (added)
• scripts/pstamp_new_request.sh (modified) (1 diff)
• scripts/pstamp_parser_run.pl (modified) (2 diffs)

trunk/pstamp/Makefile.am

@@ -1 @@
-SUBDIRS = src
+SUBDIRS = src scripts
 
 CLEANFILES = *~ core core.*

trunk/pstamp/configure.ac

@@ -4 +4 @@
 AC_INIT([ppstamp], [0.1.1], [ipp-support@ifa.hawaii.edu])
 AC_CONFIG_SRCDIR([src])
+AC_CONFIG_SRCDIR([scripts])
 
 AM_INIT_AUTOMAKE([1.6 foreign dist-bzip2])
@@ -44 +45 @@
   Makefile
   src/Makefile
+  scripts/Makefile
 ])
 

trunk/pstamp/scripts/pstamp_new_request.sh

@@ -47 +47 @@
 # Invoke the data store registration script
 echo $request_file chip n/a | dsreg -dsdir $DATA_STORE -add -type PSTAMP $PRODUCT $fileset_id
+
 status=$?
-if [[ $status != 0 ]]; then
+if [[ $status != 0 ]] ; then
     echo dsreg failed: $status
     rm -r $dir_path
     exit $status
-end
+fi
 
 exit 0
+

trunk/pstamp/scripts/pstamp_parser_run.pl

@@ -19 +19 @@
 my $request_id = $ARGV[0];
 
-# XXX: CONFIGURATION: get these from a configuration file
-my $inputWorkdir = "/export/data1/bills/pstamp/work/$request_id";
-my $outputDataStoreRoot = "/var/www/html/ds/dsroot";
-my $defaultOutputRoot = $outputDataStoreRoot;
 
 use IPC::Cmd 0.36 qw( can_run run );
@@ -42 +38 @@
                        );
 
+my $ipprc = PS::IPP::Config->new(); # IPP Configuration
+
+#my $outputDataStoreRoot = "/var/www/html/ds/dsroot";
+
+my $outputDataStoreRoot = metadataLookupStr($ipprc->{_ipprc}, 'PSTAMP_DATA_STORE_ROOT');
+exit ($PS_EXIT_CONFIG_ERROR) unless defined $outputDataStoreRoot;
+my $defaultOutputRoot = $outputDataStoreRoot;
+
+
+#my $inputWorkdir = "/export/data1/bills/pstamp/work/$request_id";
+
+my $inputWorkdir = metadataLookupStr($ipprc->{_ipprc}, 'PSTAMP_WORKDIR');
+exit ($PS_EXIT_CONFIG_ERROR) unless defined $inputWorkdir;
+$inputWorkdir .= "/$request_id";
+    
 my $missing_tools;