Changeset 23726 for main/trunk/greenstone2

Timestamp:

2011-02-18T18:35:37+13:00 (13 years ago)

Author:

ak19

Message:

Sam's changes for Mac's libiconv seem to work so that word docs get processed even in the remote Mac GS Server case, therefore am undoing recent changes to gsicontrol.sh (resetting to revision 23252) and setup.bash (resetting to revision 23588) which got the old apache libiconv to only be found and used by apache which needed it, so wvware processing of word docs on a local Mac GS server worked using the system libiconv. But this fix hadn't solved the case for the remote Mac GS2 Server situation, since wvware then found apache's libiconv which was not right for it.

Location:

main/trunk/greenstone2

Files:

• gsicontrol.sh (modified) (2 diffs)
• setup.bash (modified) (1 diff)

main/trunk/greenstone2/gsicontrol.sh

@@ -3 +3 @@
 testdone=0
 
-# Setup.bash needs to be sourced
-# On MAC, need to tell apache to find and use its own libiconv<num>.dylib
-# If gs2-server.sh is run from GLI, we can't just test for the existence
-# of "apache-httpd", so use the full path (from GSDLHOME) to test it exists
 function test-gsdlhome {
     if [ $testdone == "0" ] ; then
@@ -20 +16 @@
         echo "  GSDLHOME = $GSDLHOME" ;
         echo "  GSDLOS   = $GSDLOS" ; 
-        if test -e "$GSDLHOME/apache-httpd" ; then
-        echo "+Adding in executable path for apache-httpd"
-        PATH=$GSDLHOME/apache-httpd/$GSDLOS/bin:$PATH
-        export PATH
-        
-        if test "$GSDLOS" = "linux" ; then
-            LD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$LD_LIBRARY_PATH"
-            export LD_LIBRARY_PATH
-        elif test "$GSDLOS" = "darwin" ; then      
-            DYLD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$DYLD_LIBRARY_PATH"
-            export DYLD_LIBRARY_PATH
-        fi
-        fi
         fi
     testdone=1

main/trunk/greenstone2/setup.bash

@@ -240 +240 @@
 fi
 
+if test -e apache-httpd ; then
+  echo "+Adding in executable path for apache-httpd"
+  PATH=$GSDLHOME/apache-httpd/$GSDLOS/bin:$PATH
+  export PATH
+
+  if test "$GSDLOS" = "linux" ; then
+      LD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$LD_LIBRARY_PATH"
+      export LD_LIBRARY_PATH
+  
+  elif test "$GSDLOS" = "darwin" ; then
+      DYLD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$DYLD_LIBRARY_PATH"
+      export DYLD_LIBRARY_PATH
+  fi
+fi
+
 if test -e local ; then
   if test -e local/setup.bash ; then