Changeset 24295 for main/trunk/greenstone2

Timestamp:

2011-07-20T15:06:40+12:00 (13 years ago)

Author:

ak19

Message:

Fixed a bug introduced with the reset-gsdlhome target where any non-standard collecthome value written into the gsdlsite.cfg was lost on startup since reset-gsdlhome always regenerated gsdlsite.cfg from the template file. Now the collecthome property is reinstated when the gsdlsite.cfg is generated, by taking this from the gsdlsite.cfg.bak file.

Location:

main/trunk/greenstone2

Files:

• gsicontrol.bat (modified) (2 diffs)
• gsicontrol.sh (modified) (1 diff)

main/trunk/greenstone2/gsicontrol.bat

@@ -204 +204 @@
 
 :cfgcgi
+:: Need to preserve the user-assigned collecthome property, if any
 if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" goto cgimsg
 echo Configuring %cgibin%\gsdlsite.cfg
@@ -209 +210 @@
 echo # For local customization of Greenstone, edit gsdlsite.cfg.in >> "%cgibin%\gsdlsite.cfg"
 echo. >> "%cgibin%\gsdlsite.cfg"
+
 for /F "delims=*" %%T in ('"echo %GSDLHOME%| %_sed% s@\\@\\\\@g"') do set safepath=%%T
 %_sed% "s@\*\*GSDLHOME\*\*@\"%safepath%\"@g" "%cgibin%\gsdlsite.cfg.in" >> "%cgibin%\gsdlsite.cfg"
 set safepath=
+
+if exist "%cgibin%\gsdlsite.cfg.bak" FOR /F "tokens=2" %%G IN ('findstr /R ^collecthome "%cgibin%\gsdlsite.cfg.bak"') do set colhome=%%G
+if not "%colhome%" == "" echo collecthome %colhome% >> "%cgibin%\gsdlsite.cfg"& echo. >> "%cgibin%\gsdlsite.cfg"
+set colhome=
+
 goto cgifin
 

main/trunk/greenstone2/gsicontrol.sh

@@ -41 +41 @@
     echo "" >> "$cgibin/gsdlsite.cfg" ;
     sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "$cgibin/gsdlsite.cfg.in" >> "$cgibin/gsdlsite.cfg" ;
+# preserve the user-assigned collecthome property, if any
+    if test -e "$GSDLHOME/$cgibin/gsdlsite.cfg.bak" ; then
+        collecthome=`egrep "^collecthome" "$cgibin/gsdlsite.cfg.bak" | awk '{print $2}'` ;
+        if test -n $collecthome ; then
+        echo "collecthome $collecthome" >> "$cgibin/gsdlsite.cfg" ;
+        echo "" >> "$cgibin/gsdlsite.cfg" ;
+        fi
+    fi
     else
     echo "WARNING: Nothing done for make configure-cgi." ;