--- parser3/src/include/pa_common.h	2012/03/03 00:21:56	1.145
+++ parser3/src/include/pa_common.h	2013/07/16 14:55:45	1.151
@@ -1,14 +1,14 @@
 /** @file
 	Parser: commonly used functions.
 
-	Copyright (c) 2001-2012 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_COMMON_H
 #define PA_COMMON_H
 
-static const char * const IDENT_COMMON_H="$Date: 2012/03/03 00:21:56 $";
+#define IDENT_PA_COMMON_H "$Id: pa_common.h,v 1.151 2013/07/16 14:55:45 moko Exp $"
 
 #include "pa_string.h"
 #include "pa_hash.h"
@@ -219,12 +219,12 @@ void file_write(
 	delete specified file 
 	throws an exception in case of problems
 */
-bool file_delete(const String& file_spec, bool fail_on_problem=true);
+bool file_delete(const String& file_spec, bool fail_on_problem=true, bool keep_empty_dirs=false);
 /**
 	move specified file 
 	throws an exception in case of problems
 */
-void file_move(const String& old_spec, const String& new_spec);
+void file_move(const String& old_spec, const String& new_spec, bool keep_empty_dirs=false);
 
 bool entry_exists(const char* fname, struct stat *afinfo=0);
 bool entry_exists(const String& file_spec);
@@ -250,12 +250,14 @@ char *getrow(char **row_ref,char delim='
 char *lsplit(char *string, char delim);
 char *lsplit(char **string_ref,char delim);
 char *rsplit(char *string, char delim);
-const char* format(double value, char *fmt);
+const char* format(double value, const char *fmt);
 
 size_t stdout_write(const void *buf, size_t size);
 
 char* unescape_chars(const char* cp, int len, Charset* client_charset=0, bool js=false/*true==decode \uXXXX and don't convert '+' to space*/);
 
+char *search_stop(char*& current, char cstop_at);
+
 #ifdef WIN32
 void back_slashes_to_slashes(char *s);
 //void slashes_to_back_slashes(char *s);
@@ -386,21 +388,6 @@ static String::C date_gmt_string(tm* tms
 		tms->tm_hour,tms->tm_min,tms->tm_sec));
 }
 
-static int lastposafter(const String& s, size_t after, const char* substr, size_t substr_size, bool beforelast=false) {
-	size_t size=0; // just to calm down compiler
-	if(beforelast)
-		size=s.length();
-	size_t at;
-	while((at=s.pos(String::Body(substr), after))!=STRING_NOT_FOUND) {
-		size_t newafter=at+substr_size/*skip substr*/;
-		if(beforelast && newafter==size)
-			break;
-		after=newafter;
-	}
-
-	return after;
-}
-
 // globals
 
 extern const String file_status_name;
@@ -412,6 +399,7 @@ extern const String file_status_name;
 #define PA_COLUMN_SEPARATOR_NAME "separator"
 #define PA_COLUMN_ENCLOSER_NAME "encloser"
 #define PA_CHARSET_NAME "charset"
+#define PA_RESPONSE_CHARSET_NAME "response-charset"
 
 // globals defines for sql options