--- parser3/src/classes/table.C	2001/08/31 09:26:12	1.108
+++ parser3/src/classes/table.C	2001/09/07 12:46:19	1.111
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 */
-static const char *RCSId="$Id: table.C,v 1.108 2001/08/31 09:26:12 parser Exp $"; 
+static const char *RCSId="$Id: table.C,v 1.111 2001/09/07 12:46:19 parser Exp $"; 
 
 #include "classes.h"
 #include "pa_config_includes.h"
@@ -80,11 +80,11 @@ static void _set(Request& r, const Strin
 static void _load(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 	// filename is last parameter
-	Value& vfilename=params->as_no_junction(params->size()-1, 
+	const String& filename=params->as_string(params->size()-1, 
 		"file name must not be code");
 
 	// loading text
-	char *data=file_read_text(pool, r.absolute(vfilename.as_string()));
+	char *data=file_read_text(pool, r.absolute(filename));
 
 	// parse columns
 	Array *columns;
@@ -349,13 +349,14 @@ static void _empty(Request& r, const Str
 	r.write_no_lang(*new(pool) VBool(pool, table.size()==0));
 }
 
-/// used by table: _hash / table_row_to_hash
+#ifndef DOXYGEN
 struct Row_info {
 	Table *table;
 	int key_field;
 	Array *value_fields;
 	Hash *hash;
 };
+#endif
 static void table_row_to_hash(Array::Item *value, void *info) {
 	Array& row=*static_cast<Array *>(value);
 	Row_info& ri=*static_cast<Row_info *>(info);
@@ -410,7 +411,7 @@ static void _hash(Request& r, const Stri
 	r.write_no_lang(result);
 }
 
-/// used by table: _sort / sort_cmp_string|sort_cmp_double
+#ifndef DOXYGEN
 struct Table_seq_item {
 	Array *row;
 	union {
@@ -418,6 +419,7 @@ struct Table_seq_item {
 		double d;
 	} value;
 };
+#endif
 static int sort_cmp_string(const void *a, const void *b) {
 	return strcmp(
 		static_cast<const Table_seq_item *>(a)->value.c_str, 
@@ -617,16 +619,17 @@ static void _sql(Request& r, const Strin
 	ulong limit=0;
 	ulong offset=0;
 	if(params->size()>1) {
-		Value& options_param=params->as_no_junction(1, "options must be hash, not code");
-		if(Hash *options=options_param.get_hash()) {
-			if(Value *vlimit=(Value *)options->get(*sql_limit_name))
-				limit=(ulong)r.process(*vlimit).as_double();
-			if(Value *voffset=(Value *)options->get(*sql_offset_name))
-				offset=(ulong)r.process(*voffset).as_double();
-		} else
-			PTHROW(0, 0,
-				&method_name,
-				"options must be hash");
+		Value& voptions=params->as_no_junction(1, "options must be hash, not code");
+		if(voptions.is_defined())
+			if(Hash *options=voptions.get_hash()) {
+				if(Value *vlimit=(Value *)options->get(*sql_limit_name))
+					limit=(ulong)r.process(*vlimit).as_double();
+				if(Value *voffset=(Value *)options->get(*sql_offset_name))
+					offset=(ulong)r.process(*voffset).as_double();
+			} else
+				PTHROW(0, 0,
+					&method_name,
+					"options must be hash");
 	}
 
 	Temp_lang temp_lang(r, String::UL_SQL);