--- parser3/src/main/pa_globals.C	2002/12/19 10:17:41	1.146
+++ parser3/src/main/pa_globals.C	2003/01/10 16:52:25	1.149
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_GLOBALS_C="$Date: 2002/12/19 10:17:41 $";
+static const char* IDENT_GLOBALS_C="$Date: 2003/01/10 16:52:25 $";
 
 #include "pa_config_includes.h"
 
@@ -247,47 +247,6 @@ xmlFileOpenLocalhost (const char *filena
     return((void *) fd);
 }
 
-/**
- * xmlFileRead:
- * @context:  the I/O context
- * @buffer:  where to drop data
- * @len:  number of bytes to write
- *
- * Read @len bytes to @buffer from the I/O channel.
- *
- * Returns the number of bytes written
- */
-static int
-xmlFileRead (void * context, char * buffer, int len) {
-    return(fread(&buffer[0], 1,  len, (FILE *) context));
-}
-
-/**
- * xmlFileWrite:
- * @context:  the I/O context
- * @buffer:  where to drop data
- * @len:  number of bytes to write
- *
- * Write @len bytes from @buffer to the I/O channel.
- *
- * Returns the number of bytes written
- */
-static int
-xmlFileWrite (void * context, const char * buffer, int len) {
-    return(fwrite(&buffer[0], 1,  len, (FILE *) context));
-}
-
-/**
- * xmlFileClose:
- * @context:  the I/O context
- *
- * Close an I/O channel
- */
-static int
-xmlFileClose (void * context) {
-    return ( ( fclose((FILE *) context) == EOF ) ? -1 : 0 );
-}
-
 #endif
 
 void pa_globals_destroy(void *) {
@@ -382,6 +341,7 @@ void pa_globals_init(Pool& pool) {
 	#define ULN(cstr, LANG) \
 		untaint_lang_name2enum->put(*NEW String(pool, cstr), (int)String::UL_##LANG);
 	ULN("as-is", AS_IS);
+	ULN("optimized-as-is", AS_IS|String::UL_OPTIMIZE_BIT);
 	ULN("file-spec", FILE_SPEC);
 	ULN("http-header", HTTP_HEADER);
 	ULN("mail-header", MAIL_HEADER);
@@ -390,6 +350,7 @@ void pa_globals_init(Pool& pool) {
 	ULN("sql", SQL);
 	ULN("js", JS);
 	ULN("xml", XML);
+	ULN("optimized-xml", XML|String::UL_OPTIMIZE_BIT);
 	ULN("html", HTML);
 	ULN("optimized-html", HTML|String::UL_OPTIMIZE_BIT);