Index: /main/trunk/greenstone3/build.xml =================================================================== --- /main/trunk/greenstone3/build.xml (revision 27134) +++ /main/trunk/greenstone3/build.xml (revision 27135) @@ -2065,9 +2065,9 @@ description="Update (SVN update, configure, compile etc) only the collection building components"/> - - + @@ -2125,4 +2125,7 @@ + + @@ -2133,5 +2136,27 @@ - + + + + + + + + + + + + + + + + + + + + @@ -2143,30 +2168,11 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + Index: /main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java =================================================================== --- /main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java (revision 27134) +++ /main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Construct.java (revision 27135) @@ -166,4 +166,7 @@ protected Element processBuildAndActivateCollection(Element request) { + + logger.error("**** GS2Construct Build and Activate: " + GSXML.elementToString(request, true)); + waitUntilReady(request); Element buildResponse = processBuildCollection(request); Index: /main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSFile.java =================================================================== --- /main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSFile.java (revision 27134) +++ /main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSFile.java (revision 27135) @@ -436,5 +436,11 @@ } // delete the file or directory - return f.delete(); + boolean success = f.delete(); + if(!success) { + logger.error("***** Could not delete file: " + f); + } + return success; + //return f.delete(); + } Index: /main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/usersDB2txt.java =================================================================== --- /main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/usersDB2txt.java (revision 27134) +++ /main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/usersDB2txt.java (revision 27135) @@ -29,4 +29,5 @@ import java.util.Properties; +// Run as java org.greenstone.gsdl3.util.usersDB2txt public class usersDB2txt { Index: /main/trunk/greenstone3/web/WEB-INF/classes/OAIConfig.xml =================================================================== --- /main/trunk/greenstone3/web/WEB-INF/classes/OAIConfig.xml (revision 27134) +++ /main/trunk/greenstone3/web/WEB-INF/classes/OAIConfig.xml (revision 27135) @@ -8,5 +8,5 @@ TODO: this element should be determined and overriden dynamically given the osi request url in OAIServer.java. WHAT'S DONE: when ant start is called, it writes out the default oaiserver URL to this file. --> - http://your-domain-name/greenstone3/oaiserver + http://localhost:8383/greenstone3/oaiserver 2.0 Index: /main/trunk/greenstone3/web/sites/localsite/collect/gs2mgdemo/etc/collectionConfig.xml =================================================================== --- /main/trunk/greenstone3/web/sites/localsite/collect/gs2mgdemo/etc/collectionConfig.xml (revision 27134) +++ /main/trunk/greenstone3/web/sites/localsite/collect/gs2mgdemo/etc/collectionConfig.xml (revision 27135) @@ -1,90 +1,177 @@ - - - - true - - - This is a demonstration collection for the Greenstone3 digital library software. It contains a small subset (11 books) of the Humanitarian and Development Libraries. It is the Greenstone 3 equivalent of the Greenstone 2 demo collection, built with MG. - - MG demo - - - - ÐÐ»Ð°Ð²Ñ - chapters - capÃtulos - chapitres - - - ÐПлМÑе ЎПкÑЌеМÑÑ - entire documents - documentos enteros - documents entiers - - - ÐÐ°Ð·Ð²Ð°ÐœÐžÑ ÑазЎелПв - section titles - tÃtulos de las secciones - titres des sections - - - - - - - - - : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Untitled() - - - - - - - + + + + true + + + This is a demonstration collection for the Greenstone3 digital library software. It contains a small subset (11 books) of the Humanitarian and Development Libraries. It is the Greenstone 3 equivalent of the Greenstone 2 demo collection, built with MG. + MG demo + ÐÐ»Ð°Ð²Ñ + chapters + capÃtulos + chapitres + ÐПлМÑе ЎПкÑЌеМÑÑ + entire documents + documentos enteros + documents entiers + ÐÐ°Ð·Ð²Ð°ÐœÐžÑ ÑазЎелПв + section titles + tÃtulos de las secciones + titres des sections + text + Title + Source + + + + + ÐÐ»Ð°Ð²Ñ + chapters + capÃtulos + chapitres + + + ÐПлМÑе ЎПкÑЌеМÑÑ + entire documents + documentos enteros + documents entiers + + + ÐÐ°Ð·Ð²Ð°ÐœÐžÑ ÑазЎелПв + section titles + tÃtulos de las secciones + titres des sections + + + + + + + + + + + + + + + + : + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Untitled + + + + + + () + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -92,6 +179,5 @@ oai_dc http://www.openarchives.org/OAI/2.0/oai_dc.xsd - http://www.openarchives.org/OAI/2.0/oai_dc/ - + http://www.openarchives.org/OAI/2.0/oai_dc/ dc:title,dc.Title @@ -102,5 +188,5 @@ - + Index: /main/trunk/greenstone3/web/sites/localsite/collect/lucene-jdbm-demo/etc/collectionConfig.xml =================================================================== --- /main/trunk/greenstone3/web/sites/localsite/collect/lucene-jdbm-demo/etc/collectionConfig.xml (revision 27134) +++ /main/trunk/greenstone3/web/sites/localsite/collect/lucene-jdbm-demo/etc/collectionConfig.xml (revision 27135) @@ -1,13 +1,10 @@ - - - - true + + + false - - Demo Collection This is a demonstration collection for the Greenstone3 digital library software. @@ -16,14 +13,39 @@ Lucene for indexing and JDBM as the database for metadata. - + Demo Collection + all fields + text + titles + subjects + organisations + text + Title + Source + chapter + book + Demonstration collection containing a few books from the Humanitarian and Development Libraries. Uses Lucene and JDBM. - + - - - - - + + + + + + + + + + + + + + + + + @@ -49,32 +71,34 @@ organisations - - - - - + - - - - - - - - - - - - - - - Untitled - - - - - + + + + + + + + + + + + + + + + + + + + Untitled + + + + + + @@ -127,88 +151,83 @@ - - - - - - - - - - - - - - - - - - - - - - - Untitled - - - - - - - () - - - - - - - - - - - - - - - - - - Untitled - - - - - - () - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + Untitled + + + + + + + () + + + + + + + + + + + + + + + + + Untitled + + + + + + () + + + + + + + + + + + - - - - - - - - - - + + + + + + + + - - + - - @@ -216,11 +235,10 @@ oai_dc http://www.openarchives.org/OAI/2.0/oai_dc.xsd - http://www.openarchives.org/OAI/2.0/oai_dc/ - - - dc:title,dc.Title - dc:subject,dc.Subject - dc:language,dc.Language - dc:publisher,dls.Organization + http://www.openarchives.org/OAI/2.0/oai_dc/ + + dc:title,dc.Title + dc:subject,dc.Subject + dc:language,dc.Language + dc:publisher,dls.Organization