Index: main/trunk/greenstone2/macros/malayalam2.dm
===================================================================
--- main/trunk/greenstone2/macros/malayalam2.dm	(revision 20999)
+++ main/trunk/greenstone2/macros/malayalam2.dm	(revision 28888)
@@ -119,5 +119,5 @@
      collection (it links to the "_2_" collection). 
     àŽàŽ€àµ àŽàŽŸàŽ£àŽ£àŽ®àµàŽàµàŽàŽ¿ e "_2_" collection àŽàŽªàŽ¯àµàŽàŽ¿àŽàµàŽàµ  
-     <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">àŽ®àµàŽšàµàŽšàµàŽàµàŽàµ àŽªàµàŽµàµàŽàµ</a>   
+     <a href="_httpdoc_&c=_1_&cl=_cgiargclUrlsafe_&d=_3_">àŽ®àµàŽšàµàŽšàµàŽàµàŽàµ àŽªàµàŽµàµàŽàµ</a>   
      àŽ
 àŽ²àµàŽ²àµàŽàµàŽàŽ¿  "back" àŽ¬àŽàµàŽ àŽàŽªàŽ¯àµàŽàŽ¿àŽàµàŽàµ àŽªàŽŽàŽ¯àŽ€àŽ¿àŽ²àµàŽàµàŽàµ àŽ®àŽàŽàµàŽàµàŽàµ}  
@@ -140,5 +140,5 @@
 àŽàŽ¯àŽŸàŽ³àŽªàŽŠàŽ}  
 
-_textmustbelongtogroup_ [l=ml] {àŽ àŽªàµàŽàŽ¿àŽ²àµàŽàµàŽàµàŽ³àµàŽ³ àŽžàŽšàµàŽŠàŽ°àµàŽ¶àŽŸàŽšàµàŽ®àŽ€àŽ¿ '-cgiargug-' àŽàµàŽàµàŽàŽ€àµàŽ€àŽ¿àŽ²àµ àŽªàµàŽàµàŽàŽµàŽ°àµàŽàµàŽàµàŽ®àŽŸàŽ€àµàŽ°àŽ}  
+_textmustbelongtogroup_ [l=ml] {àŽ àŽªàµàŽàŽ¿àŽ²àµàŽàµàŽàµàŽ³àµàŽ³ àŽžàŽšàµàŽŠàŽ°àµàŽ¶àŽŸàŽšàµàŽ®àŽ€àŽ¿ '_cgiargugHtmlsafe_' àŽàµàŽàµàŽàŽ€àµàŽ€àŽ¿àŽ²àµ àŽªàµàŽàµàŽàŽµàŽ°àµàŽàµàŽàµàŽ®àŽŸàŽ€àµàŽ°àŽ}  
 
 _textmessageinvalid_ [l=ml] {àŽ€àŽŸàŽàµàŽàŽ³àµ  àŽàŽµàŽ¶àµàŽ¯àŽªàµàŽªàµàŽàµàŽ àŽªàµàŽàµàŽ²àŽ­àŽ¿àŽàµàŽàµàŽµàŽŸàŽšàµ àŽžàµàŽšàµ àŽàŽ£àµ àŽàµàŽ¯àµàŽ¯àµàŽ 
@@ -402,20 +402,20 @@
 _textretcoll_ [l=ml] {àŽàŽ³àŽàµàŽàŽ±àŽ¿àŽ²àµàŽàµàŽàµ àŽ®àŽàŽàµàŽàŽ¿àŽµàŽ°àŽ¿àŽ}  
 
-_textdelperm_ [l=ml] {_cgiargbc1dirname_ àŽ¶àµàŽàŽ°àŽàµàŽàŽ³àŽ¿àŽ²àµ àŽàŽ¿àŽ²àŽ€àµ àŽàŽ²àµàŽ²àŽŸàŽ®àµ àŽšàµàŽàµàŽàŽ àŽàµàŽ¯àµàŽ¯àŽŸàŽšàµ àŽàŽŽàŽ¿àŽ¯àµàŽšàµàŽšàŽ¿àŽ²àµàŽ². àŽžàŽŸàŽŠàµàŽ§àµàŽ¯àŽ®àŽŸàŽ¯ àŽàŽŸàŽ°àŽ£àŽàµàŽàŽ³àµ <ul> 
-<li> _gsdlhome_/collect/_cgiargbc1dirname_àŽ¡àŽ¯àŽ±àŽàµàŽàŽ±àŽ¿ àŽšàµàŽàµàŽàŽ àŽàµàŽ¯àµàŽ¯àŽŸàŽšàµ àŽàµàŽ°àµàŽšàµàŽžàµàŽ±àµàŽ±àµàŽ£àŽ¿àŽšàµ àŽ
+_textdelperm_ [l=ml] {_cgiargbc1dirnameHtmlsafe_ àŽ¶àµàŽàŽ°àŽàµàŽàŽ³àŽ¿àŽ²àµ àŽàŽ¿àŽ²àŽ€àµ àŽàŽ²àµàŽ²àŽŸàŽ®àµ àŽšàµàŽàµàŽàŽ àŽàµàŽ¯àµàŽ¯àŽŸàŽšàµ àŽàŽŽàŽ¿àŽ¯àµàŽšàµàŽšàŽ¿àŽ²àµàŽ². àŽžàŽŸàŽŠàµàŽ§àµàŽ¯àŽ®àŽŸàŽ¯ àŽàŽŸàŽ°àŽ£àŽàµàŽàŽ³àµ <ul> 
+<li> _gsdlhome_/collect/_cgiargbc1dirnameHtmlsafe_àŽ¡àŽ¯àŽ±àŽàµàŽàŽ±àŽ¿ àŽšàµàŽàµàŽàŽ àŽàµàŽ¯àµàŽ¯àŽŸàŽšàµ àŽàµàŽ°àµàŽšàµàŽžàµàŽ±àµàŽ±àµàŽ£àŽ¿àŽšàµ àŽ
 àŽšàµàŽ®àŽ€àŽ¿àŽ¯àŽ¿àŽ²àµàŽ²<br> 
-àŽ¡àŽ¯àŽ±àŽàµàŽàŽ±àŽ¿ àŽàŽšàµàŽšàµàŽšàµàŽšàŽŸàŽ¯àŽ¿ àŽšàµàŽàµàŽàŽàŽàµàŽ¯àµàŽ€àŽŸàŽ²àµ àŽ®àŽŸàŽ€àµàŽ°àŽ®àµ àŽžàŽ®àµàŽªàµàŽ°àµàŽ£àŽ®àŽŸàŽ¯ _cgiargbc1dirname_àŽšàµàŽàµàŽàŽàŽàµàŽ¯àµàŽ¯àŽ²àµ àŽµàŽ¿àŽàŽ¯àŽ¿àŽàµàŽàµàŽàŽ¯àµàŽ³àµàŽ³àµ 
+àŽ¡àŽ¯àŽ±àŽàµàŽàŽ±àŽ¿ àŽàŽšàµàŽšàµàŽšàµàŽšàŽŸàŽ¯àŽ¿ àŽšàµàŽàµàŽàŽàŽàµàŽ¯àµàŽ€àŽŸàŽ²àµ àŽ®àŽŸàŽ€àµàŽ°àŽ®àµ àŽžàŽ®àµàŽªàµàŽ°àµàŽ£àŽ®àŽŸàŽ¯ _cgiargbc1dirnameHtmlsafe_àŽšàµàŽàµàŽàŽàŽàµàŽ¯àµàŽ¯àŽ²àµ àŽµàŽ¿àŽàŽ¯àŽ¿àŽàµàŽàµàŽàŽ¯àµàŽ³àµàŽ³àµ 
 àŽàµàŽ°àµàŽšàµàŽžàµàŽ±àµàŽ±àµàŽ£àŽ¿àŽšàµ _gsdlhome_/bin/script/delcol.pl.àŽªàµàŽ°àµàŽŸàŽàµàŽ°àŽŸàŽ àŽªàµàŽ°àŽµàŽ°àµàŽ€àµàŽ€àŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàŽŸàŽšàµ àŽàŽŽàŽ¿àŽ¯àµàŽàŽ¯àŽ¿àŽ²àµàŽ². àŽ àŽ«àŽ¯àŽ²àµ àŽµàŽŸàŽ¯àŽ¿àŽàµàŽàŽŸàŽµàµàŽšàµàŽšàŽ€àµàŽ àŽªàµàŽ°àŽµàŽ°àµàŽ€àµàŽ€àŽšàŽ¯àµàŽàµàŽ¯àŽ®àŽŸàŽàµàŽàŽŸàŽµàµàŽšàµàŽšàŽ€àŽŸàŽ£àµ àŽàŽšàµàŽšàµàŽ àŽªàŽ°àŽ¿àŽ¶àµàŽ§àŽ¿àŽàµàŽàµàŽ</li> 
 </ul>}  
 
-_textdelinv_ [l=ml] {_cgiargbc1dirname_àŽ¶àµàŽàŽ°àŽ àŽžàŽàŽ°àŽàµàŽ·àŽ¿àŽàµàŽàŽªàµàŽªàµàŽàµàŽàŽ€àµ àŽŠàµàŽ°àµàŽ¬àŽ²àŽ®àŽŸàŽàµàŽàŽªàµàŽªàµàŽàµàŽàŽ€àµ àŽàŽ£àµ. àŽšàµàŽàµàŽàŽàŽàµàŽ¯àµàŽ¯àŽ²àµ àŽ±àŽŠàµàŽŠàµàŽàµàŽ¯àµàŽ¯àµàŽšàµàŽšàµ}  
-
-_textdelsuc_ [l=ml] {_cgiargbc1dirname_àŽ¶àµàŽàŽ°àŽ àŽµàŽ¿àŽàŽ¯àŽàŽ°àŽ®àŽŸàŽ¯àŽ¿ àŽšàµàŽàµàŽàŽ àŽàµàŽ¯àµâàŽ€àµ}  
-
-_textclonefail_ [l=ml] {àŽªàµàŽ€àŽ¿àŽ¯ _cgiargclonecol_ àŽ¶àµàŽàŽ°àŽ àŽàµàŽ²àµàŽ£àµ àŽàµàŽ¯àµàŽ¯àŽŸàŽšàµ àŽàŽŽàŽ¿àŽàµàŽàŽ¿àŽ²àµàŽ².  
+_textdelinv_ [l=ml] {_cgiargbc1dirnameHtmlsafe_àŽ¶àµàŽàŽ°àŽ àŽžàŽàŽ°àŽàµàŽ·àŽ¿àŽàµàŽàŽªàµàŽªàµàŽàµàŽàŽ€àµ àŽŠàµàŽ°àµàŽ¬àŽ²àŽ®àŽŸàŽàµàŽàŽªàµàŽªàµàŽàµàŽàŽ€àµ àŽàŽ£àµ. àŽšàµàŽàµàŽàŽàŽàµàŽ¯àµàŽ¯àŽ²àµ àŽ±àŽŠàµàŽŠàµàŽàµàŽ¯àµàŽ¯àµàŽšàµàŽšàµ}  
+
+_textdelsuc_ [l=ml] {_cgiargbc1dirnameHtmlsafe_àŽ¶àµàŽàŽ°àŽ àŽµàŽ¿àŽàŽ¯àŽàŽ°àŽ®àŽŸàŽ¯àŽ¿ àŽšàµàŽàµàŽàŽ àŽàµàŽ¯àµâàŽ€àµ}  
+
+_textclonefail_ [l=ml] {àŽªàµàŽ€àŽ¿àŽ¯ _cgiargclonecolHtmlsafe_ àŽ¶àµàŽàŽ°àŽ àŽàµàŽ²àµàŽ£àµ àŽàµàŽ¯àµàŽ¯àŽŸàŽšàµ àŽàŽŽàŽ¿àŽàµàŽàŽ¿àŽ²àµàŽ².  
 àŽ
 àŽ€àŽ¿àŽšàµàŽ³àµàŽ³ àŽàŽŸàŽ°àŽ£àŽàµàŽàŽ³àµ  <ul> 
-<li> _cgiargclonecol_àŽ¶àµàŽàŽ°àŽ àŽšàŽ¿àŽ²àŽµàŽ¿àŽ²àŽ¿àŽ²àµàŽ² 
-<li>_cgiargclonecol_ àŽ¶àµàŽàŽ°àŽ€àµàŽ€àŽ¿àŽšàµ collect.cfg àŽàŽ²àŽàµàŽ·àµàŽšàµ àŽàµàŽ£àµàŽ«àŽ¿àŽàŽ±àµàŽ·àŽšàµ àŽ«àŽ¯àŽ²àµ àŽàŽ£àµàŽàŽŸàŽ¯àŽ¿àŽ°àŽ¿àŽàµàŽàŽ¿àŽ²àµàŽ² 
+<li> _cgiargclonecolHtmlsafe_àŽ¶àµàŽàŽ°àŽ àŽšàŽ¿àŽ²àŽµàŽ¿àŽ²àŽ¿àŽ²àµàŽ² 
+<li>_cgiargclonecolHtmlsafe_ àŽ¶àµàŽàŽ°àŽ€àµàŽ€àŽ¿àŽšàµ collect.cfg àŽàŽ²àŽàµàŽ·àµàŽšàµ àŽàµàŽ£àµàŽ«àŽ¿àŽàŽ±àµàŽ·àŽšàµ àŽ«àŽ¯àŽ²àµ àŽàŽ£àµàŽàŽŸàŽ¯àŽ¿àŽ°àŽ¿àŽàµàŽàŽ¿àŽ²àµàŽ² 
 <li> àŽªàµàŽ°àŽžàµàŽ€àµàŽ€ collect.cfg àŽ«àŽ¯àŽ²àµ àŽµàŽŸàŽ¯àŽ¿àŽàµàŽàŽŸ àŽàµàŽ°àµàŽžàµàŽ±àµàŽ±àµàŽ£àŽ¿àŽšàµ àŽ
 àŽšàµàŽ®àŽ€àŽ¿àŽ¯àµàŽ£àµàŽàŽŸàŽ¯àŽ¿àŽ°àŽ¿àŽàµàŽàŽ¿àŽ²àµàŽ²</ul>}  
@@ -439,5 +439,5 @@
 _textreloaderror_ [l=ml] {àŽªàµàŽ€àŽ¿àŽ¯ àŽ¶àµàŽàŽ°àŽšàŽ¿àŽ°àµâàŽ®àµàŽ®àŽŸàŽ£àŽ€àµàŽ€àŽ¿àŽšàŽ¿àŽàŽ¯àŽ¿àŽ²àµâ àŽàŽ°àµ àŽªàŽ¿àŽŽàŽµàµ àŽªàŽ±àµàŽ±àŽ¿. àŽ€àŽŸàŽàµàŽàŽ³àµàŽàµ àŽ¬àµàŽ°àµàŽžàŽ±àŽ¿àŽ²àµ "reload", "back" àŽ¬àŽàµàŽàŽ£àµàŽàŽ³àµàŽàµ àŽàŽªàŽ¯àµàŽàŽ€àµàŽ€àµàŽªàµàŽªàŽ±àµàŽ±àŽ¿ àŽàµàŽ°àµàŽžàµàŽ±àµàŽ±àµàŽ£àŽ¿àŽšàµ àŽžàŽàŽ­àŽµàŽ¿àŽàµàŽ àŽ§àŽŸàŽ°àŽ£àŽŸàŽªàŽ¿àŽ¶àŽàµ àŽ®àµàŽ²àŽ®àŽŸàŽµàŽŸàŽ àŽàŽ€àµâ. (àŽ¶àµàŽàŽ°àŽšàŽ¿àŽ°àµâàŽ®àµàŽ®àŽŸàŽ£ àŽµàµàŽ³àŽ¯àŽ¿àŽ²àµâ àŽ àŽ¬àŽàµàŽàŽ£àµàŽàŽ³àµàŽàµ àŽàŽªàŽ¯àµàŽàŽ àŽàŽŽàŽ¿àŽµàŽŸàŽàµàŽàŽŸàŽšàµâ àŽ¶àµàŽ°àŽŠàµàŽ§àŽ¿àŽàµàŽàµàŽ). àŽàŽ²àŽàµàŽàŽ°àµâ àŽàŽŠàµàŽ¯àŽ®àµ àŽàŽ°àŽàŽ­àŽ¿àŽàµàŽàµàŽµàŽŸàŽšàµâ àŽ¶àµàŽªàŽŸàŽ°àµâàŽ¶àŽàµàŽ¯àµàŽ¯àµàŽšàµàŽšàµ. }  
 
-_textexptsuc_ [l=ml] {_cgiargbc1dirname_ àŽ¶àµàŽàŽ°àŽ àŽµàŽ¿àŽàŽ¯àŽàŽ°àŽ®àŽŸàŽ¯àŽ¿  _gsdlhome_/tmp/exported\__cgiargbc1dirname_  àŽ¡àŽ¯àŽ±àŽàµàŽàŽ±àŽ¿àŽ¯àŽ¿àŽ²àµàŽàµàŽàµ àŽàŽàµàŽžàµàŽªàµàŽ°àµàŽàµàŽàµàŽàµàŽ¯àµàŽ€àµ.}  
+_textexptsuc_ [l=ml] {_cgiargbc1dirnameHtmlsafe_ àŽ¶àµàŽàŽ°àŽ àŽµàŽ¿àŽàŽ¯àŽàŽ°àŽ®àŽŸàŽ¯àŽ¿  _gsdlhome_/tmp/exported\__cgiargbc1dirnameHtmlsafe_  àŽ¡àŽ¯àŽ±àŽàµàŽàŽ±àŽ¿àŽ¯àŽ¿àŽ²àµàŽàµàŽàµ àŽàŽàµàŽžàµàŽªàµàŽ°àµàŽàµàŽàµàŽàµàŽ¯àµàŽ€àµ.}  
 
 _textexptfail_ [l=ml] {<p>àŽ¶àµàŽàŽ°àŽ àŽàŽàµàŽžàµàŽªàµàŽ°àµàŽàµàŽàµàŽàµàŽ¯àµàŽ¯àµàŽšàµàŽšàŽ€àŽ¿àŽ²àµ àŽªàŽ°àŽŸàŽàŽ¯àŽ 
