Index: /gsdl/trunk/collect/demo/etc/collect.cfg
===================================================================
--- /gsdl/trunk/collect/demo/etc/collect.cfg	(revision 19126)
+++ /gsdl/trunk/collect/demo/etc/collect.cfg	(revision 19127)
@@ -8,17 +8,17 @@
 indexes		text dls.Title,Title dls.Subject dls.Organization dls.Keyword
 
-levels	section document
+levels		section document
 
-plugin	GreenstoneXMLPlugin
-plugin	HTMLPlugin -description_tags
-plugin	MetadataXMLPlugin
-plugin	ArchivesInfPlugin
-plugin	DirectoryPlugin
+plugin		GreenstoneXMLPlugin
+plugin		HTMLPlugin -description_tags
+plugin		MetadataXMLPlugin
+plugin		ArchivesInfPlugin
+plugin		DirectoryPlugin
 
 classify	List -metadata dls.Title
 
-classify	Hierarchy -metadata "dls.Subject" -sort dls.Title
+classify	Hierarchy -metadata dls.Subject -sort dls.Title
 
-classify	List -sort_leaf_nodes_using dls.Title -metadata dls.Organization -bookshelf_type always
+classify	List -metadata dls.Organization -bookshelf_type always -sort_leaf_nodes_using dls.Title 
 
 classify	List -metadata dls.Keyword -buttonname Howto
@@ -39,18 +39,16 @@
 format DocumentHeading "{Or}{[parent(Top):Title],[Title],untitled}<br>"
 
-format SearchTypes "plain,form"
-
 # -- English strings ----------------
 collectionmeta	collectionname [l=en] "Greenstone demo"
 collectionmeta	collectionextra [l=en] "This is a demonstration collection for the Greenstone digital library software.\nIt contains a small subset (11 documents) of the Humanity Development Library."
 
-collectionmeta	.text [l=en] "text"
-collectionmeta	.dls.Title,Title [l=en] "titles"
-collectionmeta	.dls.Subject [l=en] "subjects"
-collectionmeta	.dls.Organization [l=en] "organizations"
-collectionmeta	.dls.Keyword [l=en] "how to"
+collectionmeta .text [l=en] "text"
+collectionmeta .dls.Title,Title [l=en] "titles"
+collectionmeta .dls.Subject [l=en] "subjects"
+collectionmeta .dls.Organization [l=en] "organizations"
+collectionmeta .dls.Keyword [l=en] "how to"
 
-collectionmeta	.document [l=en] "book"
-collectionmeta	.section [l=en] "chapter"
+collectionmeta .document [l=en] "book"
+collectionmeta .section [l=en] "chapter"
 
 collectionmeta	depositormetadata [l=en] "{\"name\":\"dls.Title\",\"label\":\"Title\",\"tooltip\":\"dls.Title: The title of this resource.\",\"type\":\"text\"}, {\"name\":\"dls.Organization\",\"label\":\"Organization\",\"tooltip\":\"dls.Organization: The organization responsible for producing this resource.\",\"type\":\"text\"}, {\"name\":\"dls.Subject\",\"label\":\"Subject\",\"tooltip\":\"dls.Subject: The subject of this resource.\",\"type\":\"text\"}, {\"name\":\"dls.Keyword\",\"label\":\"Keyword\",\"tooltip\":\"dls.Keyword: A more specific indication of what the resource can be used for.\",\"type\":\"text\"}, {\"name\":\"dls.Language\",\"label\":\"Language\",\"tooltip\":\"dls.Language: The language of this resource.\",\"type\":\"text\"}"
@@ -58,13 +56,13 @@
 # -- French strings ----------------
 collectionmeta	collectionname [l=fr] "DÃ©mo Greenstone"
-collectionmeta	collectionextra [l=fr] "Il s\'agit d\'une collection de dÃ©monstration pour le logiciel de bibliothÃšque numÃ©rique Greenstone.\nElle contient un petit Ã©chantillon (11 documents) de la BibliothÃšque de DÃ©veloppement de l\'HumanitÃ©."
+collectionmeta	collectionextra [l=fr] "Il s'agit d'une collection de dÃ©monstration pour le logiciel de bibliothÃšque numÃ©rique Greenstone.\nElle contient un petit Ã©chantillon (11 documents) de la BibliothÃšque de DÃ©veloppement de l'HumanitÃ©."
 
-collectionmeta	.text [l=fr] "texte"
-collectionmeta	.dls.Title,Title [l=fr] "titres"
-collectionmeta	.dls.Subject [l=fr] "sujets"
-collectionmeta	.dls.Organization [l=fr] "organisations"
-collectionmeta	.dls.Keyword [l=fr] "comment faire"
-collectionmeta	.document [l=fr] "livre"
-collectionmeta	.section [l=fr] "chÃ¢pitre"
+collectionmeta .text [l=fr] "texte"
+collectionmeta .dls.Title,Title [l=fr] "titres"
+collectionmeta .dls.Subject [l=fr] "sujets"
+collectionmeta .dls.Organization [l=fr] "organisations"
+collectionmeta .dls.Keyword [l=fr] "comment faire"
+collectionmeta .document [l=fr] "livre"
+collectionmeta .section [l=fr] "chÃ¢pitre"
 
 # -- Spanish strings ----------------
@@ -72,22 +70,22 @@
 collectionmeta	collectionextra [l=es] "Esta es una colecciÃ³n de demostraciÃ³n del programa Greenstone.\nContiene un pequeÃ±o subconjunto (11 documentos) de la Biblioteca para el Desarrollo Humano."
 
-collectionmeta	.text [l=es] "texo"
-collectionmeta	.dls.Title,Title [l=es] "tÃ­tulos"
-collectionmeta	.dls.Subject [l=es] "temas"
-collectionmeta	.dls.Organization [l=es] "organizaciones"
-collectionmeta	.dls.Keyword [l=es] "cÃ³mo"
-collectionmeta	.document [l=es] "libro"
-collectionmeta	.section [l=es] "capÃ­tulo"
+collectionmeta .text [l=es] "texo"
+collectionmeta .dls.Title,Title [l=es] "tÃ­tulos"
+collectionmeta .dls.Subject [l=es] "temas"
+collectionmeta .dls.Organization [l=es] "organizaciones"
+collectionmeta .dls.Keyword [l=es] "cÃ³mo"
+collectionmeta .document [l=es] "libro"
+collectionmeta .section [l=es] "capÃ­tulo"
 
 # -- Russian strings ----------------
 collectionmeta	collectionname [l=ru] "ÐŽÐµÐŒÐŸÐœÑÑÑÐ°ÑÐžÐŸÐœÐœÑÐ¹ Ð¿ÑÐžÐŒÐµÑ ÐÑÐžÐœÑÑÐŸÑÐœ"
 collectionmeta	collectionextra [l=ru] "Ð­ÑÐŸ - ÐŽÐµÐŒÐŸÐœÑÑÑÐ°ÑÐžÐŸÐœÐœÐ°Ñ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÑ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐœÐŸÐ³ÐŸ ÐŸÐ±ÐµÑÐ¿ÐµÑÐµÐœÐžÑ ÑÐžÑÑÐŸÐ²ÐŸÐ¹ Ð±ÐžÐ±Ð»ÐžÐŸÑÐµÐºÐž ÐÑÐžÐœÑÑÐŸÑÐœ. ÐÐœÐ° ÑÐŸÐŽÐµÑÐ¶ÐžÑ ÐœÐµÐ±ÐŸÐ»ÑÑÐŸÐ¹ Ð¿ÐŸÐŽÐœÐ°Ð±ÐŸÑ (11 ÐŽÐŸÐºÑÐŒÐµÐœÑÐŸÐ²) ÐÑÐŒÐ°ÐœÐžÑÐ°ÑÐœÐŸÐ¹ Ð±ÐžÐ±Ð»ÐžÐŸÑÐµÐºÐž ÑÐ°Ð·Ð²ÐžÑÐžÑ."
-collectionmeta	.text [l=ru] "ÑÐµÐºÑÑ"
-collectionmeta	.dls.Title,Title [l=ru] "Ð·Ð°Ð³ÐŸÐ»ÐŸÐ²ÐºÐž"
-collectionmeta	.dls.Subject [l=ru] "ÑÐºÐ°Ð·Ð°ÑÐµÐ»Ðž"
-collectionmeta	.dls.Organization [l=ru] "ÐŸÑÐ³Ð°ÐœÐžÐ·Ð°ÑÐžÐž"
-collectionmeta	.dls.Keyword [l=ru] "ÑÐ¿ÐŸÑÐŸÐ±Ñ"
-collectionmeta	.document [l=ru] "ÐºÐœÐžÐ³Ð°"
-collectionmeta	.section [l=ru] "Ð³Ð»Ð°Ð²Ð°"
+collectionmeta .text [l=ru] "ÑÐµÐºÑÑ"
+collectionmeta .dls.Title,Title [l=ru] "Ð·Ð°Ð³ÐŸÐ»ÐŸÐ²ÐºÐž"
+collectionmeta .dls.Subject [l=ru] "ÑÐºÐ°Ð·Ð°ÑÐµÐ»Ðž"
+collectionmeta .dls.Organization [l=ru] "ÐŸÑÐ³Ð°ÐœÐžÐ·Ð°ÑÐžÐž"
+collectionmeta .dls.Keyword [l=ru] "ÑÐ¿ÐŸÑÐŸÐ±Ñ"
+collectionmeta .document [l=ru] "ÐºÐœÐžÐ³Ð°"
+collectionmeta .section [l=ru] "Ð³Ð»Ð°Ð²Ð°"
 
 # -- Arabic strings ----------------
@@ -107,14 +105,14 @@
 ÙØªØšØ© Ø§ÙØªÙÙ
 ÙØ© Ø§ÙØšØŽØ±ÙØ©."
-collectionmeta	.text [l=ar] "ÙØµ"
-collectionmeta	.dls.Title,Title [l=ar] "Ø§ÙØ¹ÙØ§ÙÙÙ"
-collectionmeta	.dls.Subject [l=ar] "Ø§ÙÙ
+collectionmeta .text [l=ar] "ÙØµ"
+collectionmeta .dls.Title,Title [l=ar] "Ø§ÙØ¹ÙØ§ÙÙÙ"
+collectionmeta .dls.Subject [l=ar] "Ø§ÙÙ
 ÙØ¶ÙØ¹Ø§Øª"
-collectionmeta	.dls.Organization [l=ar] "Ø§ÙÙ
+collectionmeta .dls.Organization [l=ar] "Ø§ÙÙ
 ÙØžÙ
 Ø§Øª"
-collectionmeta	.dls.Keyword [l=ar] "Ø¥Ø±ØŽØ§Ø¯"
-collectionmeta	.document [l=ar] "ÙØªØ§Øš"
-collectionmeta	.section [l=ar] "ÙØµÙ"
+collectionmeta .dls.Keyword [l=ar] "Ø¥Ø±ØŽØ§Ø¯"
+collectionmeta .document [l=ar] "ÙØªØ§Øš"
+collectionmeta .section [l=ar] "ÙØµÙ"
 
 # -- Armenian strings ----------------
@@ -132,12 +130,13 @@
 collectionmeta	collectionextra [l=pt-br] "Esta Ã© uma coleÃ§Ã£o de demonstraÃ§Ã£o para o software de biblioteca digital Greenstone. \nEle contÃ©m um pequeno subconjunto (11 documentos) da Biblioteca de Desenvolvimento Humano."
 
-collectionmeta	.text [l=pt-br] "texto"
-collectionmeta	.dls.Title,Title [l=pt-br] "tÃ­tulos"
-collectionmeta	.dls.Subject [l=pt-br] "assuntos"
-collectionmeta	.dls.Organization [l=pt-br] "organizaÃ§Ãµes"
-collectionmeta	.dls.Keyword [l=pt-br] "como fazer"
+collectionmeta .text [l=pt-br] "texto"
+collectionmeta .dls.Title,Title [l=pt-br] "tÃ­tulos"
+collectionmeta .dls.Subject [l=pt-br] "assuntos"
+collectionmeta .dls.Organization [l=pt-br] "organizaÃ§Ãµes"
+collectionmeta .dls.Keyword [l=pt-br] "como fazer"
 
-collectionmeta	.document [l=pt-br] "livro"
-collectionmeta	.section [l=pt-br] "capÃ­tulo"
+collectionmeta .document [l=pt-br] "livro"
+collectionmeta .section [l=pt-br] "capÃ­tulo"
+
 
 # -- Thai strings ----------------
@@ -145,12 +144,13 @@
 collectionmeta	collectionextra [l=th] "àžàž­àž¥à¹àž¥àžàžàž±àžàžàžµà¹à¹àžà¹àžàžàž­àž¥à¹àž¥àžàžàž±àžàžªàž²àžàžŽàžàžàž­àžàžàž­àžàžà¹à¹àž§àž£à¹àž«à¹àž­àžàžªàž¡àžžàžàžàžŽàžàžŽàžàž±àž¥àžàž£àžµàžà¹àžàž\nIt àžàž¶à¹àžàžàž£àž°àžàž­àžàžà¹àž§àž¢àžàžžàžàžà¹àž­àž¡àž¹àž¥àž¢à¹àž­àž¢àžàžàž²àžà¹àž¥à¹àžàžàž³àžàž§àžàž«àžàž¶à¹àžàžàžžàž (à¹àž­àžàžªàž²àž£àžàž³àžàž§àž 11 àžàžàž±àž) àžàž­àžàž«à¹àž­àžàžªàž¡àžžàžà¹àžàž·à¹àž­àžàž²àž£àžàž±àžàžàž²àž¡àžàžžàž©àž¢àžàž²àžàžŽ (Humanity Development Library)"
 
-collectionmeta	.text [l=th] "àžà¹àž­àžàž§àž²àž¡"
-collectionmeta	.dls.Title,Title [l=th] "àžàž·à¹àž­à¹àž£àž·à¹àž­àž"
-collectionmeta	.dls.Subject [l=th] "àž«àž±àž§à¹àž£àž·à¹àž­àž"
-collectionmeta	.dls.Organization [l=th] "àž«àžà¹àž§àž¢àžàž²àž"
-collectionmeta	.dls.Keyword [l=th] "àž§àžŽàžàžµà¹àžà¹"
+collectionmeta .text [l=th] "àžà¹àž­àžàž§àž²àž¡"
+collectionmeta .dls.Title,Title [l=th] "àžàž·à¹àž­à¹àž£àž·à¹àž­àž"
+collectionmeta .dls.Subject [l=th] "àž«àž±àž§à¹àž£àž·à¹àž­àž"
+collectionmeta .dls.Organization [l=th] "àž«àžà¹àž§àž¢àžàž²àž"
+collectionmeta .dls.Keyword [l=th] "àž§àžŽàžàžµà¹àžà¹"
 
-collectionmeta	.document [l=th] "àž«àžàž±àžàžªàž·àž­"
-collectionmeta	.section [l=th] "àžàž"
+collectionmeta .document [l=th] "àž«àžàž±àžàžªàž·àž­"
+collectionmeta .section [l=th] "àžàž"
+
 
 # -- Simplified Chinese strings ----------------
@@ -159,11 +159,13 @@
 å«äºäººç±»åå±åŸä¹ŠéŠïŒHumanity Development LibraryïŒçäžäžªå°å­éïŒ11äžªææ¡£ïŒã"
 
-collectionmeta	.text [l=zh] "ææ¬"
-collectionmeta	.dls.Title,Title [l=zh] "é¢å"
-collectionmeta	.dls.Subject [l=zh] "äž»é¢"
-collectionmeta	.dls.Organization [l=zh] "æºæ"
-collectionmeta	.dls.Keyword [l=zh] "åŠäœ"
+collectionmeta .text [l=zh] "ææ¬"
+collectionmeta .dls.Title,Title [l=zh] "é¢å"
+collectionmeta .dls.Subject [l=zh] "äž»é¢"
+collectionmeta .dls.Organization [l=zh] "æºæ"
+collectionmeta .dls.Keyword [l=zh] "åŠäœ"
 
-collectionmeta	.document [l=zh] "ä¹Š"
-collectionmeta	.section [l=zh] "ç« "
+collectionmeta .document [l=zh] "ä¹Š"
+collectionmeta .section [l=zh] "ç« "
 
+
+
