Changeset 21996 for gs3-extensions/mat/trunk

Timestamp:

2010-04-29T16:34:05+12:00 (14 years ago)

Author:

sjm84

Message:

This now receives the hostname and port number from the servlet, also lsof is checked for in both /usr/bin and /usr/sbin, it also no longer attempts to convert collections from gs2 to gs3

File:

• gs3-extensions/mat/trunk/bin/script/mat-colbuild.bash (modified) (5 diffs)

gs3-extensions/mat/trunk/bin/script/mat-colbuild.bash

@@ +1 @@
+#!/bin/bash
 # 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 +10 @@
 # $7 should be the collection directory
 # $8 should the log file
+# $9 should be the host name : port number
 
 #$GS3_ROOT=$6
 #$COLLECT_DIR=$7
 #$LOG_FILE=$8
+CACHE_DIR=$3
 
 # check we are still in the right directories
+
+if [ -x /usr/bin/lsof ] ; then
+  lsof=/usr/bin/lsof
+else 
+  if [ -x /usr/sbin/lsof ] ; then
+    lsof=/usr/sbin/lsof
+  else 
+    echo "Warning: Unable to find 'lsof', skipping test for number of files open"
+  fi
+fi
 
 TOMCAT_ID=`ps ux  | grep tomcat | grep java | grep -v grep | awk -F" " '{ print $2 }'`
 echo Tomcat_ID: $TOMCAT_ID
 
-NUM_OPEN_FILES=`/usr/sbin/lsof -p $TOMCAT_ID | wc -l `
-echo open files: $NUM_OPEN_FILES
+if [ ! -z "$lsof" ] ; then
+  NUM_OPEN_FILES=`$lsof -p $TOMCAT_ID | wc -l `
+  echo open files: $NUM_OPEN_FILES
+fi
 
 cd $6
@@ -38 +50 @@
 echo "Away to build"  >> $8
 
-build -indextype lucene -site localsite -collectdir $7 -log_events -download file://$3  $1 2>&1
+build -indextype lucene -site localsite -collectdir $7 -log_events -download file://$CACHE_DIR  $1 2>&1
 #2>&1  >> $LOG_FILE
 
 # -log_events
 # >> $LOG_FILE
-NUM_OPEN_FILES=`/usr/sbin/lsof -p $TOMCAT_ID | wc -l `
-echo open files: $NUM_OPEN_FILES
+if [ ! -z "$lsof" ] ; then
+  NUM_OPEN_FILES=`$lsof -p $TOMCAT_ID | wc -l `
+  echo open files: $NUM_OPEN_FILES
+fi
 
 echo "Build finished ...." >> $8
@@ -60 +74 @@
 # >> $LOG_FILE
 
-convert_coll_from_gs2.pl -collectdir $7 $1 
-
-NUM_OPEN_FILES=`/usr/sbin/lsof -p $TOMCAT_ID | wc -l `
-echo open files: $NUM_OPEN_FILES
-# >> $LOG_FILE
+if [ ! -z "$lsof" ] ; then
+  NUM_OPEN_FILES=`$lsof -p $TOMCAT_ID | wc -l `
+  echo open files: $NUM_OPEN_FILES
+  # >> $LOG_FILE
+fi
 
 echo "Away to reconfigure Greenstone 3 server"  >> $8
@@ -72 +86 @@
 
 #wget -O /tmp/mat5.html "http://localhost:8090/greenstone3/library?a=s&sa=c" 
-wget -O /tmp/mat3.html "http://localhost:8090/greenstone3/library?a=s&sa=c" 
+wget -O /tmp/mat3.html "http://$9/greenstone3/library?a=s&sa=c" 
 
 echo "Done"  >> $8
 echo "Done" 
-NUM_OPEN_FILES=`/usr/sbin/lsof -p $TOMCAT_ID | wc -l `
-echo open files: $NUM_OPEN_FILES
 
-/usr/sbin/lsof -p $TOMCAT_ID 
+if [ ! -z "$lsof" ] ; then
+  NUM_OPEN_FILES=`$lsof -p $TOMCAT_ID | wc -l `
+  echo open files: $NUM_OPEN_FILES
+
+  $lsof -p $TOMCAT_ID 
 # >> $LOG_FILE
+fi