[Firebird-checkins] CVS: firebird2/src/burp backup.epp,1.78,1.79 restore.epp,1.94,1.95

[Adriano d. S. F. <asf...@us...>]

Build Version :  T2.0.0.11012 Firebird 2.0 Alpha 2

(writeBuildNum.sh,v 1.11157 2005/05/29 14:38:57 asfernandes )

Update of /cvsroot/firebird/firebird2/src/burp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22148/burp

Modified Files:
	backup.epp restore.epp 
Log Message:
Removed unsense code noticed by Claudio


Index: backup.epp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/burp/backup.epp,v
retrieving revision 1.78
retrieving revision 1.79
diff -b -U3 -r1.78 -r1.79
--- backup.epp	27 May 2005 22:37:53 -0000	1.78
+++ backup.epp	29 May 2005 14:38:52 -0000	1.79
@@ -2584,8 +2584,6 @@
 
 	BurpGlobals* tdgbl = BurpGlobals::getSpecific();
 
-	if (tdgbl->BCK_capabilities & BCK_ods11)
-	{
 		FOR (REQUEST_HANDLE req_handle1)
 			X IN RDB$CHARACTER_SETS WITH X.RDB$SYSTEM_FLAG MISSING OR X.RDB$SYSTEM_FLAG NE 1
 			put(tdgbl, rec_charset);
@@ -2609,33 +2607,6 @@
 		ON_ERROR
 			general_on_error();
 		END_ERROR;
-	}
-	else
-	{
-		FOR (REQUEST_HANDLE req_handle1)
-			X IN RDB$CHARACTER_SETS WITH X.RDB$SYSTEM_FLAG MISSING OR X.RDB$SYSTEM_FLAG NE 1
-			put(tdgbl, rec_charset);
-			PUT_TEXT (att_charset_name, X.RDB$CHARACTER_SET_NAME);
-			if (!X.RDB$FORM_OF_USE.NULL)
-				PUT_TEXT (att_charset_form, X.RDB$FORM_OF_USE);
-			if (!X.RDB$NUMBER_OF_CHARACTERS.NULL)
-				put_numeric (att_charset_numchar, X.RDB$NUMBER_OF_CHARACTERS);
-			PUT_TEXT (att_charset_coll, X.RDB$DEFAULT_COLLATE_NAME);
-			put_numeric (att_charset_id, X.RDB$CHARACTER_SET_ID);
-			if (X.RDB$SYSTEM_FLAG)
-				put_numeric (att_charset_sysflag, X.RDB$SYSTEM_FLAG);
-			if (!X.RDB$DESCRIPTION.NULL)
-				put_source_blob (att_charset_description, att_charset_description,
-					&X.RDB$DESCRIPTION);
-			if (!X.RDB$FUNCTION_NAME.NULL)
-				PUT_TEXT (att_charset_funct, X.RDB$FUNCTION_NAME);
-			put_numeric (att_charset_bytes_char, X.RDB$BYTES_PER_CHARACTER);
-			put(tdgbl, att_end);
-		END_FOR;
-		ON_ERROR
-			general_on_error();
-		END_ERROR;
-	}
 
 	MISC_release_request_silent(req_handle1);
 }

Index: restore.epp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/burp/restore.epp,v
retrieving revision 1.94
retrieving revision 1.95
diff -b -U3 -r1.94 -r1.95
--- restore.epp	27 May 2005 22:37:56 -0000	1.94
+++ restore.epp	29 May 2005 14:38:52 -0000	1.95
@@ -2026,8 +2026,6 @@
 
 	BurpGlobals* tdgbl = BurpGlobals::getSpecific();
 
-	if (tdgbl->RESTORE_format >= 7)
-	{
 		STORE (REQUEST_HANDLE tdgbl->handles_get_character_sets_req_handle1)
 			X IN RDB$CHARACTER_SETS
 			X.RDB$CHARACTER_SET_NAME.NULL = TRUE;
@@ -2103,85 +2101,6 @@
 		ON_ERROR
 			general_on_error ();
 		END_ERROR;
-	}
-	else
-	{
-		STORE (REQUEST_HANDLE tdgbl->handles_get_character_sets_req_handle1)
-			X IN RDB$CHARACTER_SETS
-			X.RDB$CHARACTER_SET_NAME.NULL = TRUE;
-			X.RDB$FORM_OF_USE.NULL = TRUE;
-			X.RDB$NUMBER_OF_CHARACTERS.NULL = TRUE;
-			X.RDB$DEFAULT_COLLATE_NAME.NULL = TRUE;
-			X.RDB$CHARACTER_SET_ID.NULL = TRUE;
-			X.RDB$SYSTEM_FLAG.NULL = TRUE;
-			X.RDB$DESCRIPTION.NULL = TRUE;
-			X.RDB$FUNCTION_NAME.NULL = TRUE;
-			X.RDB$BYTES_PER_CHARACTER.NULL = TRUE;
-
-			skip_init(&scan_next_attr);
-			while (skip_scan(&scan_next_attr), get_attribute(&attribute, tdgbl) != att_end)
-			{
-				switch (attribute)
-				{
-
-				case att_charset_name:
-					X.RDB$CHARACTER_SET_NAME.NULL = FALSE;
-					GET_TEXT(X.RDB$CHARACTER_SET_NAME);
-					BURP_verbose (msgVerbose_restore_charset,
-								X.RDB$CHARACTER_SET_NAME, NULL, NULL, NULL, NULL);
-					break;
-
-				case att_charset_form:
-					X.RDB$FORM_OF_USE.NULL = FALSE;
-						GET_TEXT(X.RDB$FORM_OF_USE);
-					break;
-
-				case att_charset_numchar:
-					X.RDB$NUMBER_OF_CHARACTERS.NULL = FALSE;
-					X.RDB$NUMBER_OF_CHARACTERS = (USHORT) get_numeric();
-					break;
-
-				case att_charset_coll:
-					X.RDB$DEFAULT_COLLATE_NAME.NULL = FALSE;
-					GET_TEXT(X.RDB$DEFAULT_COLLATE_NAME);
-					break;
-
-				case att_charset_id:
-					X.RDB$CHARACTER_SET_ID.NULL = FALSE;
-					X.RDB$CHARACTER_SET_ID = (USHORT) get_numeric();
-					break;
-
-				case att_charset_sysflag:
-					X.RDB$SYSTEM_FLAG.NULL = FALSE;
-					X.RDB$SYSTEM_FLAG = (USHORT) get_numeric();
-					break;
-
-				case att_charset_description:
-					X.RDB$DESCRIPTION.NULL = FALSE;
-					get_source_blob (&X.RDB$DESCRIPTION, false);
-					break;
-
-				case att_charset_funct:
-					X.RDB$FUNCTION_NAME.NULL = FALSE;
-					GET_TEXT(X.RDB$FUNCTION_NAME);
-					break;
-
-				case att_charset_bytes_char:
-					X.RDB$BYTES_PER_CHARACTER.NULL = FALSE;
-					X.RDB$BYTES_PER_CHARACTER = (USHORT) get_numeric();
-					break;
-
-				default:
-					bad_attribute (scan_next_attr, attribute, msgErr_restore_charset);
-					// RDB$CHARSETS 
-					break;
-				}
-			}
-		END_STORE;
-		ON_ERROR
-			general_on_error ();
-		END_ERROR;
-	}
 
 	return true;
 }