--- parser3/src/classes/table.C	2001/03/23 13:08:08	1.24
+++ parser3/src/classes/table.C	2001/03/27 13:47:29	1.31
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: table.C,v 1.24 2001/03/23 13:08:08 paf Exp $
+	$Id: table.C,v 1.31 2001/03/27 13:47:29 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -35,21 +35,18 @@ static void set_or_load(
 		method_name, is_load?"file name must not be junction":"body must be junction");
 
 	// data or file_name
-	char *ldata_or_filename;
+	char *data;
 	if(is_load) {
 		// forcing untaint language
 		String lfile_name(pool);
-		lfile_name.append(vdata_or_filename->as_string(),
-			String::UL_FILE_NAME, true);
-		ldata_or_filename=lfile_name.cstr();
+		lfile_name.append(vdata_or_filename->as_string(), String::UL_FILE_NAME, true);
+		// loading text
+		data=file_read_text(pool, r.absolute(lfile_name));
 	} else {
 		// suggesting untaint language
 		Temp_lang temp_lang(r, String::UL_TABLE);
-		ldata_or_filename=r.process(*vdata_or_filename).as_string().cstr();
+		data=r.process(*vdata_or_filename).as_string().cstr();
 	}
-	// data
-	char *data=is_load?
-		file_read_text(pool, r.absolute(ldata_or_filename)/*\, false*/):ldata_or_filename;
 
 	// parse columns
 	Array *columns;
@@ -72,9 +69,11 @@ static void set_or_load(
 	}
 
 	// parse cells
-	Table& table=*new(pool) Table(pool, method_name, columns);
+	Table& table=*new(pool) Table(pool, &method_name, columns);
 	char *row_chars;
 	while(row_chars=getrow(&data)) {
+		if(!*row_chars) // remove empty lines
+			continue;
 		Array *row=new(pool) Array(pool);
 		while(char *cell_chars=lsplit(&row_chars, '\t')) {
 			String *cell=new(pool) String(pool);
@@ -116,18 +115,18 @@ static void _save(Request& r, const Stri
 	String sdata(pool);
 	if(params->size()==1) { // not nameless=named output
 		// write out names line
-		if(const Array *columns=table.columns()) { // named table
-			for(int column=0; column<columns->size(); column++) {
+		if(table.columns()) { // named table
+			for(int column=0; column<table.columns()->size(); column++) {
 				if(column)
 					sdata.APPEND_CONST("\t");
-				sdata.append(*static_cast<String *>(columns->quick_get(column)), 
+				sdata.append(*static_cast<String *>(table.columns()->quick_get(column)), 
 					String::UL_TABLE);
 			}
 		} else { // nameless table
-			int size=table.size()?static_cast<Array *>(table.get(0))->size():0;
-			if(size)
-				for(int column=0; column<size; column++) {
-					char *cindex_tab=(char *)pool.malloc(MAX_NUMBER);
+			int lsize=table.size()?static_cast<Array *>(table.get(0))->size():0;
+			if(lsize)
+				for(int column=0; column<lsize; column++) {
+					char *cindex_tab=(char *)malloc(MAX_NUMBER);
 					snprintf(cindex_tab, MAX_NUMBER, "%d\t", column);
 					sdata.APPEND_CONST(cindex_tab);
 				}
@@ -149,8 +148,7 @@ static void _save(Request& r, const Stri
 	}
 
 	// write
-	char *cdata=sdata.cstr();
-	file_write(pool, r.absolute(lfile_name.cstr()), cdata, strlen(cdata), true);
+	file_write(pool, r.absolute(lfile_name), sdata.cstr(), sdata.size(), true);
 }
 
 static void _count(Request& r, const String&, Array *) {
@@ -215,6 +213,34 @@ static void _empty(Request& r, const Str
 	}
 }
 
+struct Record_info {
+	Pool *pool;
+	Table *table;
+	Hash *hash;
+};
+static void store_column_item_to_hash(Array::Item *item, void *info) {
+	Record_info& ri=*static_cast<Record_info *>(info);
+	String& column_name=*static_cast<String *>(item);
+	const String *column_item=ri.table->item(column_name);
+	Value *value;
+	if(column_item)
+		value=new(*ri.pool) VString(*column_item);
+	else
+		value=new(*ri.pool) VUnknown(*ri.pool);
+	ri.hash->put(column_name, value);
+}
+static void _record(Request& r, const String&, Array *params) {
+	Table& table=static_cast<VTable *>(r.self)->table();
+	if(const Array *columns=table.columns()) {
+		Pool& pool=r.pool();
+		Value& value=*new(pool) VHash(pool);
+		Record_info record_info={&pool, &table, value.get_hash()};
+		columns->for_each(store_column_item_to_hash, &record_info);
+		
+		r.write_no_lang(value);
+	}
+}
+
 // initialize
 
 void initialize_table_class(Pool& pool, VStateless_class& vclass) {
@@ -248,4 +274,7 @@ void initialize_table_class(Pool& pool,
 	// ^table.empty{code-when-empty}{code-when-not}
 	vclass.add_native_method("empty", _empty, 1, 2);
 
+	// ^table.record[]
+	vclass.add_native_method("record", _record, 0, 0);
+
 }