Changeset 24297

Timestamp:

2011-07-20T18:52:50+12:00 (12 years ago)

Author:

ak19

Message:

Improvement to code committed previously: 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 relocation code of the reset-gsdlhome target doesn't get exected every time, only when the gsdlhome property in gsdlsite.cfg is different from GSDLHOME var (which points to the current greenstone installation directory.)

Location:

main/trunk/greenstone2

Files:

• bin/script/mkcol.pl (modified) (1 diff)
• build-src/packages/Makefile (modified) (1 diff)
• collect/demo/etc/collect.cfg (modified) (2 diffs)
• collect/modelcol/etc/collect.cfg (modified) (2 diffs)
• etc/main.cfg (modified) (1 diff)
• etc/oai.cfg (modified) (2 diffs)
• gsicontrol.bat (modified) (2 diffs)
• gsicontrol.sh (modified) (3 diffs)

main/trunk/greenstone2/bin/script/mkcol.pl

@@ -353 +353 @@
     # load default plugins if none were on command line
     if (!scalar(@plugin)) {
-    @plugin = (ZIPPlugin,GreenstoneXMLPlugin,TextPlugin,HTMLPlugin,EmailPlugin,
+    @plugin = (ZIPPlugin,GreenstoneXMLPlugin,EmbeddedMetadataPlugin,TextPlugin,HTMLPlugin,EmailPlugin,
            PDFPlugin,RTFPlugin,WordPlugin,PostScriptPlugin,PowerPointPlugin,ExcelPlugin,ImagePlugin,ISISPlugin,NulPlugin,MetadataXMLPlugin,ArchivesInfPlugin,DirectoryPlugin);
     }

main/trunk/greenstone2/build-src/packages/Makefile

@@ -32 +32 @@
 PACKAGEDIRS = 
 
-USE_WVWARE=0
+USE_WVWARE=1
 ifeq ($(USE_WVWARE), 1)
 PACKAGEDIRS += wv/wv-gs 

main/trunk/greenstone2/collect/demo/etc/collect.cfg

@@ -15 +15 @@
 # following two plugins not needed for the demo collection, but are useful to
 # include for tutorial purposes
-plugin  ImagePlugin
-plugin  ZIPPlugin
+plugin  ImagePlugin
+plugin  ZIPPlugin
 plugin  MetadataXMLPlugin
 plugin  ArchivesInfPlugin
@@ -25 +25 @@
 classify    Hierarchy -metadata dls.Subject -sort dls.Title
 
-classify    List -sort_leaf_nodes_using dls.Title -metadata dls.Organization -bookshelf_type always -partition_type_within_level constant_size
+classify    List -metadata dls.Organization -sort_leaf_nodes_using dls.Title -bookshelf_type always -partition_type_within_level constant_size
 
 classify    List -metadata dls.Keyword -partition_type_within_level constant_size -buttonname Howto

main/trunk/greenstone2/collect/modelcol/etc/collect.cfg

@@ -6 +6 @@
 infodbtype  **infodbtype**
 
-indexes     text dc.Title,ex.Title ex.Source
+indexes     text dc.Title,ex.dc.Title,ex.Title ex.Source
 defaultindex    text
 
@@ -20 +20 @@
 collectionmeta collectionextra   "**about**"
 collectionmeta  .text "_labeltext_"
-collectionmeta  .dc.Title,Title "_labelTitle_"
+collectionmeta  .dc.Title,ex.dc.Title,ex.Title "_labelTitle_"
 collectionmeta  .Source "_labelSource_"
 collectionmeta .document "_textdocument_"

main/trunk/greenstone2/etc/main.cfg

@@ -23 +23 @@
 # Set status to "enabled" if you want the Maintenance and
 # Administration facility to be available.
-status      disabled
+#status     disabled
+status      enabled
 
 # Set collector to "enabled" if you want the "collector"

main/trunk/greenstone2/etc/oai.cfg

@@ -42 +42 @@
 
 # The OAI repository name - human readable
-repositoryName ""
+#repositoryName ""
+repositoryName "Greenstone"
 
 # The OAI repository domain name or unique identifier - used for generating 
 # the document identifiers, which will be like:
 # oai:reposId:coll:oid
-repositoryId ""
+#repositoryId ""
+repositoryId "greenstone"
 
 # version is which oai id scheme is used for ids. Can be 1.1 or 2.0.
@@ -75 +77 @@
 # and this is followed by one or more collection names. The collection name 
 # is the name of the collection's folder in the collect directory.
-oaicollection demo documented-examples/oai-e 
+oaicollection demo documented-examples/oai-e oaipdf
 
 # Optional, set name and description for each collection

main/trunk/greenstone2/gsicontrol.bat

@@ -178 +178 @@
 :: reset-gsdlhome forces configure-cgi by renaming any 
 :: existing gsdlsite.cfg and by deleting Mac .app files
+:: However, we only relocate if there is a gsdlsite.cfg file with its gsdlhome 
+:: property the same as the current (greenstone installation) directory
 :resethome
 echo.
-if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" (
-    move "%GSDLHOME%\%cgibin%\gsdlsite.cfg" "%GSDLHOME%\%cgibin%\gsdlsite.cfg.bak"  
-    echo **** Regenerating %GSDLHOME%\%cgibin%\gsdlsite.cfg
-    echo **** Previous version of file now %GSDLHOME%\%cgibin%\gsdlsite.cfg.bak
-)
-
+if not exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" goto relocate
+
+FOR /F "tokens=2" %%G IN ('findstr /R ^gsdlhome "%cgibin%\gsdlsite.cfg"') do set gshome=%%G
+if "x%gshome%" == "x%GSDLHOME%" set gshome=& goto exit
+  
+move "%GSDLHOME%\%cgibin%\gsdlsite.cfg" "%GSDLHOME%\%cgibin%\gsdlsite.cfg.bak"
+echo **** Regenerating %GSDLHOME%\%cgibin%\gsdlsite.cfg
+echo **** Previous version of file now %GSDLHOME%\%cgibin%\gsdlsite.cfg.bak
+set gshome=
+
+:relocate
 for /F "delims=*" %%T in ('"echo %GSDLHOME%| %_sed% s@\\@\/@g"') do set safepath=%%T
 
@@ -214 +221 @@
 %_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." ;
@@ -175 +167 @@
 }
 
-# forces configure-cgi by deleting gsdlsite.cfg
+# Forces configure-cgi by renaming gsdlsite.cfg
+# but only if we actually *need* to relocate gsdlhome.
+# We relocate at all times, except when there is a gsdlsite.cfg file with its
+# gsdlhome property the same as the current (greenstone installation) directory
 function reset-gsdlhome {
     echo "" ;
+    relocate=yes ;
     if test -e "$GSDLHOME/$cgibin/gsdlsite.cfg" ; then
-    /bin/mv "$GSDLHOME/$cgibin/gsdlsite.cfg" "$GSDLHOME/$cgibin/gsdlsite.cfg.bak" ;
-    echo "**** Regenerating $GSDLHOME/$cgibin/gsdlsite.cfg" ;
-    echo "**** Previous version of file now $GSDLHOME/$cgibin/gsdlsite.cfg.bak" ;
-    fi
-
-    apache_home_os="$GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH"
-
-    if test ! -e "$apache_home_os/bin/apachectl.in" ; then
-    make apache-for-dist
-    fi
+    stored_gsdlhome=`egrep "^gsdlhome" "$cgibin/gsdlsite.cfg" | awk '{print $2}'` ;
+    if [ "x$stored_gsdlhome" != "x$GSDLHOME" ]; then
+        /bin/mv "$GSDLHOME/$cgibin/gsdlsite.cfg" "$GSDLHOME/$cgibin/gsdlsite.cfg.bak" ;
+        echo "**** Regenerating $GSDLHOME/$cgibin/gsdlsite.cfg" ;
+        echo "**** Previous version of file now $GSDLHOME/$cgibin/gsdlsite.cfg.bak" ;
+    else
+        relocate=
+    fi
+    fi  
     
-    replace_list="conf/extra/httpd-dav.conf \
+    if [ "x$relocate" = "xyes" ]; then
+    apache_home_os="$GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH"
+    
+    if test ! -e "$apache_home_os/bin/apachectl.in" ; then
+        make apache-for-dist
+    fi
+    
+    replace_list="conf/extra/httpd-dav.conf \
             conf/extra/httpd-manual.conf \
             conf/extra/httpd-autoindex.conf \
@@ -218 +220 @@
             include/ap_config_layout.h"
 
-    for one_file in apachectl envvars envvars-std ; do 
-    /bin/cp "$apache_home_os/bin/$one_file.in" "$apache_home_os/bin/$one_file"
-    done 
-    
-    for one_file in $replace_list ; do 
-    /bin/cp "$apache_home_os/$one_file.in" "$apache_home_os/$one_file"
-    done
-    
-    /bin/cp "$apache_home_os/bin/apr-1-config.in" "$apache_home_os/bin/apr-1-config"
-    
-    /bin/cp "$apache_home_os/bin/apu-1-config.in" "$apache_home_os/bin/apu-1-config"
-    
-    /bin/cp "$apache_home_os/build/config_vars.mk.in" "$apache_home_os/build/config_vars.mk"
-
+    for one_file in apachectl envvars envvars-std ; do 
+        /bin/cp "$apache_home_os/bin/$one_file.in" "$apache_home_os/bin/$one_file"
+    done 
+    
+    for one_file in $replace_list ; do 
+        /bin/cp "$apache_home_os/$one_file.in" "$apache_home_os/$one_file"
+    done
+    
+    /bin/cp "$apache_home_os/bin/apr-1-config.in" "$apache_home_os/bin/apr-1-config"
+    
+    /bin/cp "$apache_home_os/bin/apu-1-config.in" "$apache_home_os/bin/apu-1-config"
+    
+    /bin/cp "$apache_home_os/build/config_vars.mk.in" "$apache_home_os/build/config_vars.mk"
+    
 # replace template files with active versions. The following will generate a httpd.conf
 # file with placeholder strings, all of which we'll replace shortly hereafter.
-    bash "$apache_home_os/install-bindist.sh" "$apache_home_os"
-    
-    log4jprop=$GSDLHOME/lib/java/log4j.properties
-    sed "s^@gsdl2home@^$GSDLHOME^g" "$log4jprop.in" > "$log4jprop"
-
-    for one_file in gs2-server.app gli.app client-gli.app gems.app ; do 
-    if test -e "$one_file/Contents/document.wflow" ; then
-        rm -f "$one_file/Contents/document.wflow"
-    fi
-    done
-
-    configure-web $1
+    bash "$apache_home_os/install-bindist.sh" "$apache_home_os"
+    
+    log4jprop=$GSDLHOME/lib/java/log4j.properties
+    sed "s^@gsdl2home@^$GSDLHOME^g" "$log4jprop.in" > "$log4jprop"
+    
+    for one_file in gs2-server.app gli.app client-gli.app gems.app ; do 
+        if test -e "$one_file/Contents/document.wflow" ; then
+        rm -f "$one_file/Contents/document.wflow"
+        fi
+    done
+    
+    configure-web $1
+    fi
 }