--- parser3/src/classes/mail.C	2001/12/19 09:53:28	1.46
+++ parser3/src/classes/mail.C	2001/12/24 10:00:04	1.48
@@ -4,7 +4,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: mail.C,v 1.46 2001/12/19 09:53:28 paf Exp $
+	$Id: mail.C,v 1.48 2001/12/24 10:00:04 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -30,6 +30,10 @@
 
 Methoded *mail_class;
 
+// consts
+
+const int ATTACHMENT_WEIGHT=100;
+
 // class
 
 class MMail : public Methoded {
@@ -143,7 +147,7 @@ static const String& attach_hash_to_stri
 		file_name=&vfile_name->as_string();
 	else // no $file-name, VFile surely knows name
 		file_name=&static_cast<Value *>(vfile->fields().get(*name_name))->as_string();
-	const char *file_name_cstr=file_name->cstr(String::UL_FILE_SPEC);
+	const char *file_name_cstr=file_name->cstr();
 
 	String& result=*new(pool) String(pool);
 
@@ -198,38 +202,40 @@ static void add_header_attribute(const H
 
 #ifndef DOXYGEN
 struct Mail_seq_item {
-	const String *part_name;
-	Value *part_value;
+	int weight;
+	const String *name;
+	Value *value;
 };
 #endif
+static int get_part_name_weight(const Hash::Key& part_name) {
+	const char *cstr=part_name.cstr();
+	int offset=0;
+	if(strncmp(cstr, "text", 4)==0) {
+		cstr+=4;
+	} else if(strncmp(cstr, "attach", 6)==0) {
+		cstr+=6;
+		offset=ATTACHMENT_WEIGHT;
+	} else
+		throw Exception(0, 0,
+			&part_name,
+			"is neither text# nor attach#");
+
+	char *error_pos;
+	return strtol(cstr, &error_pos, 10)+offset;
+}
 static void add_part(const Hash::Key& part_name, Hash::Val *part_value, 
 					 void *info) {
 	Mail_seq_item **seq_ref=static_cast<Mail_seq_item **>(info);
-	(**seq_ref).part_name=&part_name;
-	(**seq_ref).part_value=static_cast<Value *>(part_value);
+	(**seq_ref).weight=get_part_name_weight(part_name);
+	(**seq_ref).name=&part_name;
+	(**seq_ref).value=static_cast<Value *>(part_value);
 	(*seq_ref)++;
 }
-static double key_of_part(const void *item) {
-	const char *cstr=static_cast<const Mail_seq_item *>(item)->part_name->cstr();
-	char *error_pos;
-	return strtod(cstr, &error_pos);
+static int key_of_part(const void *item) {
+	return static_cast<const Mail_seq_item *>(item)->weight;
 }
 static int sort_cmp_string_double_value(const void *a, const void *b) {
-	double va=key_of_part(a);
-	double vb=key_of_part(b);
-
-	// 0 logically equals infinity. so that attachments would go last
-	if(va==0)
-		return +1;
-	if(vb==0)
-		return -1;
-
-	if(va<vb)
-		return -1;
-	else if(va>vb)
-		return +1;
-	else 
-		return 0;
+	return key_of_part(a)-key_of_part(b);
 }
 static const String& letter_hash_to_string(Request& r, const String& method_name, 
 										   Hash& letter_hash, int level,
@@ -258,13 +264,6 @@ static const String& letter_hash_to_stri
 
 	if(Value *body_element=static_cast<Value *>(letter_hash.get(*body_name))) {
 		if(Hash *body_hash=body_element->get_hash(&method_name)) {
-			char *boundary=(char *)pool.malloc(MAX_NUMBER);
-			snprintf(boundary, MAX_NUMBER-5/*lEvEl*/, "lEvEl%d", level);
-			// multi-part
-			result << "content-type: multipart/mixed; boundary=\"" << boundary << "\"\n";
-			result << "\n" 
-				"This is a multi-part message in MIME format.";
-
 			// body parts..
 			// ..collect
 			Mail_seq_item *seq=(Mail_seq_item *)pool.malloc(sizeof(Mail_seq_item)*body_hash->size());
@@ -272,25 +271,42 @@ static const String& letter_hash_to_stri
 			// ..sort
 			_qsort(seq, body_hash->size(), sizeof(Mail_seq_item), 
 				sort_cmp_string_double_value);
+
+			bool multipart=body_hash->size()>1;
+			// header
+			char *boundary=0;
+			if(multipart) {
+				boundary=(char *)pool.malloc(MAX_NUMBER);
+				snprintf(boundary, MAX_NUMBER-5/*lEvEl*/, "lEvEl%d", level);
+				// multi-part
+				result << "content-type: multipart/mixed; boundary=\"" << boundary << "\"\n";
+				result << "\n" 
+					"This is a multi-part message in MIME format.";
+			}
+
 			// ..insert in 'seq' order
 			for(int i=0; i<body_hash->size(); i++) {
-				// intermediate boundary
-				result << "\n--" << boundary << "\n";
-
-				if(Hash *part_hash=seq[i].part_value->get_hash(&method_name))
-					if(seq[i].part_name->mid(0, 6/*attach*/)=="attach")
-						result << attach_hash_to_string(r, *seq[i].part_name, *part_hash);
+				if(multipart) {
+					// intermediate boundary
+					result << "\n--" << boundary << "\n";
+				}
+
+				if(Hash *part_hash=seq[i].value->get_hash(&method_name))
+					if(seq[i].weight>=ATTACHMENT_WEIGHT)
+						result << attach_hash_to_string(r, *seq[i].name, *part_hash);
 					else 
 						result << letter_hash_to_string(r, method_name, *part_hash, 
 							level+1, 0, 0);
 				else
 					throw Exception(0, 0,
-						seq[i].part_name,
+						seq[i].name,
 						"part is not hash");
 			}
 
 			// finish boundary
-			result << "\n--" << boundary << "--\n";
+			if(multipart) {
+				result << "\n--" << boundary << "--\n";
+			}
 		} else {
 			result << 
 				"\n"; // header|body separator